State of core-updates

State of core-updates

[Andreas Enge]

Hello all,

let me start with a call for help! I realise that it takes me about one
week and something close to 100GB on my poor 2-core laptop to rebuild
the bulk of core-updates up to the packages in my profile, and that is not
sustainable. It also forces me to do a "guix gc" between two runs, with
the danger of either doing it too late and having to restart the builds
(lived experience, one week lost), or losing and having to recompile
store items that effectively have not changed.

So it would be nice if someone could set up a more complete job for
core-updates on cuirass or QA, and maybe write up a how-to to see which
packages work and which ones need more love, preferably by architecture.
(Without offense, I honestly do not see what
   https://ci.guix.gnu.org/jobset/core-updates
tells me. There is one evaluation with 290 succeeding and 300 failing
builds, and another one with 7 succeeding and 4 failing builds. Or are
these only the newly succeeding or failing builds? There is the dashboard
which gives visual clues, but can it be used to extract a list of
"originally failing" packages, in the sense that the compilation fails
itself instead of just a dependency - otherwise said, the failures highest
up in the package graph, which need to be worked on? On QA I think so far
there is nothing for core-updates, and the bordeaux build farm probably
could not keep up while also working on issues from the tracker. Generally
speaking, I think we need more tooling and documentation of the tooling if
feature branches are to become a thing.)

Since the bootstrapping seems to have stabilised, that would allow more
people to work on packages closer to the leaves, since most of what
currently builds would be available as substitutes from the build farm
without everybody needing to go through a one-week compilation project.

Here is my eclectic selection of packages I would add to the job:
- guix (builds)
- icecat (builds)
- ungoogled-chromium (probably also builds)
- openjdk (pulls in rust!, and builds)
- unison (pulls in ocaml, and builds)
- calibre (pulls in qt@5 and python; the former builds, the latter still
  has some problems, among which the python bindings to qt, and packages
  failing their tests even when updating to the latest release)
- pandoc (pulls in ghc, which currently fails its tests @9.2.5)
Please suggest more leaf packages that exercise your favourite missing
language or application domain!

Andreas

Re: State of core-updates

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2027 bytes --]


Andreas Enge <andreas@enge.fr> writes:

> So it would be nice if someone could set up a more complete job for
> core-updates on cuirass or QA, and maybe write up a how-to to see which
> packages work and which ones need more love, preferably by architecture.
> (Without offense, I honestly do not see what
>    https://ci.guix.gnu.org/jobset/core-updates
> tells me. There is one evaluation with 290 succeeding and 300 failing
> builds, and another one with 7 succeeding and 4 failing builds. Or are
> these only the newly succeeding or failing builds? There is the dashboard
> which gives visual clues, but can it be used to extract a list of
> "originally failing" packages, in the sense that the compilation fails
> itself instead of just a dependency - otherwise said, the failures highest
> up in the package graph, which need to be worked on? On QA I think so far
> there is nothing for core-updates, and the bordeaux build farm probably
> could not keep up while also working on issues from the tracker. Generally
> speaking, I think we need more tooling and documentation of the tooling if
> feature branches are to become a thing.)

I configured QA to submit builds for core-updates a little while back,
currently it requires a code change [1].

1: https://git.cbaines.net/guix/qa-frontpage/commit/?id=39e9ec627faca95a7b43ff91e195ca9ab9846bf3

The builds are currently low priority compared to the patch testing ones
though, and there are more of these since raising the limit [2].

2: https://git.cbaines.net/guix/qa-frontpage/commit/?id=cd5687118de9858ac714d55800c2648969dbbb48

You can see the substitute availability for core-updates here [3].

3: https://data.qa.guix.gnu.org/repository/2/branch/core-updates/latest-processed-revision/package-substitute-availability

It's possible to alter the priority for builds, so we could try and get
some to happen for core-updates.

I'm going to try and put some more time in to getting the qa-frontpage
to display some useful information about branches.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

Re: State of core-updates

[Josselin Poiret]

[-- Attachment #1: Type: text/plain, Size: 2155 bytes --]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Hello all,
>
> let me start with a call for help! I realise that it takes me about one
> week and something close to 100GB on my poor 2-core laptop to rebuild
> the bulk of core-updates up to the packages in my profile, and that is not
> sustainable. It also forces me to do a "guix gc" between two runs, with
> the danger of either doing it too late and having to restart the builds
> (lived experience, one week lost), or losing and having to recompile
> store items that effectively have not changed.
>
> So it would be nice if someone could set up a more complete job for
> core-updates on cuirass or QA, and maybe write up a how-to to see which
> packages work and which ones need more love, preferably by architecture.

I agree, I've wanted to help but between substitutes not being there for
a lot of costly packages (llvm/mesa comes to mind) and not knowing in
advance what failures there are doesn't help.

> Since the bootstrapping seems to have stabilised, that would allow more
> people to work on packages closer to the leaves, since most of what
> currently builds would be available as substitutes from the build farm
> without everybody needing to go through a one-week compilation project.
>
> Here is my eclectic selection of packages I would add to the job:
> - guix (builds)
> - icecat (builds)
> - ungoogled-chromium (probably also builds)
> - openjdk (pulls in rust!, and builds)
> - unison (pulls in ocaml, and builds)
> - calibre (pulls in qt@5 and python; the former builds, the latter still
>   has some problems, among which the python bindings to qt, and packages
>   failing their tests even when updating to the latest release)
> - pandoc (pulls in ghc, which currently fails its tests @9.2.5)
> Please suggest more leaf packages that exercise your favourite missing
> language or application domain!

I would add gdm, xfce, gnome as those are part of most people's default
configuration.  sway is probably another good candidate.  I cannot wait
to delve into gnome-shell's gjs code again! (not)

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]

Re: State of core-updates

[Andreas Enge]

Am Fri, Mar 10, 2023 at 07:55:00PM +0100 schrieb Josselin Poiret:
> I would add gdm, xfce, gnome as those are part of most people's default
> configuration.  sway is probably another good candidate.

Good points! I just tried "sway", and it compiles! (It depends on
relatively few packages compared to the others.)

> I cannot wait
> to delve into gnome-shell's gjs code again! (not)

Ah, there is a chance you will regret having made this offer :)
But who knows, maybe everything will work out of the box.

Cheers,

Andreas

Re: State of core-updates

[Andreas Enge]

Hello Chris,

Am Fri, Mar 10, 2023 at 06:24:38PM +0000 schrieb Christopher Baines:
> I configured QA to submit builds for core-updates a little while back,
> currently it requires a code change [1].
> 1: https://git.cbaines.net/guix/qa-frontpage/commit/?id=39e9ec627faca95a7b43ff91e195ca9ab9846bf3
> I'm going to try and put some more time in to getting the qa-frontpage
> to display some useful information about branches.

I saw you just deployed the change, great, thanks a lot!

> The builds are currently low priority compared to the patch testing ones
> though, and there are more of these since raising the limit [2].
> It's possible to alter the priority for builds, so we could try and get
> some to happen for core-updates.

Well, from an egoistical point of view concerning core-updates, I would
of course love to see that. But I think we should be consistent: Since we
made a pass through QA mandatory for patch pushing, we should give this
very high priority to avoid discouraging people. And at the time being,
we do not have enough build power on bordeaux to do both, even after doing
more builds on bayfront. I see a few options for the moment: use cuirass on
berlin for this core-updates merge; devote a few of the berlin machines
to QA (which I suppose could be difficult with respect to firewalls and
so on, the Berlin administrators would need to speak out about this);
add more build power to bordeaux locally (which may or may not be possible,
and in any case is not a short term solution).

Andreas

Re: State of core-updates

[Simon Tournier]

Hi,

On ven., 10 mars 2023 at 15:58, Andreas Enge <andreas@enge.fr> wrote:

> let me start with a call for help! I realise that it takes me about one
> week and something close to 100GB on my poor 2-core laptop to rebuild
> the bulk of core-updates up to the packages in my profile, and that is not
> sustainable. It also forces me to do a "guix gc" between two runs, with
> the danger of either doing it too late and having to restart the builds
> (lived experience, one week lost), or losing and having to recompile
> store items that effectively have not changed.

I sympathize.  That’s one of the reason [1] why I have not checked out
core-updates yet. :-)

1: https://yhetil.org/guix/86v8k57vey.fsf@gmail.com

> So it would be nice if someone could set up a more complete job for
> core-updates on cuirass or QA, 

[...]

> Here is my eclectic selection of packages I would add to the job:

[...]

> Please suggest more leaf packages that exercise your favourite missing
> language or application domain!

I agree.  It could be helpful if Berlin or Bordeaux could build some
manifest for core-updates.  And then, once the manifest builds, we could
add some packages and repeat.

It would avoid that we all build the same things; worse, that each of us
burn many CPU just for knowing what fails.

Well, maybe it could be helpful if now Berlin or Bordeaux starts to
build etc/release-manifest.scm.  WDYT?

Cheers,
simon

Re: State of core-updates

[Roman Scherer]

[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]


Hi Andreas,

could we please add the jemalloc package that supports transparent huge
page sizes on aarch64 (which is currently waiting in core-updates) to
this list? At the moment any substitute which involves jemalloc isn't
useable on Linux kernels with a page size > 4K and requires building the
whole rust chain to Icecat working.

Please let me know if I can help with this somehow?

Thanks, Roman.

Andreas Enge <andreas@enge.fr> writes:

>
> Here is my eclectic selection of packages I would add to the job:
> - guix (builds)
> - icecat (builds)
> - ungoogled-chromium (probably also builds)
> - openjdk (pulls in rust!, and builds)
> - unison (pulls in ocaml, and builds)
> - calibre (pulls in qt@5 and python; the former builds, the latter still
>   has some problems, among which the python bindings to qt, and packages
>   failing their tests even when updating to the latest release)
> - pandoc (pulls in ghc, which currently fails its tests @9.2.5)
> Please suggest more leaf packages that exercise your favourite missing
> language or application domain!
>
> Andreas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 528 bytes --]

Re: State of core-updates

[Josselin Poiret]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Hi Andreas,

Roman Scherer <roman.scherer@burningswell.com> writes:

> Hi Andreas,
>
> could we please add the jemalloc package that supports transparent huge
> page sizes on aarch64 (which is currently waiting in core-updates) to
> this list? At the moment any substitute which involves jemalloc isn't
> useable on Linux kernels with a page size > 4K and requires building the
> whole rust chain to Icecat working.

Since jemalloc is indeed a dependency of icecat, it would also get built
by the CI job if the latter is added.

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]

Re: State of core-updates

[Roman Scherer]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]


Ok, cool. Looking forward to it.

Josselin Poiret <dev@jpoiret.xyz> writes:

> [[PGP Signed Part:Undecided]]
> Hi Andreas,
>
> Roman Scherer <roman.scherer@burningswell.com> writes:
>
>> Hi Andreas,
>>
>> could we please add the jemalloc package that supports transparent huge
>> page sizes on aarch64 (which is currently waiting in core-updates) to
>> this list? At the moment any substitute which involves jemalloc isn't
>> useable on Linux kernels with a page size > 4K and requires building the
>> whole rust chain to Icecat working.
>
> Since jemalloc is indeed a dependency of icecat, it would also get built
> by the CI job if the latter is added.
>
> Best,

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 528 bytes --]

Re: State of core-updates

[Maxim Cournoyer]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Hello all,
>
> let me start with a call for help! I realise that it takes me about one
> week and something close to 100GB on my poor 2-core laptop to rebuild
> the bulk of core-updates up to the packages in my profile, and that is not
> sustainable. It also forces me to do a "guix gc" between two runs, with
> the danger of either doing it too late and having to restart the builds
> (lived experience, one week lost), or losing and having to recompile
> store items that effectively have not changed.

Some things that may help that I use:

- Offloading
- Btrfs file system with zstd compression (to make that 100 GiB appear
  as 50 GiB or less on your drive)

[...]

> Since the bootstrapping seems to have stabilised, that would allow more
> people to work on packages closer to the leaves, since most of what
> currently builds would be available as substitutes from the build farm
> without everybody needing to go through a one-week compilation project.
>
> Here is my eclectic selection of packages I would add to the job:
> - guix (builds)
> - icecat (builds)
> - ungoogled-chromium (probably also builds)
> - openjdk (pulls in rust!, and builds)
> - unison (pulls in ocaml, and builds)
> - calibre (pulls in qt@5 and python; the former builds, the latter still
>   has some problems, among which the python bindings to qt, and packages
>   failing their tests even when updating to the latest release)
> - pandoc (pulls in ghc, which currently fails its tests @9.2.5)
> Please suggest more leaf packages that exercise your favourite missing
> language or application domain!

That looks promising.  Should we spun a differently named branch to
avoid people sending core-updates change?  This was discussed in the
past and agreed to (main branches do not *freeze* themselves), instead
we use git to branch to our will.

We could perhaps then add a 'core-updates-fixes-only' branch to the CI,
in which we'd try to restrict core changes as much as possible, keeping
the rebuild stress low for Berlin.

How does that sound?

-- 
Thanks,
Maxim

Re: State of core-updates

[Andreas Enge]

Hello Maxim,

Am Tue, Mar 14, 2023 at 11:50:12AM -0400 schrieb Maxim Cournoyer:
> That looks promising.  Should we spun a differently named branch to
> avoid people sending core-updates change?  This was discussed in the
> past and agreed to (main branches do not *freeze* themselves), instead
> we use git to branch to our will.

well, I consider core-updates to be frozen, people should not send any
more patches there unless they repair things that are currently broken
(and, one may add, a regression to master). I do not expect this to
include any world rebuilding changes any more.

And then the goal will be to not have a core-updates branch in the future,
but separate feature branches as discussed at the Guix days. So the aim
is to merge core-updates to master, and then to delete this branch once
and for all. (Of course, there can then be a new feature branch "core-team"
or something like this, for changes concerning the core of the system.)

So I think there is no need to branch from the branch!
(And just as a reminder, let us not forget the staging branch that needs
a similar treatment.)

Andreas

Re: State of core-updates

[Andreas Enge]

Am Mon, Mar 13, 2023 at 03:14:09PM +0100 schrieb Simon Tournier:
> Well, maybe it could be helpful if now Berlin or Bordeaux starts to
> build etc/release-manifest.scm.  WDYT?

That sounds like a great next step. Someone just has to do it™...

Andreas

Re: State of core-updates

[Maxim Cournoyer]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Hello Maxim,
>
> Am Tue, Mar 14, 2023 at 11:50:12AM -0400 schrieb Maxim Cournoyer:
>> That looks promising.  Should we spun a differently named branch to
>> avoid people sending core-updates change?  This was discussed in the
>> past and agreed to (main branches do not *freeze* themselves), instead
>> we use git to branch to our will.
>
> well, I consider core-updates to be frozen, people should not send any
> more patches there unless they repair things that are currently broken
> (and, one may add, a regression to master). I do not expect this to
> include any world rebuilding changes any more.
>
> And then the goal will be to not have a core-updates branch in the future,
> but separate feature branches as discussed at the Guix days.
>
> So the aim is to merge core-updates to master, and then to delete this
> branch once and for all. (Of course, there can then be a new feature
> branch "core-team" or something like this, for changes concerning the
> core of the system.)

Thanks for the explanations.  I'm out of the loop, not having been able
to attend physically the last Guix Days event.  Was there a recap of the
discussions posted somewhere?  Was the freeze announce somewhere?  I
wholly missed that, and I try to pay attention.

> So I think there is no need to branch from the branch!
> (And just as a reminder, let us not forget the staging branch that needs
> a similar treatment.)

OK!  We could probably merge staging into master and be done already.

-- 
Thanks,
Maxim

Re: State of core-updates

[Andreas Enge]

Am Tue, Mar 14, 2023 at 08:56:38PM -0400 schrieb Maxim Cournoyer:
> OK!  We could probably merge staging into master and be done already.

We should build it first. The last time I tried, there was a showstopper bug.

Here it is:
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.

Leo suggested to remove the dependency as non-essential. On the other
hand, I think the problem does not occur in core-updates, so one should
have a look.

And there may be other problems, too.

And of course this implies merging the merged into master staging back to
core-updates, which may create problems we will have to deal with later.
But yes, I would be happy to merge staging first; this was my initial
suggestion, before we somehow collectively flocked to core-updates :)

Andreas

Re: State of core-updates

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]

On Wed, Mar 15, 2023 at 08:54:55AM +0100, Andreas Enge wrote:
> Am Tue, Mar 14, 2023 at 08:56:38PM -0400 schrieb Maxim Cournoyer:
> > OK!  We could probably merge staging into master and be done already.
> 
> We should build it first. The last time I tried, there was a showstopper bug.
> 
> Here it is:
> 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.
> 
> Leo suggested to remove the dependency as non-essential. On the other
> hand, I think the problem does not occur in core-updates, so one should
> have a look.
> 
> And there may be other problems, too.
> 
> And of course this implies merging the merged into master staging back to
> core-updates, which may create problems we will have to deal with later.
> But yes, I would be happy to merge staging first; this was my initial
> suggestion, before we somehow collectively flocked to core-updates :)
> 

This and other bugs are fixed on the rust-team branch. Once I figure out
how to compare it against master and force rust to build for aarch64
we'll be nearly there.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: State of core-updates

[Maxim Cournoyer]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Am Tue, Mar 14, 2023 at 08:56:38PM -0400 schrieb Maxim Cournoyer:
>> OK!  We could probably merge staging into master and be done already.
>
> We should build it first. The last time I tried, there was a showstopper bug.
>
> Here it is:
> 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.
>
> Leo suggested to remove the dependency as non-essential. On the other
> hand, I think the problem does not occur in core-updates, so one should
> have a look.

Fun, I think I may have a wip stashed entry trying to address that very
problem; last time I was stopped by libgit2 being too old but that was
updated since on master, IIRC.  I'll try taking a new look when I have
the chance.

-- 
Thanks,
Maxim

Re: State of core-updates

[Andreas Enge]

Am Tue, Mar 14, 2023 at 11:50:12AM -0400 schrieb Maxim Cournoyer:
> Some things that may help that I use:
> - Offloading

I more or less tried this by building things on berlin; however, big
packages (?, precisely: openjdk checkout (not even building!), ghc@9.2.5
and llvm-for-mesa) failed complaining about a 3600s timeout because of
silence. All of them build locally; hopefully this problem will disappear
once we pass through cuirass.

Andreas

Re: State of core-updates

[Andreas Enge]

Am Wed, Mar 15, 2023 at 01:33:52PM +0200 schrieb Efraim Flashner:
> This and other bugs are fixed on the rust-team branch. Once I figure out
> how to compare it against master and force rust to build for aarch64
> we'll be nearly there.

That sounds great! Then the order of merging might end up
rust-team -> staging -> core-updates (which might mean rebuilding more or
less all of core-updates, rust is everywhere nowadays...).

Andreas

Re: State of core-updates

[Maxim Cournoyer]

Hi Efraim,

Efraim Flashner <efraim@flashner.co.il> writes:

> On Wed, Mar 15, 2023 at 08:54:55AM +0100, Andreas Enge wrote:
>> Am Tue, Mar 14, 2023 at 08:56:38PM -0400 schrieb Maxim Cournoyer:
>> > OK!  We could probably merge staging into master and be done already.
>> 
>> We should build it first. The last time I tried, there was a showstopper bug.
>> 
>> Here it is:
>> 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.
>> 
>> Leo suggested to remove the dependency as non-essential. On the other
>> hand, I think the problem does not occur in core-updates, so one should
>> have a look.
>> 
>> And there may be other problems, too.
>> 
>> And of course this implies merging the merged into master staging back to
>> core-updates, which may create problems we will have to deal with later.
>> But yes, I would be happy to merge staging first; this was my initial
>> suggestion, before we somehow collectively flocked to core-updates :)
>> 
>
> This and other bugs are fixed on the rust-team branch. Once I figure out
> how to compare it against master and force rust to build for aarch64
> we'll be nearly there.

OK, I'll keep my hands from trying to fix the above myself then, to avoid
duplicate work :-).

Thanks for the heads-up!

-- 
Thanks,
Maxim

Re: State of core-updates

[Andreas Enge]

Am Wed, Mar 15, 2023 at 02:33:36PM +0100 schrieb Andreas Enge:
> I more or less tried this by building things on berlin; however, big
> packages (?, precisely: openjdk checkout (not even building!), ghc@9.2.5
> and llvm-for-mesa) failed complaining about a 3600s timeout because of
> silence. All of them build locally; hopefully this problem will disappear
> once we pass through cuirass.

Actually it also helped to build a few packages one by one from the command
line, instead of many of them at once. So now there should be mesa on berlin.

ghc however still fails with a message like this:
building /gnu/store/i7b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv...
guix offload: sending 66 store items (1,884 MiB) to '141.80.167.166'...
exporting path `/gnu/store/8smlivxisga3y7fz3q5qkvrnpsbvr6c4-ghc-8.10.7-testsuite.tar.xz-builder'
...
exporting path `/gnu/store/fgr6i273g6wa88w6h95sgpb5c1yr751c-ghc-8.10.7'
exporting path `/gnu/store/grd39lms6g8pg3r1zlvz7a5qwlymybhy-ghc-9.2.5-src.tar.xz'

building of `/gnu/store/i7b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv' timed out after 3600 seconds of silence
build of /gnu/store/i7b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv failed
View build log at '/var/log/guix/drvs/i7/b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv.gz'.
guix build: error: build of `/gnu/store/i7b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv' failed

Somehow the sending of store items when offloading poses problems; I do not
understand where the problem lies. But the Guix Build Coordinator approach
of letting the compiling machine fetch the inputs from a substitute server
seems to be more robust. No idea what to do here!

Andreas

Notes from the Guix Days

[Ludovic Courtès]

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> Thanks for the explanations.  I'm out of the loop, not having been able
> to attend physically the last Guix Days event.  Was there a recap of the
> discussions posted somewhere?  Was the freeze announce somewhere?  I
> wholly missed that, and I try to pay attention.

Notes on the release and branching discussions are here:

  https://lists.gnu.org/archive/html/guix-devel/2023-02/msg00066.html

Pjotr stored additional notes here (thanks!):

  https://gitlab.com/pjotrp/guix-days-fosdem-2023/-/tree/main/

Pjotr, can you add Andreas’ notes linked above?  Does anyone else have
notes to share?

Ludo’.

Building more of ‘core-updates’ on ci.guix

[Ludovic Courtès]

Hello!

Andreas Enge <andreas@enge.fr> skribis:

> So it would be nice if someone could set up a more complete job for
> core-updates on cuirass or QA, and maybe write up a how-to to see which
> packages work and which ones need more love, preferably by architecture.

I’ve just changed it the ‘core-updates’ job to build
‘etc/release-manifests.scm’ (you can check what’s in there).  So
everything goes well (a big “if” :-)), we’ll soon have substitutes for
Emacs, GTK, and whatnot.

For the record, anyone with (1) SSH access to berlin, or (2) a “TLS user
certificate” for use by Cuirass¹ can do it.  For method #1, set up a
tunnel to the Cuirass web server, like so:

  ssh -L 8081:localhost:8081 berlin.guix.gnu.org

Then visit <http://localhost:8081>, click on “Edit” in the vegan-burger
menu on the ‘core-updates’ line, adjust accordingly, and save.  (You can
see that form at
<https://ci.guix.gnu.org/specification/edit/core-updates>, you can can’t
submit changes.)

HTH!

Ludo’.

¹ https://git.savannah.gnu.org/cgit/guix/maintenance.git/tree/doc/release.org#n205

Re: State of core-updates

[Kaelyn]

Hi,

On the topic of the state of core-updates, I wanted to mention two things affecting i686-linux builds (and by extension some x86_64 packages like wine64):

1) glib-networking has a 32-bit-only patch left over from the upgrade from 2.70.0 to 2.72.2, which does not apply against the newer version, and which seems unneeded. I just sent in https://issues.guix.gnu.org/62209 to fix the package.

2) libaio 0.3.113 does not build on core-updates, though the previous version 0.3.112 does. I'm not sure how to handle this one, as the failure is a compile error from one of the test cases:

gcc -Wall -Werror -I../src -g -O2 -DTEST_NAME=\"cases/23.t\" -o cases/23.p main.c ../src/libaio.a -lpthread
mkdir testdir
rm -f testdir/rofile
echo "test" >testdir/rofile
chmod 400 testdir/rofile
rm -f testdir/rwfile
rm -f testdir/wofile
echo "test" >testdir/rwfile
echo "test" >testdir/wofile
chmod 600 testdir/rwfile
chmod 200 testdir/wofile
In file included from main.c:24:
cases/23.t: In function ‘thrproc2’:
cases/23.t:82:35: error: passing argument 2 of ‘splice’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   82 |                 if (splice(tmpfd, &offset, pipefds[1], NULL, 1, 0) != 1)
      |                                   ^~~~~~~
      |                                   |
      |                                   off_t * {aka long int *}
In file included from /gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/bits/fcntl.h:61,
                 from /gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/fcntl.h:35,
                 from main.c:9:
/gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/bits/fcntl-linux.h:398:49: note: expected ‘__off64_t *’ {aka ‘long long int *’} but argument is of type ‘off_t *’ {aka ‘long int *’}
  398 | extern __ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
      |                                      ~~~~~~~~~~~^~~~~~~
In file included from main.c:24:
cases/23.t: In function ‘thrproc3’:
cases/23.t:106:35: error: passing argument 2 of ‘splice’ from incompatible pointer type [-Werror=incompatible-pointer-types]
  106 |                 if (splice(tmpfd, &offset, pipefds[1], NULL, 1, 0) != 1)
      |                                   ^~~~~~~
      |                                   |
      |                                   off_t * {aka long int *}
In file included from /gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/bits/fcntl.h:61,
                 from /gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/fcntl.h:35,
                 from main.c:9:
/gnu/store/0hr9jpczkcgpgqkhf4q4868xd57h5a62-glibc-2.35/include/bits/fcntl-linux.h:398:49: note: expected ‘__off64_t *’ {aka ‘long long int *’} but argument is of type ‘off_t *’ {aka ‘long int *’}
  398 | extern __ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
      |                                      ~~~~~~~~~~~^~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:24: cases/23.p] Error 1
make[1]: Leaving directory '/tmp/guix-build-libaio-0.3.113.drv-0/libaio-0.3.113/harness'
make: *** [Makefile:23: partcheck] Error 2

Test suite failed, dumping logs.
error: in phase 'check': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("partcheck" "-j" "12" "prefix=/gnu/store/xr6s773c3d62g9aynydp1h6231p42ixn-libaio-0.3.113" "CC=gcc") exit-status: 2 term-signal: #f stop-signal: #f> 
phase `check' failed after 0.3 seconds


Cheers,
Kaelyn

P.S. For context, I hit the libaio error trying to build icecat (x86_64) on core-updates the other day; I hit the glib-networking error this morning trying to build wine, and then hit the libaio error again when retrying the wine (i686) build with my glib-networking change applied. The same build error affects both x86_64 and i686 builds of libaio.

Re: Notes from the Guix Days

[Pjotr Prins]

On Wed, Mar 15, 2023 at 05:34:24PM +0100, Ludovic Courtès wrote:
> Pjotr, can you add Andreas’ notes linked above?  Does anyone else have
> notes to share?

Added.

https://gitlab.com/pjotrp/guix-days-fosdem-2023

Re: State of core-updates

[Felix Lechner]

Hi Andreas,

On Wed, Mar 15, 2023 at 7:57 AM Andreas Enge <andreas@enge.fr> wrote:
>
> Somehow the sending of store items when offloading poses problems

Somehow I think I see a similar problem with 'guix deploy,' which I
have to restart manually several times in order to complete the store
transfer. In my case, the error presents as an SSH error ("parent
process is not connected" I think) though, instead of a Cuirass
timeout.

Kind regards
Felix

Re: State of core-updates

[Björn Höfling]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

On Wed, 15 Mar 2023 14:33:36 +0100
Andreas Enge <andreas@enge.fr> wrote:

> I more or less tried this by building things on berlin; however, big
> packages (?, precisely: openjdk checkout (not even building!)

OpenJDK@9 and @10 builds are fixed now on master.

Björn



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: State of core-updates

[Andreas Enge]

Am Thu, Mar 16, 2023 at 10:33:08AM +0100 schrieb Björn Höfling:
> Andreas Enge <andreas@enge.fr> wrote:
> > I more or less tried this by building things on berlin; however, big
> > packages (?, precisely: openjdk checkout (not even building!)
> OpenJDK@9 and @10 builds are fixed now on master.

Thanks! Actually they did build on my laptop, the problem was only with
offloading. Apparently a new problem appeared later, thanks for the fix!

Am Wed, Mar 15, 2023 at 12:20:28PM -0700 schrieb Felix Lechner:
> On Wed, Mar 15, 2023 at 7:57 AM Andreas Enge <andreas@enge.fr> wrote:
> > Somehow the sending of store items when offloading poses problems
> Somehow I think I see a similar problem with 'guix deploy,' which I
> have to restart manually several times in order to complete the store
> transfer. In my case, the error presents as an SSH error ("parent
> process is not connected" I think) though, instead of a Cuirass
> timeout.

It may be the same root cause. I did not suspect anything when big packages
needed to be transferred, but then it keeps happening with small packages
such as bash or imagemagick. And it becomes very annoying with packages
that have many inputs. As soon as I see no new line "exporting path..."
after a few seconds, it is almost certain that something broke and we will
end up with a timeout one hour later. I am trying with dblatex for about
a dozen times now. At some point in time, all machines of the build farm
will end up having (almost) all the inputs :-|

Yes, then building the package took no time at all! :-)

Andreas

Offloading problems on berlin

[Ludovic Courtès]

Hi,

Andreas Enge <andreas@enge.fr> skribis:

> exporting path `/gnu/store/grd39lms6g8pg3r1zlvz7a5qwlymybhy-ghc-9.2.5-src.tar.xz'
>
> building of `/gnu/store/i7b6ffy3jp8adanvkj7zbv3mb5cdsxnq-ghc-9.2.5.drv' timed out after 3600 seconds of silence

There’s a problem with offloading on berlin:

  https://issues.guix.gnu.org/61839

I occasionally offload from my laptop to machines at work but didn’t hit
this bug, so we’ll have to see if it’s specific to berlin or not.

Ludo’.

Re: Offloading problems on berlin

[Andreas Enge]

Am Thu, Mar 16, 2023 at 02:50:53PM +0100 schrieb Ludovic Courtès:
> There’s a problem with offloading on berlin:
>   https://issues.guix.gnu.org/61839
> I occasionally offload from my laptop to machines at work but didn’t hit
> this bug, so we’ll have to see if it’s specific to berlin or not.

Thanks for pointing out that it is a known issue!
Is there a commandline program that can be used like gkrellm to check
whether data is flowing out of berlin to the build node?

Andreas

Re: Offloading problems on berlin

[Andreas Enge]

Am Thu, Mar 16, 2023 at 09:40:37PM +0100 schrieb Andreas Enge:
> Thanks for pointing out that it is a known issue!

And it happens quite systematically with large packages sent as inputs.
When trying to build openjdk, I get without pause output like this:
   building /gnu/store/gqdzxi9idv4rby2g4j9s6h1m3qfbmjph-openjdk-15.0.9.drv...
   guix offload: sending 2 store items (960 MiB) to '141.80.167.158'...
   exporting path `/gnu/store/lil0s7gijwglfbvx4ailf9fqjmrw5jw9-openjdk-15.0.9-checkout'
   exporting path `/gnu/store/ri7i5r91p8zj4jnznsjxnh35n99fb8k6-openjdk-14.0.2-jdk'
and then it stops.

After maybe 40 times or so it goes through. I do not know whether this is
because the transfer finally succeeds (probably so), or maybe because the
build ends up on the machine that also built the input and still has it
in its store...

Andreas

Re: Offloading problems on berlin

[Kaelyn]

------- Original Message -------
On Thursday, March 16th, 2023 at 8:40 PM, Andreas Enge <andreas@enge.fr> wrote:


> 
> 
> Am Thu, Mar 16, 2023 at 02:50:53PM +0100 schrieb Ludovic Courtès:
> 
> > There’s a problem with offloading on berlin:
> > https://issues.guix.gnu.org/61839
> > I occasionally offload from my laptop to machines at work but didn’t hit
> > this bug, so we’ll have to see if it’s specific to berlin or not.
> 
> 
> Thanks for pointing out that it is a known issue!
> Is there a commandline program that can be used like gkrellm to check
> whether data is flowing out of berlin to the build node?

You may be able to use jnettop to see the network streams (it does need superuser privileges to run). Not sure how readable/useful it might be if berlin has a lot of active connections, though.

HTH,
Kaelyn

> 
> Andreas

Re: Offloading problems on berlin

[Andreas Enge]

Hello Kaelyn,

Am Thu, Mar 16, 2023 at 09:25:27PM +0000 schrieb Kaelyn:
> You may be able to use jnettop to see the network streams (it does need superuser privileges to run). Not sure how readable/useful it might be if berlin has a lot of active connections, though.

This is a huge help, thanks a lot!

It helps in particular in this situation:
guix offload: sending 17 store items (6,607 MiB) to '141.80.167.169'...
...
exporting path `/gnu/store/y4ipvkapf1gninaabwdl6pcz46c1frak-texlive-texmf-20210325'
where the difference is between a few 100kB/s before and 60 to 80 MB/s
while it is sending the data, and a few 100kB/s again when it fails...

Andreas

bug#61839: Offloading problems on berlin

[Andreas Enge]

Am Thu, Mar 16, 2023 at 02:50:53PM +0100 schrieb Ludovic Courtès:
> I occasionally offload from my laptop to machines at work but didn’t hit
> this bug, so we’ll have to see if it’s specific to berlin or not.

My impression is that in my case, the problem is not with ssh, but somehow
with the guix daemon. I tend to observe this:

guix offload: sending 1 store item (6,490 MiB) to '141.80.167.169'...
exporting path `/gnu/store/y4ipvkapf1gninaabwdl6pcz46c1frak-texlive-texmf-20210325'

Then jnettop shows data transfer of about 100 to 120MB/s during a bit over
a minute, which makes me think that the actual data transfer succeeds, but
that somehow the data is not registered in the store.
Then nothing tangible happens and offloading times out. Since I am
apparently not able to connect to the machines via ssh, I cannot have a
closer look at the receiving end.

Andreas

Re: Notes from the Guix Days

[Maxim Cournoyer]

Hello!

Ludovic Courtès <ludo@gnu.org> writes:

> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> Thanks for the explanations.  I'm out of the loop, not having been able
>> to attend physically the last Guix Days event.  Was there a recap of the
>> discussions posted somewhere?  Was the freeze announce somewhere?  I
>> wholly missed that, and I try to pay attention.
>
> Notes on the release and branching discussions are here:
>
>   https://lists.gnu.org/archive/html/guix-devel/2023-02/msg00066.html

All caught up now!

> Pjotr stored additional notes here (thanks!):
>
>   https://gitlab.com/pjotrp/guix-days-fosdem-2023/-/tree/main/

This is nice, I just peeked at "Debugging Guix beyond pk".  I'll
bookmark and read more of it, thank you!

-- 
Maxim

Re: Offloading problems on berlin

[Maxim Cournoyer]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Am Thu, Mar 16, 2023 at 02:50:53PM +0100 schrieb Ludovic Courtès:
>> There’s a problem with offloading on berlin:
>>   https://issues.guix.gnu.org/61839
>> I occasionally offload from my laptop to machines at work but didn’t hit
>> this bug, so we’ll have to see if it’s specific to berlin or not.
>
> Thanks for pointing out that it is a known issue!
> Is there a commandline program that can be used like gkrellm to check
> whether data is flowing out of berlin to the build node?

Just clarifying, it is *not* currently known issue outside of Berlin.

-- 
Thanks,
Maxim

Re: State of core-updates

[Maxim Cournoyer]

Hi Felix,

Felix Lechner <felix.lechner@gmail.com> writes:

> Hi Andreas,
>
> On Wed, Mar 15, 2023 at 7:57 AM Andreas Enge <andreas@enge.fr> wrote:
>>
>> Somehow the sending of store items when offloading poses problems
>
> Somehow I think I see a similar problem with 'guix deploy,' which I
> have to restart manually several times in order to complete the store
> transfer. In my case, the error presents as an SSH error ("parent
> process is not connected" I think) though, instead of a Cuirass
> timeout.

I can't be sure, but they don't seem related here: I can offload fine to
a distant machine, but using 'guix deploy' on the other hands often
caused GSSH errors, as I reported in #62213.

-- 
Thanks,
Maxim

Re: State of core-updates

[Andreas Enge]

Am Wed, Mar 15, 2023 at 05:59:12PM +0000 schrieb Kaelyn:
> 1) glib-networking has a 32-bit-only patch left over from the upgrade from 2.70.0 to 2.72.2, which does not apply against the newer version, and which seems unneeded. I just sent in https://issues.guix.gnu.org/62209 to fix the package.

Splendid, thanks a lot! I did not manage to extract a git commit that I
could apply with "git am" out of your message, so I ended up pushing it
under my name while adding yours as a comment in the git log.

The package builds under x86_64 and i686, I did not test the arm
architectures. We will see what happens.

Thanks a lot!

Andreas

Re: State of core-updates

[Kaelyn]

------- Original Message -------
On Friday, March 17th, 2023 at 8:01 PM, Andreas Enge <andreas@enge.fr> wrote:
 
> 
> Am Wed, Mar 15, 2023 at 05:59:12PM +0000 schrieb Kaelyn:
> 
> > 1) glib-networking has a 32-bit-only patch left over from the upgrade from 2.70.0 to 2.72.2, which does not apply against the newer version, and which seems unneeded. I just sent in https://issues.guix.gnu.org/62209 to fix the package.
> 
> 
> Splendid, thanks a lot! I did not manage to extract a git commit that I
> could apply with "git am" out of your message, so I ended up pushing it
> under my name while adding yours as a comment in the git log.
> 
> The package builds under x86_64 and i686, I did not test the arm
> architectures. We will see what happens.
> 
> Thanks a lot!

You're welcome! I'm happy to help. :) And sorry about "git am" not working, though I'm not sure why. I sent the email with "git send-email --to=guix-patches@gnu.org --subject-prefix="PATCH core-updates" HEAD^" as I've done with other patches (I also have format.useAutoBase set to whenAble in my .gitconfig).

Cheers,
Kaelyn

> 
> Andreas

Re: State of core-updates

[Felix Lechner via Development of GNU Guix and the GNU System distribution.]

Hi Andreas and Kaelyn,

On Fri, Mar 17, 2023 at 1:18 PM Kaelyn <kaelyn.alexi@protonmail.com> wrote:
>
> sorry about "git am" not working

I hesitate to get in the middle, but it may be appropriate for
attribution reasons to revert commit cc56be2f and then re-commit with
the '--author' option, unless rebasing and breaking history is
acceptable. [1]

Kind regards
Felix

[1] https://stackoverflow.com/a/28845565

Re: State of core-updates

[Kaelyn]

Hi Felix and Andreas,

------- Original Message -------
On Friday, March 17th, 2023 at 8:27 PM, Felix Lechner <felix.lechner@lease-up.com> wrote:


> 
> 
> Hi Andreas and Kaelyn,
> 
> On Fri, Mar 17, 2023 at 1:18 PM Kaelyn kaelyn.alexi@protonmail.com wrote:
> 
> > sorry about "git am" not working
> 
> 
> I hesitate to get in the middle, but it may be appropriate for
> attribution reasons to revert commit cc56be2f and then re-commit with
> the '--author' option, unless rebasing and breaking history is
> acceptable. [1]

I'm at least a little in favor of that, as the commit message for cc56be2f3858487cf1d8acfb345942f0784221ee is mis-formatted (it doesn't have the first 'gnu: ' prefixed summary line, and so git log --oneline doesn't format it right). I just quickly formatted and sent a v2 patch using "git format-patch --attach" and "git send-email" to try to get something at https://issues.guix.gnu.org/62209 that will work properly with "git am". (I'm still puzzled at what happened with the first one, as downloading the whole message and applying it with "git am" also fails for me.)

Cheers,
Kaelyn

> 
> Kind regards
> Felix
> 
> [1] https://stackoverflow.com/a/28845565

Re: State of core-updates

[Andreas Enge]

Hello,

Am Fri, Mar 17, 2023 at 08:43:13PM +0000 schrieb Kaelyn:
> I'm at least a little in favor of that, as the commit message for cc56be2f3858487cf1d8acfb345942f0784221ee is mis-formatted (it doesn't have the first 'gnu: ' prefixed summary line, and so git log --oneline doesn't format it right).

sorry for that, I did go over the commit message, but overlooked this part.

> I just quickly formatted and sent a v2 patch using "git format-patch --attach" and "git send-email" to try to get something at https://issues.guix.gnu.org/62209 that will work properly with "git am". (I'm still puzzled at what happened with the first one, as downloading the whole message and applying it with "git am" also fails for me.)

It still does not - there is no first line for the commit message
(the "gnu: ...").

When I try to "git am the-message-in-mbox-format", I get:
fatal: Dirty index: cannot apply patches (dirty: gnu/local.mk gnu/packages/gnome.scm gnu/packages/patches/glib-networking-32-bit-time.patch)

When I just try to apply "git am v2-0001-gnu-glib-networking-Fix-32-bit-builds.patch":
Patch format detection failed.
(which is normal, it does not have the commit message, but starts with
"diff").

I may have made an error, but it is suspicious that QA apparently also did
not manage to extract a git commit (there is no corresponding branch in
guix-patches).

Concerning "git send-email", I recently tried it and followed the advice at
   https://guix.gnu.org/en/manual/devel/en/guix.html#Sending-a-Patch-Series
It does not involve a "git format-patch" step.

Andreas

Re: State of core-updates

[Andreas Enge]

Hello,

Am Wed, Mar 15, 2023 at 05:59:12PM +0000 schrieb Kaelyn:
> 2) libaio 0.3.113 does not build on core-updates, though the previous version 0.3.112 does. I'm not sure how to handle this one, as the failure is a compile error from one of the test cases:

it compiles for me on x86_64, but indeed not on i686.
I added a patch; unfortunately this means recompiling 2000 packages.

Thanks for the report!

Andreas

Re: Building more of ‘core-updates’ on ci.guix

[Andreas Enge]

Hello!

Am Wed, Mar 15, 2023 at 05:47:08PM +0100 schrieb Ludovic Courtès:
> I’ve just changed it the ‘core-updates’ job to build
> ‘etc/release-manifests.scm’ (you can check what’s in there).  So
> everything goes well (a big “if” :-)), we’ll soon have substitutes for
> Emacs, GTK, and whatnot.

thanks a lot, also for the explanation on what to do over ssh.

Would it be okay to add the following packages to etc/release-manifests.scm:
openjdk
unison (exercises ocaml)
ghc-pandoc (exercises ghc)
calibre (exercises Qt5 and python-pyqt)

icecat is supposed to be added as soon as rust is available on i686,
but I suppose we could add it conditionally only on x86_64, no?
Actually there is already a filter step in %system-manifest.
The same holds for ungoogled-chromium. It should be enough to just
add them.

Andreas

Re: State of core-updates

[Kaelyn]

[-- Attachment #1: Type: text/plain, Size: 3185 bytes --]

------- Original Message -------
On Saturday, March 18th, 2023 at 8:56 AM, Andreas Enge <andreas@enge.fr> wrote:


> 
> 
> Hello,
> 
> Am Fri, Mar 17, 2023 at 08:43:13PM +0000 schrieb Kaelyn:
> 
> > I'm at least a little in favor of that, as the commit message for cc56be2f3858487cf1d8acfb345942f0784221ee is mis-formatted (it doesn't have the first 'gnu: ' prefixed summary line, and so git log --oneline doesn't format it right).
> 
> 
> sorry for that, I did go over the commit message, but overlooked this part.
> 
> > I just quickly formatted and sent a v2 patch using "git format-patch --attach" and "git send-email" to try to get something at https://issues.guix.gnu.org/62209 that will work properly with "git am". (I'm still puzzled at what happened with the first one, as downloading the whole message and applying it with "git am" also fails for me.)
> 
> 
> It still does not - there is no first line for the commit message
> (the "gnu: ...").
> 
> When I try to "git am the-message-in-mbox-format", I get:
> fatal: Dirty index: cannot apply patches (dirty: gnu/local.mk gnu/packages/gnome.scm gnu/packages/patches/glib-networking-32-bit-time.patch)
> 
> When I just try to apply "git am v2-0001-gnu-glib-networking-Fix-32-bit-builds.patch":
> Patch format detection failed.
> (which is normal, it does not have the commit message, but starts with
> "diff").
> 
> I may have made an error, but it is suspicious that QA apparently also did
> not manage to extract a git commit (there is no corresponding branch in
> guix-patches).
> 
> Concerning "git send-email", I recently tried it and followed the advice at
> https://guix.gnu.org/en/manual/devel/en/guix.html#Sending-a-Patch-Series
> It does not involve a "git format-patch" step.

I'm at a complete loss as to why the patch won't apply properly. I originally sent it using "git send-email" (following the manual instructions, which I also recently double-checked trying to figure out the problem) as I have done with almost all of the other patches I've submitted. The v2 patch was made with the addition of "--attachment" to see if the different format transferred better, but no luck there. https://issues.guix.gnu.org/62137 is another patch I sent a couple days prior to https://issues.guix.gnu.org/62209; I can download 62137 through the web interface and apply it with git "am", but for either in 62209 I encounter the same errors as you.

The original commit message as shown by "git log" is:

commit 1ad88ac769189d36139fbfd3ceb562fbe3a1fed5 (core-updates)
Author: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Date:   Wed Mar 15 10:22:25 2023 -0700

    gnu: glib-networking: Fix 32-bit builds.
    
    * gnu/packages/gnome.scm (glib-networking): Remove obsolete patch.
    * gnu/packages/patches/glib-networking-32-bit-time.patch: Remove patch.
    * gnu/local: Remove it.


I've attached the original patch as generated by "git format-patch --to=62209@debbugs.gnu.org core-updates^..core-updates" since the mumi version doesn't want to cooperate. I also locally tested that the attached patch worked with "git am" locally.

Cheers,
Kaelyn

> 
> Andreas

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-glib-networking-Fix-32-bit-builds.patch --]
[-- Type: text/x-patch; name=0001-gnu-glib-networking-Fix-32-bit-builds.patch, Size: 54426 bytes --]

From 1ad88ac769189d36139fbfd3ceb562fbe3a1fed5 Mon Sep 17 00:00:00 2001
Message-Id: <1ad88ac769189d36139fbfd3ceb562fbe3a1fed5.1679157139.git.kaelyn.alexi@protonmail.com>
From: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Date: Wed, 15 Mar 2023 10:22:25 -0700
Subject: [PATCH] gnu: glib-networking: Fix 32-bit builds.
To: 62209@debbugs.gnu.org

* gnu/packages/gnome.scm (glib-networking): Remove obsolete patch.
* gnu/packages/patches/glib-networking-32-bit-time.patch: Remove patch.
* gnu/local: Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 11 ----
 .../patches/glib-networking-32-bit-time.patch | 61 -------------------
 3 files changed, 73 deletions(-)
 delete mode 100644 gnu/packages/patches/glib-networking-32-bit-time.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 73617d3af7..ff35978f07 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1204,7 +1204,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
-  %D%/packages/patches/glib-networking-32-bit-time.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
   %D%/packages/patches/glibc-CVE-2019-9169.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 62b3ae72c7..ce7f3b6cec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4911,17 +4911,6 @@ (define-public glib-networking
               (patches
                (search-patches "glib-networking-gnutls-binding.patch"))))
     (build-system meson-build-system)
-    (arguments
-     (if (target-64bit?)
-         '()
-         (list #:phases
-               #~(modify-phases %standard-phases
-                   (add-after 'unpack 'work-around-32-bit-time-t
-                     (lambda _
-                       (invoke "patch" "--force" "-p1" "-i"
-                               #$(local-file
-                                  (search-patch
-                                   "glib-networking-32-bit-time.patch")))))))))
     (native-inputs
      (list pkg-config gettext-minimal))
     (inputs
diff --git a/gnu/packages/patches/glib-networking-32-bit-time.patch b/gnu/packages/patches/glib-networking-32-bit-time.patch
deleted file mode 100644
index a437310270..0000000000
--- a/gnu/packages/patches/glib-networking-32-bit-time.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Work around a year-2038 issue when building with a 32-bit 'time_t'
-on 32-bit platforms:
-
-  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/172
-
-From 4f8ca86a0e460794188c3355f0c7cc11fdbe4229 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue, 21 Sep 2021 17:07:44 +0000
-Subject: [PATCH] tests: Accept GNUTLS' workaround for limited size of time_t
-
----
- tls/tests/certificate.c | 15 +++++++++++++++
- tls/tests/meson.build   |  1 +
- 2 files changed, 16 insertions(+)
-
-diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
-index c0100d30..d216c710 100644
---- a/tls/tests/certificate.c
-+++ b/tls/tests/certificate.c
-@@ -672,6 +672,12 @@ test_certificate_not_valid_before (void)
-   g_object_unref (cert);
- }
- 
-+/* On 32-bit, GNUTLS caps expiry times at 2037-12-31 23:23:23 to avoid
-+ * overflowing time_t. Hopefully by 2037, either 32-bit will finally have
-+ * died out, or GNUTLS will rethink its approach to
-+ * https://gitlab.com/gnutls/gnutls/-/issues/370 */
-+#define GNUTLS_32_BIT_NOT_VALID_AFTER_MAX 2145914603
-+
- static void
- test_certificate_not_valid_after (void)
- {
-@@ -686,7 +692,16 @@ test_certificate_not_valid_after (void)
-   actual = g_tls_certificate_get_not_valid_after (cert);
-   g_assert_nonnull (actual);
-   actual_str = g_date_time_format_iso8601 (actual);
-+
-+#if SIZEOF_TIME_T <= 4
-+  if (g_date_time_to_unix (actual) == GNUTLS_32_BIT_NOT_VALID_AFTER_MAX)
-+    g_test_incomplete ("not-valid-after date not representable on 32-bit");
-+  else
-+    g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#else
-   g_assert_cmpstr (actual_str, ==, EXPECTED_NOT_VALID_AFTER);
-+#endif
-+
-   g_free (actual_str);
-   g_date_time_unref (actual);
-   g_object_unref (cert);
-diff --git a/tls/tests/meson.build b/tls/tests/meson.build
-index e9c7d8c6..7415f913 100644
---- a/tls/tests/meson.build
-+++ b/tls/tests/meson.build
-@@ -69,6 +69,7 @@ foreach backend: backends
-     test_cflags = cflags + [
-       '-DBACKEND="@0@"'.format(backend),
-       '-DBACKEND_IS_' + backend.to_upper(),
-+      '-DSIZEOF_TIME_T=@0@'.format(cc.sizeof('time_t', prefix: '#include <time.h>')),
-     ]
- 
-     if backend == 'openssl'

base-commit: af95f2d8f98eb2c8c64954bb2fd0b70838899174
prerequisite-patch-id: 36386ad8979a6ec9c0c58dbb204602a7e1bff4d7
prerequisite-patch-id: 17a76eeee4f8bc42e4c790d0ddc9e429439b0fc0
prerequisite-patch-id: 57fe91b12596e85bc724eef7d4508b4a67302c3a
prerequisite-patch-id: e527e10801e8b254762b01617361a9521bd21a76
prerequisite-patch-id: 45ff51a9e11cfe7f16f41b0ef0914ad2dd2edc0a
prerequisite-patch-id: 723082aea75612a0ea217a2b90b77c4c7ffaa50d
prerequisite-patch-id: 8a35af8a4c1d582bbcbc6c6cb63a9e334e2a0b25
prerequisite-patch-id: eeae8fb23bfb981a8b82268e2b9062e459bf838c
prerequisite-patch-id: 0e10d3b05f6077ff56d925616f40980041ba8b65
prerequisite-patch-id: b698c52156e927da0dfa493d8a33d81b571db9c3
prerequisite-patch-id: aeacb27cf06a6bda9706868a79ff6c1d59fa57dc
prerequisite-patch-id: 1bad7748e76774c33174bd7f936ae2e6f0aef333
prerequisite-patch-id: 62ee2cd5ecbc4e566104d76a977fcad64811493e
prerequisite-patch-id: b187a3a1295656f95d13c7f192dac52004a94fdc
prerequisite-patch-id: c89b258801acc2e0725c9783386140f97e1d248b
prerequisite-patch-id: 244c89da6b2f5c99138515f10da6d959a33aab88
prerequisite-patch-id: e969df8b00ff73985014475eeb6403e52bc8cbbf
prerequisite-patch-id: 0a573fb0336c515df97cda8407605801a065a0f0
prerequisite-patch-id: 4715d30dc6036d3c7266ab52482694f4aa36b73d
prerequisite-patch-id: b0ccecb26ea6535d834c36be5a7e6e2edac41d28
prerequisite-patch-id: f31b8650b70be29462865c51ba7ed11b4c437c8c
prerequisite-patch-id: 9e8b364ce3cebcafd11f288fa6771b6a24fea1a9
prerequisite-patch-id: 84eaa84d8f90cb086c1b414a4c430dd6d64f5031
prerequisite-patch-id: 96d36e0f2e86658900398ad4c028667a3b57d899
prerequisite-patch-id: d102c56d3651c6a3077947c27eb3fcb1c7585943
prerequisite-patch-id: 1315690c6bf160df4ab1789087cf55d2c45b33c6
prerequisite-patch-id: 08d2c17b92b3279b3b7d4c0c94f6ed85fadc84ce
prerequisite-patch-id: 2dbf4d04365c7f445284c6ae45cd78f4b57e132e
prerequisite-patch-id: 7bc35c527b967e313b63577a77bee38b3e574feb
prerequisite-patch-id: 8de322b60e1494929e46f8c30c0d7c799de8c9e1
prerequisite-patch-id: bdb4f88858c1bbda63a4c189235f3897e43bbd57
prerequisite-patch-id: 933e94ed095dfa9ada5ed4124f34420a6daac2ba
prerequisite-patch-id: 6867bac39e2631d46b3556c4a40f75892e25a409
prerequisite-patch-id: 3bb774d10150206f9f96b5e9f208fc1c1ffc2c0c
prerequisite-patch-id: 1c57f49f61186e1b9df3c8d17ed7b3559c3fcb3f
prerequisite-patch-id: 7bc0ffe6728328a2e71da65769d925d3fd93beba
prerequisite-patch-id: 716324a5dc95a80a7b8d712998467212186a88d6
prerequisite-patch-id: c5f05f1063c040ab0867fe00bb80cc026c9b0eea
prerequisite-patch-id: 343f2173d34e4f532df9143d5213cff50107b5a4
prerequisite-patch-id: b9abf56893101c7aa57f71764633261e306b12a8
prerequisite-patch-id: 8ae40b3bdf2ea927196051fe133a83753e9d1262
prerequisite-patch-id: 424d8cd06cb5196c14fc894150612a894555a76b
prerequisite-patch-id: 5a4ed2afb5cd3a0fefc9409eee0875c6d3399dde
prerequisite-patch-id: f56ed56f3628618003dd81dfa6327013b78e3b8d
prerequisite-patch-id: a74ed47b97a0b3a574c64fe4aa5aa91463b8e732
prerequisite-patch-id: ef25720ddcdb3b877aeba06b2e9ebe851dd670d8
prerequisite-patch-id: 0db72bd519a9e3f814634a8da4e8a034318f0a86
prerequisite-patch-id: ab43ef9989643c9491883028ca9730534d702dc5
prerequisite-patch-id: 4db56d6245747a227fb13c19541a936a5e4fed08
prerequisite-patch-id: c8c811fdf45a6ba1a91657464f1e4877a363cfca
prerequisite-patch-id: 1d3966411e9727662a1fdd962bcbc8f018e2ad24
prerequisite-patch-id: cc4df8b7f179f26055a39294da7ec68a9602961b
prerequisite-patch-id: bb67debfc8fd7664264364dedd0880b292cf7c37
prerequisite-patch-id: 68747c3698f0c0ccde6bc846320d46ab91ddc8f4
prerequisite-patch-id: b7f85b24b42b85005feca9519424f1190342fa6e
prerequisite-patch-id: 8b870fb14f2e48a6313573e96c4dc63e3e98cbab
prerequisite-patch-id: 59599555d350e4f727c3c0d9a4b4b36110056518
prerequisite-patch-id: e12fb4cacdbf6f84d05cd8eb66d9df731db512ac
prerequisite-patch-id: 9308348f0e8b1d24332b91112365af6df829f28a
prerequisite-patch-id: 939c71ddb6c9e6dfec320689713a9b2fd6deed2d
prerequisite-patch-id: c8fa0ca3aa2f7804c95cf46f224718f561e63aa1
prerequisite-patch-id: 97af9dd95f7c661e4f7e078f6b3b6384c6790fc3
prerequisite-patch-id: 649610b53c20c6d842de9d2cf4664517de9b7b73
prerequisite-patch-id: 1c62cd8c792cb8dd18d36a316385c98dabdbc557
prerequisite-patch-id: 723480b3502fc1cc425791caacd00fce86da14d3
prerequisite-patch-id: 30b7032643315d5d086e8d59276759c5b7ff69f0
prerequisite-patch-id: 75bb16f0c52123f5be0da49a4bd1ee3112e425f2
prerequisite-patch-id: d0638a7bf47ea26d4fa78667fdf44dd70e85a251
prerequisite-patch-id: 31bd0c541b1a225b5d097b50b0c4641353f4a331
prerequisite-patch-id: 66ffb7d1256ff4e011485420342d7135481021e3
prerequisite-patch-id: 3b1e582f8f6f4647956f2e7dd47b53a4bdcbfd77
prerequisite-patch-id: ff0855bf5b978d05581a64e28327eeabd849c6db
prerequisite-patch-id: 7196f768e01e8db0e5dabe4fe991296d7b0eaee9
prerequisite-patch-id: 46b21461180f9a916a6adf8c8b869c7d4f3beaa9
prerequisite-patch-id: faefbdb3a78ac2295005cca76ec0a386ad0545d4
prerequisite-patch-id: d491acafbf9c90183358245af8d56e3d6d255755
prerequisite-patch-id: ba8f012200e6efe7b2575dde64e286774ebf51ca
prerequisite-patch-id: fedff7eb0c5cee94f39cc46f85f3f58569f610be
prerequisite-patch-id: 2aca0844c5e7fd546c089e9d2a73e03670738248
prerequisite-patch-id: a31755df131ca5210099e81f5da309ce1d744bd0
prerequisite-patch-id: 664378d70df5b7522170dcfee0bd7c59f8086c0d
prerequisite-patch-id: 53e2f71efcebe5e89290f6b2e307600c02295307
prerequisite-patch-id: ea5e90233b52b19c7465e718dea0d280d62a4a68
prerequisite-patch-id: 004442a2ff3f945c695d5027eb05ed6bc0d158e7
prerequisite-patch-id: 11e22b76f64e078e6cb79be07f578f2ee9103d08
prerequisite-patch-id: 82d4c27cb334fb6487cdbad64b13c803c60e6959
prerequisite-patch-id: 8a2ec5393e58c86b83d17f076bdff1df69ea81bb
prerequisite-patch-id: 4027214f68f08b95c5240103fb31f6e8af8a08e3
prerequisite-patch-id: 93dfa57809b88dc75b4a382463cce8630785fdca
prerequisite-patch-id: 563facc88f6c66dcdc78b4c93d8df469abc1c33d
prerequisite-patch-id: c038cc79b2e4cb75c782b6fd45ba14161b8add6e
prerequisite-patch-id: fe6597634bd3e794d705d903969ceb3c569a3b31
prerequisite-patch-id: 877cc7b1ae7f60cde6ea96a68d6679c728a99dc3
prerequisite-patch-id: 421706aca26bbfaad3dcf9b4c1decd3ea3e30d2b
prerequisite-patch-id: 8c0d2ab572b7c8f29c3fa02cdf6853fe51faa5b9
prerequisite-patch-id: 9c88fe958a099c97dbe7e8b71b90f7d8fabfed64
prerequisite-patch-id: c280c4de7b43073c21bf9a457cfc46bf619c985d
prerequisite-patch-id: aaad47a7d60813b531e5326269d40dc140761cdd
prerequisite-patch-id: 9851357518023e93d48eeb864266694866304171
prerequisite-patch-id: 2eb0a6c1a2b68291431f51b5326ad4c783553765
prerequisite-patch-id: 80636068ca1d66aa36b318561e30c8fa1c0c7b91
prerequisite-patch-id: fe1e67e3fe55a965820a4c50e89f319b821eaf08
prerequisite-patch-id: 0bb6e1a8923aefafae573fe6058cd5bd2f502a13
prerequisite-patch-id: c9f331a961aae1780222f0cfa88db856bb3d3bc0
prerequisite-patch-id: ee29fb3f0df17c1d9fbc9c58b3bd08a03f2d3634
prerequisite-patch-id: 8f652cba5d16ddc1830588ae95d8c9dcbcc2a5d4
prerequisite-patch-id: 813f40e846e48f29e51a1dccba12aad1b1fce73e
prerequisite-patch-id: 1117f04764a421e20550223cfa7b5fd54bcde4a3
prerequisite-patch-id: 400c13c7d270f7f22ba90066d5568aec114ee925
prerequisite-patch-id: 61c2dd636ef19f7cca53db6c56c4731c53116029
prerequisite-patch-id: 6d190b0ed0525cd487bbca79845ac696ca203f96
prerequisite-patch-id: 68266426d584e4398c5e7bf06b7406071458bce9
prerequisite-patch-id: 8b1142e425de780afbace0a812606b18ba14de04
prerequisite-patch-id: 8d4e6e6272e38b36516be0ff1b87f6a5a283a56d
prerequisite-patch-id: a8cf23525981d66e1b3c9cc698c3c09e80aff527
prerequisite-patch-id: ff2bdd8d2d1fd0a812f5b2050421cad029619ae2
prerequisite-patch-id: d2a83f29141ee75f993a750b2c0f83c9b1ee325a
prerequisite-patch-id: c991a62a301c477f6dffc517d2442cf78bd7d311
prerequisite-patch-id: cbaeaffffeff9acce5a006951a13608f72a6e022
prerequisite-patch-id: 8c2b98a9f4bb2824cf1a854bde41abbc00a41bc4
prerequisite-patch-id: b6eacc38f4130e2d4e01dc8a466d9b65fdb02063
prerequisite-patch-id: 73bd9abfa43f2182bd9812001f71137a0eda26da
prerequisite-patch-id: fdd38b0c362429587300df726df9dde6cf4c51f3
prerequisite-patch-id: 206d7a9befc4f7fe513c58b2fcf2b5af5838d2ee
prerequisite-patch-id: f8eeff12fc0f289e72cc131548b2733f92ea2c64
prerequisite-patch-id: 761b90298d122cfe2902f42ead19548b7e8f5f45
prerequisite-patch-id: a07fa41879ae40dce8ae1f5b03c19e34526d2246
prerequisite-patch-id: 88775979057a2be9c61134549a281c2450464548
prerequisite-patch-id: d7efa37a59335383eee15638d96fd2685a2dbd8d
prerequisite-patch-id: 8c64874757429352635b424216704f97e4a404ee
prerequisite-patch-id: 6066e09ed8de22322493d6617592c4016ece0308
prerequisite-patch-id: 97352548a3d4152c790a1fd94b7ca3681fc36cde
prerequisite-patch-id: 4c3d14237fa7f73fcd4409079c57526854eeff6f
prerequisite-patch-id: 0fa01683485d2290dc06be24fc967e70db17f8ff
prerequisite-patch-id: 3af4f66894b0d4bb48c949b24e9219a0a6c52a82
prerequisite-patch-id: 3aa48f5fca3915ade3e7467c61b0a50234463559
prerequisite-patch-id: 96efe1ce8d2a5c41ec409f423d53489a0ac59013
prerequisite-patch-id: dbe81ecc3cbad5bee226e9ee3c785fa46d52d1a9
prerequisite-patch-id: 923db573c5f841b390a4ce9d36eb2a8e136b45aa
prerequisite-patch-id: 309696f35e1538d9627dfecb7ec9e945a79aa88e
prerequisite-patch-id: c51d2b96145df76e4fca1bcb782593c2b3441912
prerequisite-patch-id: 8e82592bf36e08a0cb59cf9506538942da54e5c0
prerequisite-patch-id: 5954085eb469c785f529692acbbc5f0cc2a47a5a
prerequisite-patch-id: 20c14fd5cb3edc8ff9402694cbf768268ce1b075
prerequisite-patch-id: f7b44ea6b44b44afd5eff3f6a44cbc4f97abf4bd
prerequisite-patch-id: e0c0e96ed9c72312ef6266677c6f8cd3b43caadb
prerequisite-patch-id: 67f675191e424b91f5010672a6abf129384d651a
prerequisite-patch-id: 569ef525ca41deb36c91c693fe3f0d45a3fb22d2
prerequisite-patch-id: d02a97b2695d464381e7d0d3ae3bda80941039b2
prerequisite-patch-id: e7d934c049eba83a0554dd14ad282c83dfdb29d0
prerequisite-patch-id: 27d959d6e3eeaf6b42e0875200ecef42ce44f09c
prerequisite-patch-id: ebba53c68cbdad3080bf40ab5b9b928c3455b580
prerequisite-patch-id: 61041067dd8e6cb726b9ced9f3e36d0a077e6932
prerequisite-patch-id: d99543fb54af5c52559007d7bd8ef0e86d7480bb
prerequisite-patch-id: b521fa5dab7da60acbbe8f1c6154e47ab9fd1cf4
prerequisite-patch-id: b0ee7c300a0eb4a9bbc26872d3b3fdb023e87925
prerequisite-patch-id: 3933ce0decbae4d5f8a344ba26c2069c5908a942
prerequisite-patch-id: 7c137b54bb0a468c277c77c1cbda0778dabb87e4
prerequisite-patch-id: 5a409998c65cc5f57e198bf5f5cfccfc534cdcb8
prerequisite-patch-id: ea2e42791e91b7c63d5451dbae5490327dfbc453
prerequisite-patch-id: 84426affb1ab798de2d31f702401ba07b14abfd8
prerequisite-patch-id: 9fd780a9edddc617207f5f20062054f8a60b4b46
prerequisite-patch-id: 2009eed97048124ccfbb363931419dbd02fed2d9
prerequisite-patch-id: bad59d8332545e861119aed630158bb2a2c355d3
prerequisite-patch-id: 0af5f0cf11db757e9fd6cf0cf3c5196a62538ba1
prerequisite-patch-id: 36d4302ae0fb33b77e0989a86f12a4bf2735789c
prerequisite-patch-id: 983d19c4d348d93b5f0a7d03b5b06a66e23f26c0
prerequisite-patch-id: 9af4af5b7453f240c138df02d6bb405059d04215
prerequisite-patch-id: 6babd7cabab55f1c37346ab2e332c2fa975e764a
prerequisite-patch-id: 86aa071193c7baa570da1e4eb480616e029781ac
prerequisite-patch-id: 78d289aad93ab54c9f32e6205ba6cb62ae59dbf3
prerequisite-patch-id: 721a9793e0acb01c457a740e23e1320b8d4d4d0d
prerequisite-patch-id: 7b907c183dfff61449bcfd93c604db9b99cb2eda
prerequisite-patch-id: dc6732b4f9722508b5c2e32b28d4b542c9503160
prerequisite-patch-id: cca95e460fe86ac2150e1e68ac2ee90241baaa55
prerequisite-patch-id: 15587a978fb3ae6107aeaa2eff40094b390d4463
prerequisite-patch-id: 1f77fed552ff39268b5411ef21dc1daf97c8da6d
prerequisite-patch-id: 9491228f5321f2f4aa56b5ca340b108df895fba0
prerequisite-patch-id: 3b1b27dc0ce45a6d0f435b2fe8bf1ac925b370eb
prerequisite-patch-id: 89b2921d48f22902632b53e6c057bd75405e0155
prerequisite-patch-id: 0567db9794797714301feba1b4b6a7a2ba2d857c
prerequisite-patch-id: 254b5fbaf8d9f01b61e14c5955f0c6247624f3dd
prerequisite-patch-id: a13ec5efd3d656dd57daf0798b25cf4d2a6a7f08
prerequisite-patch-id: 858d9a5c57ce7cd4a1585536b23c3750d931092c
prerequisite-patch-id: 773a5ef7ecd455f6058877e79a886e7a97fd56d7
prerequisite-patch-id: 95b92878ac7378ca6eaf2986a8e29a762427e212
prerequisite-patch-id: 3270458cba487fe1fe8e026ef9cfddd9f1a9f285
prerequisite-patch-id: afc575308f18fe2715c5b58e10fd9c83af504843
prerequisite-patch-id: 4c4e58997ccc7bcc3bea6a40dce318d1810790be
prerequisite-patch-id: fde5f33205e27e533f5f8565e02eb4ca510cbc03
prerequisite-patch-id: f387205647b80def47e3c5cbfcc5f36b919e6c38
prerequisite-patch-id: e8d1081b1fb6e9ae51ca09dfede3dd7dca373171
prerequisite-patch-id: d7d82a770d2439baed78e3cb4559b610e3c43708
prerequisite-patch-id: 261d53e26e4bdd4ad872e8b0bbe92c3f902b1106
prerequisite-patch-id: 7c49d0fe67eba5bece116afa4e747e5594018e30
prerequisite-patch-id: aff12dcc1d3c50f462abfc1a855307c01a762d89
prerequisite-patch-id: 13790d01fe68f0d866d3a590421b7e38827a979f
prerequisite-patch-id: f60c97e8000200101901124c4d499c045f5ddf37
prerequisite-patch-id: d9bc52abfce39f127df12127888ea4ac403136dc
prerequisite-patch-id: efec77bdc61df9a493d1bfbad7df6e55267189a3
prerequisite-patch-id: f1c645d97c922aab1819200db0496f7a52b839ea
prerequisite-patch-id: 829400710fde68afcf0886fff4ed4d1acba5a555
prerequisite-patch-id: 74ba51a5a9e11c8d00ee7dfd5f09390d96785a42
prerequisite-patch-id: 052caa16ba35ee229a4e71a717bee655e37be08c
prerequisite-patch-id: ac7817508e13b308002a05956963ab0f16c62db0
prerequisite-patch-id: c936229e3d1370b47b4e7b1732b5142056542d27
prerequisite-patch-id: 3513935ef635cab57dcb4661a2e9dea92043eb3d
prerequisite-patch-id: dab95ca8ed758841f88b9a34690c386ed66dd930
prerequisite-patch-id: 9690c0e7c3a5dab760b28d02bd7e5d12bb55ea9b
prerequisite-patch-id: c65e576ac263f5316e58805e47f372ed6fae476c
prerequisite-patch-id: 0bf58814b1f3aee3ac1c90eede4b8c108da3891c
prerequisite-patch-id: b24fa03cfb5a25f291d4c11c085f3a732c949001
prerequisite-patch-id: ff8fd740a1b00d3c7a9f43c9b5559d136ebe2e85
prerequisite-patch-id: 68da4e97e6e311add6859446201f88ed40d08e06
prerequisite-patch-id: 175fb329a8292318b8f1f650b3a17301fb20361e
prerequisite-patch-id: c3af218673971d42ae359f9d7963e61af350e5fe
prerequisite-patch-id: b6b87501d540e17e98cec3d22e4a507304a0bf08
prerequisite-patch-id: d2acf833c6083804222c1aaf296de3a484b78f9c
prerequisite-patch-id: 09943a4e40fb5691c223afc974f4c427cdfb30f9
prerequisite-patch-id: 5beb9d9dc2e3eeb268dd16cc86518ac2ced16283
prerequisite-patch-id: 2e713817854d88c1825120d7cfa20549320b7e70
prerequisite-patch-id: 1f533cf8d2d38a9cc182c0c8111225512d38d786
prerequisite-patch-id: a247836fe8b1f240468f50963e34201ba7129a03
prerequisite-patch-id: d4b8bd1f51843550c1b9c36bbac807aaeea5528c
prerequisite-patch-id: e60d419a06caa9e927cd9091c618df97985a3ca6
prerequisite-patch-id: 1d599fa27289a6c8a905da794022d329bf625aa6
prerequisite-patch-id: b7596467d62d6fc6782ce8060e53b68a088cffb2
prerequisite-patch-id: 50f0e36dba4a20efa09109bb49c4359c7f467184
prerequisite-patch-id: 32c3d0db81b08e680522f8ae831614f20c4caecc
prerequisite-patch-id: b8f236cc3f2d74c47f11e6a5c50e27c510228e5c
prerequisite-patch-id: 8be9f4e3d2f294691bbba010722f346cc4bae145
prerequisite-patch-id: f7a948bc75d4bd394382db7812c6a97a00ae6af2
prerequisite-patch-id: a00dce139a66c2d545312783593989554eae868a
prerequisite-patch-id: e6f4d6b70107cf7d6f1f0b169d1784ea6fb6b774
prerequisite-patch-id: 315c329a98250138c5d10f53fe482a926f96a467
prerequisite-patch-id: 90d1d20b4559177141a0682258b70ffce9d03ba0
prerequisite-patch-id: 7a0bebe098f30c4714348103ec288567616603b9
prerequisite-patch-id: 07aad05deb9e8aae27d1a8329ff3372f414dec56
prerequisite-patch-id: 56ff17f7a90f97123c904f6b6ab92e92e71003c0
prerequisite-patch-id: ddee97c456776b42fe525682e49eeb646c53e18d
prerequisite-patch-id: 9bad103a7ad03c5a6be8d45a455fa39035f5d89f
prerequisite-patch-id: b70c951e0cb818de1093aebbbdd697c05b7f0fb2
prerequisite-patch-id: 2630613e607dd1c215f309b1f11c49a8b94ccd44
prerequisite-patch-id: aae375c831d2de511688e2b1857638524856dfbf
prerequisite-patch-id: e571d3316e8f3a434c7633ce0d705b51509ae560
prerequisite-patch-id: 42f08de293465ce564be1e37bb3b6e9fbb0a8bc9
prerequisite-patch-id: 3ad2f4a18569d4cccaa8459b2ee8a3519dd4d815
prerequisite-patch-id: 2f65ef728cda500cd3b166ae626d5b7db021967e
prerequisite-patch-id: 3750804c0eff73c199a5d160b5b7b6482976c6b7
prerequisite-patch-id: e621a863d0e61324e97f6922fc9f3dc235f16dd6
prerequisite-patch-id: 3e59db3bd40021382dcbfe2310442d39042e681e
prerequisite-patch-id: 2e9428f6183ec26b313a9be99f69142fdb0ff0ac
prerequisite-patch-id: 8cc7672ab70ad8c99525b40f9853045423533ff0
prerequisite-patch-id: 9b3c4a3489d72903ff5fff8987212f1c696c904a
prerequisite-patch-id: 0d524fec7ee153017d2bdfcc9ae2c4a2a07baef0
prerequisite-patch-id: eff52918ced97d104ca583e17a0189761f1c4efb
prerequisite-patch-id: ed8836bc31b49fe43c0ced7fc9b5d7f37c0f0618
prerequisite-patch-id: c151a72eb15a696e24e812d72f65d65bf132d03e
prerequisite-patch-id: 02068a00f6eba584951058721be030dd0ed21a39
prerequisite-patch-id: 0c9c81185e9e51c976d2866cc9a327b676bccf87
prerequisite-patch-id: cc14f15ab258852230adcd05d7b62723320274b2
prerequisite-patch-id: a7668970d506101c4c937181da464b2e487ab197
prerequisite-patch-id: 6b344ad431d5fb69f9b4b313165667b2ec09943f
prerequisite-patch-id: 4fc0a670f3c827219517e79a972e170e2747f7f6
prerequisite-patch-id: 6395e36088a2022f6a444dacafd034993cdb6189
prerequisite-patch-id: 573580009979ec57e0e4eab449245ab4e4c3b3d6
prerequisite-patch-id: 3ed3ba44d80ad9d613ff48c86b183549d5f98704
prerequisite-patch-id: 07c006b1cc30d8a488505cb4f8cb79185d9bf3fa
prerequisite-patch-id: c2b22965a05e9e1df0aa99371b9300637ae12eac
prerequisite-patch-id: 8547a96a384a86f00a020afd8ca55a8e3d45cbd6
prerequisite-patch-id: 2a62ec92de96e687c7e149ff0f40957d641ad294
prerequisite-patch-id: e4e2534a546a7294ab3f375f6f3ba706e7787e1e
prerequisite-patch-id: 775ab45cff84f1a117d0815cfa27854a75cd6c2b
prerequisite-patch-id: c0fa861f7910f7c91a006e51d3746c45362c4379
prerequisite-patch-id: 0cd1c03def37ebfcd38049e0c4eecf40513b837f
prerequisite-patch-id: 0e1452165f733c61ba09f67798f90d8d75d5720d
prerequisite-patch-id: 5b58fd7589434978c0f43fcb229fc116f5192f9a
prerequisite-patch-id: 069fe7e5930f554dc20cd0ca21faf97446fea02e
prerequisite-patch-id: 7c0ed38841ca069f4bec997876886a1f8db78b38
prerequisite-patch-id: e0b14f6b8cbf4f9586ea1d41c63090593287901b
prerequisite-patch-id: 6f4037f93828b4cded7792580403e0ea99cb6910
prerequisite-patch-id: 43b7984a19cec3a457ab2129fbbc65c99f81bd39
prerequisite-patch-id: 57e27cff29983ee8d1610b3e86c4f5f7498cac23
prerequisite-patch-id: 310461e3cab0c730ae6c11e7d9f588c11aa596d3
prerequisite-patch-id: 81523b4275d07f06241fe8565d7c41aaad4f157f
prerequisite-patch-id: d172c7fd26143aaebfa1420059e4ad9dd45503e8
prerequisite-patch-id: 55751772ae5cd305b10531c6717f90b9a0db6be3
prerequisite-patch-id: e7ca8f9d50e1c188408743da1a9db3c322868cb8
prerequisite-patch-id: 971e78601fbc17a3c56d3bbf8624207de773a88b
prerequisite-patch-id: 1faad349055847ded852d0c8a7dd49dc2d73f59f
prerequisite-patch-id: fecad25646e62ef5b1d6bbd7a1528bdb30ed0f56
prerequisite-patch-id: e0056ee71495951aa9e1167923718bb901c4d05e
prerequisite-patch-id: a709e644854168b91261cfd120b97f125fa34f5f
prerequisite-patch-id: 11e365f8ce6eaf60b46a7935efc95ebe3b45ae27
prerequisite-patch-id: e193d1a0237d30583ac765c7e043d729156d63d8
prerequisite-patch-id: 075aa43f44186d60db843ff69fa21549985833e3
prerequisite-patch-id: aaff2ba7f0e6e29b1cba0c33aef3a9fd8fae15b6
prerequisite-patch-id: d1c3f10ef47c65a007ea92e827464c341ed25223
prerequisite-patch-id: 1a33129404066d3ea7f7a81ee406e5a8be5ef60b
prerequisite-patch-id: 6bd327eb84a439d618ac18264099586d01151d82
prerequisite-patch-id: 5062b638d50662079b50fcd8730e3713cd42dc5a
prerequisite-patch-id: e3338a79b500779b0794a72516fc4eb1c38cf038
prerequisite-patch-id: 626ea7aae9a7d4f835cc67e6f8d900720ba41b62
prerequisite-patch-id: 5c40abbb135c0412b53d55206cca18c10fc90165
prerequisite-patch-id: 3923f91f3e3474bac0ebfe3835e11faf590e1834
prerequisite-patch-id: 90ca75039e8475cf15255171c139d66140ae0a6f
prerequisite-patch-id: 5e2865b246659451824e74d1bb335ae6f64e80a0
prerequisite-patch-id: f00a46d438a2204eddb4fe361a630056b2bce987
prerequisite-patch-id: 15ba5b3217abccbd9213ba1dc65e82ede148f37b
prerequisite-patch-id: 3bc5ef2d6daa90bcf0d88c6d7e2662f49929c3b9
prerequisite-patch-id: f97e0dd80c02e7f64cf09e3d6b89ed3bed7cee35
prerequisite-patch-id: 0f2bb4e81b8c64aae143e6242771798f39d690dd
prerequisite-patch-id: caa919ae98191a1aadc93a22ad5a4b7b85ca3224
prerequisite-patch-id: 5b1604c76a7b2d682945214abea3bb1606f40a77
prerequisite-patch-id: 2c5f817ebee657dc714147d473c3e6a61874e0e7
prerequisite-patch-id: c0d21d2f446e71f359c814fd85f21fc38b7456c0
prerequisite-patch-id: 9af3fb520b9861420ffcd30bdf9fcda60c42fd39
prerequisite-patch-id: 57e94570e4735a4be6c05df309f667e83c087071
prerequisite-patch-id: 6fb299e1770c10f1809ea671d4639ab0bcd9ca4c
prerequisite-patch-id: aa804ecd8bcfc714da21d91aa47ca5e4ef0227c9
prerequisite-patch-id: a065b0b582282bd7d85633ae841e21b66e98a8a1
prerequisite-patch-id: 7edaf9af51d7be6d9aeb6abee019a054443289e0
prerequisite-patch-id: d8df5644db4a844877bfec7d65649964ce10ee5d
prerequisite-patch-id: 5124aaec458999c6df02cd313ad07da9e494177e
prerequisite-patch-id: 99fde2d836cd0d1aeaf7a8f5e4009ab86b82662b
prerequisite-patch-id: 68787203b08fec52175101aa9ca26937be36de16
prerequisite-patch-id: 1c3fcb04d9aa20720699180bb64ea7b256cbcbd1
prerequisite-patch-id: 65889ff7e03adb1dfc47b5ff5672a6f7df10ebef
prerequisite-patch-id: 7d49433f6230880ffc0aa8eae8658e566919f383
prerequisite-patch-id: 5f83563457f236b173924a496eb789611e2e5f65
prerequisite-patch-id: 55548b57aa6a477d5a6cc2098096650a6a09aea6
prerequisite-patch-id: 6772bf393bbc510bdedf9685a746f83562b6ac1b
prerequisite-patch-id: 9cd26e3f4c9ae001d98ce9a64c4b990ccdd0e178
prerequisite-patch-id: 6eb3e0b20e1376b8e62ac4b5e8873e2b4512bd36
prerequisite-patch-id: 023cb9f4ed2595317df241e38797bf09811c3f70
prerequisite-patch-id: c9f58cf10d9b5dc6cf4e091abd59e62422ea0e79
prerequisite-patch-id: 0f7dbd0c5f75494c98bb42c370e7d0db4ec52c32
prerequisite-patch-id: 74d71c53b292a81c6882468045985a158fc2e66f
prerequisite-patch-id: 561581c81d8e497a876835a21aca5df3508ee504
prerequisite-patch-id: edd6bced4d855232ce01907b6cc4e0d9f637351f
prerequisite-patch-id: e44c9e0b0df3ec12f40edef9e9f7075796e687c6
prerequisite-patch-id: 9b85cc6d02947e950674f81f2e55243226392cef
prerequisite-patch-id: b05c1f2f1e85749e05ccbca51f40e7430d1dcb32
prerequisite-patch-id: 5994f51aef7d8dccf98fcd3f9d9507caf9cd1514
prerequisite-patch-id: 12d87b3ba9c29b674588e8bbaa2f0b9982aebf68
prerequisite-patch-id: dd20f12ced7821f330b0558e4d7163a3e23faf45
prerequisite-patch-id: 06d1fc0eee289fab6b992e0c7046c62b5562d3cf
prerequisite-patch-id: 3d1dc096f1c0a4bf1a92fe42dc581369e865c894
prerequisite-patch-id: 0bdd0b460ed134a4dc9cf3491045906323aad880
prerequisite-patch-id: 16d44c58f2ac27085f70d7a04e6ff6ad130e018d
prerequisite-patch-id: e5a6fda7836e562b6be212d0362454318567fb23
prerequisite-patch-id: c634c2ccbd49900d5c3f1d270565e75fd32bc5b4
prerequisite-patch-id: 88ab4543c1ea0db9a304a8e014a0d63a49daa698
prerequisite-patch-id: d72bed2af4dbfdbf2d1ff6531eded05db3a20957
prerequisite-patch-id: 733b237b25fc25c0a2dbd5be018e0ea729651265
prerequisite-patch-id: 384c23599a0f7e24815e367143406b0fffec99b2
prerequisite-patch-id: 9784a81500f10dadd94a326e441af3a2227c168c
prerequisite-patch-id: 1f8849a7c97c7f7704cd646fc5c61f79e1c76515
prerequisite-patch-id: 8857e6bcda05c0245d8fb05eb98bea4cfc73e350
prerequisite-patch-id: ba9b2f03bfea9f7bea3f746b70269d7c190094cf
prerequisite-patch-id: 501567b279d1cd07a3e02052c0e500484b2ba26c
prerequisite-patch-id: 73d3182fd1c964959060518a6c362a5835c9cb8a
prerequisite-patch-id: f117d9cedda52f454cc2f38c24db693966bd2177
prerequisite-patch-id: f4c3280d552171e7b6b903fd7b41ddf29d851861
prerequisite-patch-id: 9f4f243c81b687120b4ae548de2104de04a1acdf
prerequisite-patch-id: beeda82c4c2fd9a75d6273d090e110e9096db413
prerequisite-patch-id: 210b0707e8f3b022fc38589dfdb9609d73e87d66
prerequisite-patch-id: 267d9555b96773be369ddf2af85772ab81c3e9bb
prerequisite-patch-id: 90f6d80a614185fd42f9f39298d2d12a037d0fc1
prerequisite-patch-id: e97f0a9482e2ad569700e82c9db0c10ffe453fc6
prerequisite-patch-id: bc8d971e3286d0a49ee3e22409b9f8e562da90e5
prerequisite-patch-id: 2517ce7244dbd91347d4d754e3b237590d6ceaca
prerequisite-patch-id: f2a897d116dd9faa344c73b0ddb71bb1b5acef63
prerequisite-patch-id: 46c1baaff8b976416f2da80d243e42754f4dbc32
prerequisite-patch-id: ce9e0d35a9d0e0dd4e3605737ac0bc9547f4083c
prerequisite-patch-id: dd212c53ff4b4db7c73c732768afe0fa3204066c
prerequisite-patch-id: 76f4ef8a7ba413fa0a7148297b3990a5e994ecd8
prerequisite-patch-id: 8731b45e0ba390cdec934c5b25914bd5152513dc
prerequisite-patch-id: 889bd19e21dde828201ffedcc84a936aa88697f7
prerequisite-patch-id: e7d041d24fd6731b99317c57195a330d3e9bb93a
prerequisite-patch-id: bdb30dc1231ccd01263bf42dacaa899c24c5c162
prerequisite-patch-id: 2d48d1b56186315880f1af06b30fdcdfe0f571d2
prerequisite-patch-id: 7d3b70b4caf1e04f68a42ed78432f05822926b11
prerequisite-patch-id: fde041cb1eca02bddb092cada04b375be1b27399
prerequisite-patch-id: f69b04a54c5adf9c76d05db4e7033077e3a9113a
prerequisite-patch-id: 2d5701d7b5b79011465a8e83d5c3396d3031fba2
prerequisite-patch-id: 0ed0053429fd443133c8a31f866fbf907f1efba4
prerequisite-patch-id: b2853ec16e0f6052281086338591a816c715b2de
prerequisite-patch-id: 5869e481187450b0a704f2ae1708883481b98551
prerequisite-patch-id: 40e63a02afa41f355deccbdb4760f2bf926b60dd
prerequisite-patch-id: a0695530f14140d2fcf6279fe9fad86975c5191b
prerequisite-patch-id: 7d73c85e2295846275c4535551120e0fff4c3409
prerequisite-patch-id: 5cc7b23a75043b7764c831b463a3e0b961133878
prerequisite-patch-id: 285aaf3bdba0452ff9d7d901a844acea5497c0e8
prerequisite-patch-id: 97ec0124926ea998e3a49d2087bbf38987a568c8
prerequisite-patch-id: 7af59d1570d918dc1a24754520d83d0903f27c97
prerequisite-patch-id: a6c1dce94799bfa017abf38d30f806bd388dc573
prerequisite-patch-id: f6d3c876f00051ed71a2c6e47831dfb4b448c86f
prerequisite-patch-id: 807eab5813c4e94bd537461f1013a46a170c551d
prerequisite-patch-id: 8f2f9154797b91481f743d362e50671ce07287b6
prerequisite-patch-id: f27d0f9385749a7cc82714e02df02390bbc350ca
prerequisite-patch-id: c266ccfd72e98ce6914835d73bd92d0d7a86d6c1
prerequisite-patch-id: 263e86edd27c0627a5b463560c695b450ac10231
prerequisite-patch-id: 0d06524f5274aa3c46d2fb1ac03f1517420e7e03
prerequisite-patch-id: 2549c31ebd04dc25061eb13ac6564a58199afe89
prerequisite-patch-id: b2902cdd3ba2e1bfda92e2bbcc8c81e21c481217
prerequisite-patch-id: b298b77e677fcec9c372f5e407ac917e78c09b45
prerequisite-patch-id: b6c6013aa2a1569bc290b0de683622f15ddb2e55
prerequisite-patch-id: c7999f4b7d2642a079af96115bf2839956642acf
prerequisite-patch-id: 4eb419bc966a1e41f45a77e89a1e781f4a62540f
prerequisite-patch-id: a7293bdcc5f986cb436107f91392eae12ffbe5d0
prerequisite-patch-id: c30ebe075f17893eb85dd1a11ebb9b93959d4cf1
prerequisite-patch-id: 93d3f195d5b92412dfbd91a95cdd3f6d58cc0a4c
prerequisite-patch-id: e1c6b1ad94e911358cd43dcde23839222b272326
prerequisite-patch-id: dae2ac7dc2a5911844de2cfe783a885ce14e1cbc
prerequisite-patch-id: 00c23866738dce7be48a2d91012709c36f2becf0
prerequisite-patch-id: 06d3939761189793433b54ddf2cb4d7bfea690af
prerequisite-patch-id: 860570b8981beb03c4abf22576009711a704bef7
prerequisite-patch-id: 2df0e01c8a59334e924efa44c40d36c588367e86
prerequisite-patch-id: 217f8cad87fb6b004dbf325a9e2be8f4a7d14278
prerequisite-patch-id: 637510632f46c149be2ee17efbbeca770642842b
prerequisite-patch-id: c0b78d263387f65a386c0685ab70620242bf0553
prerequisite-patch-id: 13c208d98200dad953f2d2fa25e3140dce8882fa
prerequisite-patch-id: af8bf6fbf58a00af89a54384c78a1035954de4da
prerequisite-patch-id: f5131c142ec7791756b41216578bffe030ade007
prerequisite-patch-id: 0f923e44e8be041ad82e0b6af55d55809141b238
prerequisite-patch-id: 674be618ad673c183c553e6cf1b50a6bbac5304d
prerequisite-patch-id: b5107f8d2d817aedcfab44bb770fc05362e275e1
prerequisite-patch-id: 01587808f87bd01eb36ffe993f5003d32b41d93b
prerequisite-patch-id: 777963a997b51435b9f73ccca693286dbe6fae74
prerequisite-patch-id: 4a7a199bebb9894a0b98d5e03e830fd27515f8c0
prerequisite-patch-id: 1ff7033d610678ac9a4c5605d17a584515a24d67
prerequisite-patch-id: 545fdb33c3b6eb17f9a044b12cb67862ae69e03d
prerequisite-patch-id: 3ec0b57f1324942fd928203b0636b2a9a1aa5a4d
prerequisite-patch-id: 7eba38d9eb99d8f9e05fd1dafc9b236435fbeeb2
prerequisite-patch-id: fb0af58c9cbc68fda5173362ccbdc567997eb932
prerequisite-patch-id: be408c9a67904e9c0b5a8921d026b5358a2463dd
prerequisite-patch-id: 48e8d74ed2238a41a0379c5446add88359fc8c2b
prerequisite-patch-id: 6a8e8cc3d1a152eaa298d90a4c4c6a76d639854a
prerequisite-patch-id: 8b7caf778d713d67d3911a694cfad1db51aea3a4
prerequisite-patch-id: 3015f336df3b676040201af3fc1e4e7ab99bca05
prerequisite-patch-id: 4c9ee264a2186565b2e5eb97df7e16584ab20432
prerequisite-patch-id: 1eca3dfdbf551c11077ba13f826986c744680186
prerequisite-patch-id: 0cce358a7aac9e70f0f2eea8d22e2600f51fb493
prerequisite-patch-id: 3ea42ec4e390b787bf2569079132cf735ced104b
prerequisite-patch-id: dc2e6d6eba59cba057e52048b1578f58a7f7a2b7
prerequisite-patch-id: e6460bb4f705ea73a2a0e09227ed07ccb8f2a012
prerequisite-patch-id: d46d0780bac3039f1c4150db591dbb51d3831e9c
prerequisite-patch-id: 913cbb14e2ca9af1fdc31bff41ad3cb2f0e215d2
prerequisite-patch-id: 8ee1c0194fed986b789236f2f91da69135830dea
prerequisite-patch-id: fb2305a4ed527290dc6d8e8e7dcff9e07c946470
prerequisite-patch-id: 577f006a603c17ad5047321bc98e28baa9855891
prerequisite-patch-id: 031d4dd3e761dfc4e3e15ac2080e3967be7e2ebf
prerequisite-patch-id: 6274102a53aaca79ab5e567f276d6317579cfd46
prerequisite-patch-id: 6a3c73044c552921c2b1b8f7f40eb057886e5047
prerequisite-patch-id: 13bba7ab5890303aa77a5c7a36adebb6140158ef
prerequisite-patch-id: 8d34513b21fa5e38352695cf16abe4a60094c349
prerequisite-patch-id: 36e0fbf8dcbe6037aedecf6df16d6c5ad3ac05c6
prerequisite-patch-id: 9bb7d34ac300352e0deaca5103d9f44391852351
prerequisite-patch-id: 36f1a96a5ef9e0d4456bc3910551461615184744
prerequisite-patch-id: 451ae42f6ecf5926179f110b37a98d99bed90a96
prerequisite-patch-id: 88a460c34ed9bbc3e2e6dee36fcd56354235623f
prerequisite-patch-id: b76225299520957a6953ba50395b27d63142a0c6
prerequisite-patch-id: a774c103828bae9783bc84df0d21c0b9ec42011c
prerequisite-patch-id: fe31824e5d31578d9b7ad43532875a8679f5bad6
prerequisite-patch-id: 3037508938d94e5c9298808c38a52190c9bbd8f0
prerequisite-patch-id: 168566986065a4dd956a19a04800cd66610327c8
prerequisite-patch-id: 7b199928c513a9975b7ad043145d27d353259b50
prerequisite-patch-id: 89c8a0185bc87119781b7ac769f01758b1ad805c
prerequisite-patch-id: 65ee82503d0ed5c1da4facceb1f8aa7f5de8b4b1
prerequisite-patch-id: fd11bb3808b5408cc4e27e216a44d14b818b5b77
prerequisite-patch-id: 6096b62a25becf37069ba3aebdaef8ac274300bd
prerequisite-patch-id: 75ab594b663d043d91ea99248f216b1f488edc32
prerequisite-patch-id: f48fdfec79628d2455937f0c1d3169641ade8224
prerequisite-patch-id: aaec0031ab98208fbed081125a1b255ffdfd29b3
prerequisite-patch-id: 2a909b96a595a55ec9a2961ee019ad11ed041cce
prerequisite-patch-id: d5797fcd3da47a53af7bb2b15e327a8b6d0848a9
prerequisite-patch-id: 7473205263ce525ddd60754f396c9a4be5315623
prerequisite-patch-id: ca3a09b946ea463bb35438f446e24259cd14de2a
prerequisite-patch-id: 7f49251e2b90af0e59b2db2ae2e9ea925689e83c
prerequisite-patch-id: 5abd46615deb00ebbfd1690cae359532fb411a6d
prerequisite-patch-id: e9303030fbbf720337a5d27c6a4bc1314b15bb8a
prerequisite-patch-id: 52d5daf38cd49c4ec7f34e522b9751236f39b534
prerequisite-patch-id: 02843ca44a4e21d47a32ef3110a841b282fdca14
prerequisite-patch-id: 7033d75dca8a61e864355c8f0a79968fc379fcd9
prerequisite-patch-id: 2d2ec136276af089953bf229c08216fd7d4139a3
prerequisite-patch-id: 91df2d8267a1aec10c6bace5a4954319ae4be312
prerequisite-patch-id: e95c18500972ed7e80a1995a1f09891115250883
prerequisite-patch-id: 8fb7c59d4ad7eae3c4c99dec984ac202a5877d78
prerequisite-patch-id: 079de5142ab56927bdbc4317052672680dc6455c
prerequisite-patch-id: 3c42f9e53427643abc49ff1e7981bf2457add9ab
prerequisite-patch-id: bc535842b50b7594719fe62deb1b0311d15e443f
prerequisite-patch-id: 840f7a855557a283139e18a669b3bdbd0e73e0a1
prerequisite-patch-id: 8987a763a7a2289b48f814af530fb0edec91a9b7
prerequisite-patch-id: fccbc9861e656614dd24a06395b6eab74a416b95
prerequisite-patch-id: 921a60adbb138d6b4928c3f50d1a5b1d47375de2
prerequisite-patch-id: e6e4a738ecf702b0ee23a50951d5a7389e7326e0
prerequisite-patch-id: d8e25515ec1fe8baba5bcc9d0098d689502ec5ab
prerequisite-patch-id: 952f02e774446451f898f78b4f5e79a7788fff38
prerequisite-patch-id: 1264677200d1f9289b2a2f5109fc87a180b29ebf
prerequisite-patch-id: 86b35e493fab5401e4d3f79cbb5371f40f1a6262
prerequisite-patch-id: 33df00b62da5300f3f77af15e50260bdb9111282
prerequisite-patch-id: 2995e75e535e9bda5b9b39c3644d5c443a79c1aa
prerequisite-patch-id: a55401fa6390648d9686c33a289e896611befdd6
prerequisite-patch-id: 8bf8841faf572b3a13c16a3f66b80232a7b7ea42
prerequisite-patch-id: f0956e9b99fdae4897c6884e5979bb556caba241
prerequisite-patch-id: 3ad95d1c7876729ef2ce590581be7cbeb2aa0342
prerequisite-patch-id: 23549302fd6211a22d3cb48f33267a931205e49f
prerequisite-patch-id: d2c4fcf876da40607f1b139c356de4b3ae938bcb
prerequisite-patch-id: 81c5e4c5e80ca1404eca96e2b4c79df90ff572c4
prerequisite-patch-id: 0092f7ac3e6b476354e5653f8e9e614a4ed203c9
prerequisite-patch-id: 1391989cd02936b76e36fe1b555ee8a2a6746602
prerequisite-patch-id: ab22fcf8096021876d964f7f948da0d9e85b581e
prerequisite-patch-id: 2f17fc8874caaa20d87ee2a2a2c58bdc3ab1e034
prerequisite-patch-id: febf0974e07658543c93540c5d4f94e128446dab
prerequisite-patch-id: 0cbe048b7bb14f2a581cfb2bad550dc5612c779a
prerequisite-patch-id: a13089a3469463e59bbb6b9eb165fa67b5adbec6
prerequisite-patch-id: 685ad0928b9a2c8c03da858a9a4b3160402a2e50
prerequisite-patch-id: 6cea51583c235f9020b5f4fa3c24622dfaa3f924
prerequisite-patch-id: 4d2e218af9b8de8814e0c8d44fd6d222c823ad3b
prerequisite-patch-id: fedbc41233c0c8973eff1b074cbc22a87950b25a
prerequisite-patch-id: 1509d13227aa3a14a3fe93f4051d7c418c580870
prerequisite-patch-id: e67fc97ce6a727cc0d68aba12aa4ca7611f0856e
prerequisite-patch-id: bfcd15ca4cb53659bfdfad947aaf8a2053c2a1fe
prerequisite-patch-id: 1c338f056a5e1eb1e285edbcd9978521e45e7a20
prerequisite-patch-id: 6497e02f6d51afc1e5bd203a3b6250575f163cda
prerequisite-patch-id: eec10e54fe3a65ab03915a7130425c1562594143
prerequisite-patch-id: 3508a660c5cdd41ccfa77b1304866e87e4d97a31
prerequisite-patch-id: c50bc0f45d9997a6c027f74e25686ad8c3e19c6f
prerequisite-patch-id: 80e150efaf8eb161aa7de6592fbcd6a9918b8c58
prerequisite-patch-id: 6258352b8ff12002bf2b9268dd48b59ddc7e8fa9
prerequisite-patch-id: 145f6cf46b76e0d445224d000c0d4a61e9067919
prerequisite-patch-id: 7f0d22c4b2743e932cf97342abd5bac2e7bbdaa6
prerequisite-patch-id: 77c2373d8c2a047478f983bb5e32ba39e9f0be7b
prerequisite-patch-id: b407392f60470c7349da35bf5e6d64870ecefbed
prerequisite-patch-id: 307932436be8b08afc84d987d771fadfd627396f
prerequisite-patch-id: 31a216ff422ec3caddd98aba35075593b8ee2757
prerequisite-patch-id: 8a4c28db3ec8978b7ae08016bded35bb5a95da86
prerequisite-patch-id: 54f907e0d5b2691c3195d4dbdc8328df064be1c1
prerequisite-patch-id: e7a43b8697fed735c12dc3d7e9ef806aa7b49da7
prerequisite-patch-id: 2469df5486f94a7aa076ae4294d12ccafd6fcbcd
prerequisite-patch-id: 71d2c8804f006f7022d04a1549e42bf7d23c582d
prerequisite-patch-id: f18c0db7772ecfd83c106478fd5d1871ddc5fd4a
prerequisite-patch-id: 35f7d7e6e8ed1612af9b3e0249245356411b096f
prerequisite-patch-id: fe1189a7912c89c0e50ad33be816fb22f1caf520
prerequisite-patch-id: 833929ecd4d3424315703561c83174a057225eb0
prerequisite-patch-id: 960e4ea8f13d6a7c6decd0083ec46fd10b2cdd94
prerequisite-patch-id: 74051c7855f4b80a0a223a5cdc1d4f841dcf4d0b
prerequisite-patch-id: 13af146805185ced829540b81636f2e18c2b4a36
prerequisite-patch-id: defe75f9a551a40d41ad40ccb0de61c27ff793c8
prerequisite-patch-id: 0e78b3c65375acaa16141bc947fb43144b830ea0
prerequisite-patch-id: cb56c2eb622029fa2f8610c969e0e76da55b4e21
prerequisite-patch-id: d2c223aebddc95fd931a4660842c3401fe0192b0
prerequisite-patch-id: c01ac6871f2d27344b20d3a5f25d12936638aecf
prerequisite-patch-id: 43cc2d7763174f3d3134b1df99816ede96051ab0
prerequisite-patch-id: 5b3ba2df632d6202019912fa142e6ba73f78b3c6
prerequisite-patch-id: 719e9d0ad8e33c3ddbc5b38a3b2f561bd70f6eed
prerequisite-patch-id: 7bcb2dabf991d9bfaa45ab5c90b1dca954f2eeeb
prerequisite-patch-id: 4f9debf44c4b3d2657e68a504590481a697a6584
prerequisite-patch-id: abc12e1e3590d6eb9059cbab79c9eac2d06d6e6e
prerequisite-patch-id: 73b4284c38b1e3c7b7b5370ff99d477948d35ef9
prerequisite-patch-id: 253dd20d28ffb84c0be6d520d3891adaa922d415
prerequisite-patch-id: 8a9f3d603254eea588b94f38a00ac75080e15fd1
prerequisite-patch-id: ff291531a0d15729a8a845d6928538a8996569c0
prerequisite-patch-id: 4124dcbdd4e0a648c28652abb568da285fbf4798
prerequisite-patch-id: 49b0fa548f4913ea9430477e7322c3e70cf44935
prerequisite-patch-id: fb0a659da31ed5ba3d93598a0e9c95479214e146
prerequisite-patch-id: e506e44764390947e1badb740c73563f93092284
prerequisite-patch-id: 0a1cf4a0f805f4dd7887bf7f9372da81a4c5b469
prerequisite-patch-id: 7173ea6c3eb18a2ca6f2d6b9d8836e2278d6361f
prerequisite-patch-id: f1e3ed05423775c2bfee847d6f2237dbc8ea0a47
prerequisite-patch-id: 5ab96dc6cb842b48468cc5f4aee3af4014903675
prerequisite-patch-id: 2fae4cec3c1b8208cd8def4d21fba969afc8235b
prerequisite-patch-id: f960ab147b37fd878e05ec400cec7c503705a01b
prerequisite-patch-id: 43d0f60f4852b35db2578e974c8f0434180b57fd
prerequisite-patch-id: 5e3d6c5b9a73f888235c099930561ddef02eb8be
prerequisite-patch-id: a808268d58618a99b687f8a7aebac9cab4a30215
prerequisite-patch-id: 083bbc9bca5edb377e20e5260d0703db8a65b682
prerequisite-patch-id: ec94bd0832fbac4c7fb63119822d146cac3ae901
prerequisite-patch-id: 4ab31f0894bd4e89c4782cdd984151f32e22d02d
prerequisite-patch-id: ef6252d246be3e7d04d5af777a339fa728daed2d
prerequisite-patch-id: 18314dc362a8768a1c36d93e2c8500c1510ecf38
prerequisite-patch-id: be10de5169f2969ffe589649bdc2e61ea0f01813
prerequisite-patch-id: c7b12cfe43d2f4dfdb2bd1d0a5b6c0050b27dd6d
prerequisite-patch-id: 0bdc562df6e5a41086da8b367ff9ae0413731f44
prerequisite-patch-id: 3e48c6ec02122d3dcc7fb92c304d0d39439b5a6c
prerequisite-patch-id: 35a7f9b183dc40ad578652f8fc153643702a6d08
prerequisite-patch-id: 6e8b829eb55a886625f2133bf0020751984dd629
prerequisite-patch-id: f359b93e5517185dd7b95015b93a7249d780bd07
prerequisite-patch-id: 6c96105b096902355452be058ae30ebe3a643713
prerequisite-patch-id: ee80ba9fcafa7ac639e2b0e9a4bed1106906f456
prerequisite-patch-id: 6288952ae5d709bef55146582df70bb5a0ad0ab5
prerequisite-patch-id: 6f91d8cb1ec81f7d565d01fd28d2422669d73666
prerequisite-patch-id: 5cbf30c682436e524c115352ff672fd1dedf4183
prerequisite-patch-id: d1603a58adc483924d849782d0311a81e856419c
prerequisite-patch-id: dd5551e7aee4b86f034c7d170261ba88e04a08fe
prerequisite-patch-id: af273d823acce36e9897e4dceace66bb96e44869
prerequisite-patch-id: 6ebb4ba1184c347c8e4cb98212d69f1c0e530171
prerequisite-patch-id: 9eec694d4ec9d516097f1baa2b324c2c9e03a7d8
prerequisite-patch-id: b356f4041e58254e14caae659638eb5d431db91c
prerequisite-patch-id: f8954008b95901671eba97e0b35bcc1e9005ee8b
prerequisite-patch-id: 719bbf1af6b61ebbbcc3eea3dc1f226f121c3204
prerequisite-patch-id: d3866e8aa8d94e0b40b009f616299f8277887685
prerequisite-patch-id: f9f2217346dfa4fdb7b54e0c401a0b270bf4e7c1
prerequisite-patch-id: 632921b04e51463d95a2ec1138bc9c8815767a12
prerequisite-patch-id: db5bdbf18ca7d6c266da90592cf3c05ba7d7ac0f
prerequisite-patch-id: 45231730c0317cf1e3f7a8f3e6017fd3fa30c54f
prerequisite-patch-id: 919399e0678363174bb37e88735e577ece043ae9
prerequisite-patch-id: cf45135ef276cfc61550750663aa5e9740a61dcb
prerequisite-patch-id: 6ba8ab2fc705e4f41cf18a65b1bbdf7123586ae0
prerequisite-patch-id: bb3072af85d8f58e8da26601998379a5000b388d
prerequisite-patch-id: 5d7a79f3ce291a0b065c662890e1b589fcdd3f5a
prerequisite-patch-id: 5a2a917204bee79ba2efadf36b1d5d54c36c9fc2
prerequisite-patch-id: b892e9004898caf831cd7b26013c3f4a7624b335
prerequisite-patch-id: fd77d48defb5d7ec399db04d7ab203f8186e78c4
prerequisite-patch-id: 0738e7af7c09e64d6d0e06f753a4d945341caa56
prerequisite-patch-id: a886cb57bb6d1cfd467715905675ff7884e96cd5
prerequisite-patch-id: 2a7062b83be924fd97cd9d70dd11c1c49b0db5a2
prerequisite-patch-id: 9b44c320cb4bdbe339025845c428aec1bd9a051c
prerequisite-patch-id: 517616268fe59a7454d8622967ec4a4c910ff1d9
prerequisite-patch-id: b0b5b84ee36d6ed7fb1e28722f38c6508c9e91ed
prerequisite-patch-id: 420648b0a6ec6eccbf5cec4e927ca2bfe199fb0e
prerequisite-patch-id: 11e0dc9358b417e74592e9661df33b72c8ff4385
prerequisite-patch-id: 77ea81a756ec9f2f5ed3d78f077805e7b6293d06
prerequisite-patch-id: 6dc585739b1e61db1ceec08ca8aec0f72838932c
prerequisite-patch-id: ad0efbffd47c51cc8bf19ff4bf27b73672f16a57
prerequisite-patch-id: bfe5488fd580d5d59534d92624519be2403df9c4
prerequisite-patch-id: 1595efa3b8621abe19a159cdf49de2c0f15f0fab
prerequisite-patch-id: 5d2144cad0bb594648ed826db570578a8cefd9ed
prerequisite-patch-id: 7d9759912e63b6dee1edda2b2ff48b6fcb546ec4
prerequisite-patch-id: 6ccb5a50995a8eff558f233de8775f1e33c36e55
prerequisite-patch-id: b287784a60cfaf1efd236ae84832ba858a11e756
prerequisite-patch-id: b359f1dbbcd6374492720ebd67b0212bd3dfe246
prerequisite-patch-id: f68e324cedce25ae3dc776a38b409f0498a2508b
prerequisite-patch-id: 0631a6a66f58c62d7d1db9e89a389255e5854dd5
prerequisite-patch-id: 800b8f8256f8b49c9c5a415afda116cfbe2b7bd7
prerequisite-patch-id: eb943a5e4ad3e1ae69b53ad0609feef80a7003d7
prerequisite-patch-id: 10306abceb7599a040586a063ac89fb0d8e840d6
prerequisite-patch-id: fe14dc335fbd0287206b65bb00a907099f0683b7
prerequisite-patch-id: c1ded88b358068a686fcb579ec63b55294b4a185
prerequisite-patch-id: b32ce1f3e9e3050a1ac30e721c8a991ea6e31f26
prerequisite-patch-id: 4d526b2606528dafff33fde169c221880b316de7
prerequisite-patch-id: c2aaf55a968e9d7a7b157d66556ae4eada5e62fd
prerequisite-patch-id: 94927c7f728fe0d828e4f049cedf2303e030ba46
prerequisite-patch-id: f63bc9444ad5b738f3dcd02d7959f2dd901b018c
prerequisite-patch-id: 5fcf3b72b3be19b634b94145e27f53850cefc72d
prerequisite-patch-id: bf627e575c190c1aa9e731ca9b3aa9ac861ad46d
prerequisite-patch-id: f7585062e09ab4c65b78d37369d653ef2d753a3a
prerequisite-patch-id: 10435ba072fa7c5bd848f35294f80dd0469bc51d
prerequisite-patch-id: 02ba1305c24048f33c51e0e3f02d1cb948b6be94
prerequisite-patch-id: 4349aaa17eeda436c9726982d4fe5936f6e7b609
prerequisite-patch-id: a6c3be6f26bd489546878f7b588c788fde7800aa
prerequisite-patch-id: 0d0cf19d1a5918a831249b20c4975d9ba7c0e3e6
prerequisite-patch-id: 415997925fa27b24be8b566bad173dff8fc50960
prerequisite-patch-id: 707feafcdf917559743e975de6e4fd4604d0b5c6
prerequisite-patch-id: d2e279a8937347587c5237259dab0387ea04d94f
prerequisite-patch-id: 0492003e5e49f53377890270445252f487123611
prerequisite-patch-id: a2b85cfc968ca8eb7b172fec0ffd136243b93e01
prerequisite-patch-id: f8bf34fb4a4aae7d74b7d746008b603b602fca36
prerequisite-patch-id: 7adc69ef85ea7afce62b296b6fde6a1789de3226
prerequisite-patch-id: ffd16485a35587c624bd387191966957688b4f34
prerequisite-patch-id: a352c529fda5b9e5033e2df967c37bb17562394e
prerequisite-patch-id: cb181c4c50528ef83501c01c0211582fbe5f885a
prerequisite-patch-id: 6d657be79d0e33a86b552b96ba10ffb2c8546975
prerequisite-patch-id: 5e672099052e9917bd488ad46e6303405fbb8f13
prerequisite-patch-id: f8fea826b96dae3ae3358bc53e23773d202b1067
prerequisite-patch-id: 22b8590d69863fc3e4cd3eed366eaaeb1c227dde
prerequisite-patch-id: 8d6a3f9ff9409273c6a8de108283c188dff8e6f4
prerequisite-patch-id: 63991ee5592a5da441333c6952dbdf4e262a4361
prerequisite-patch-id: a85295ddef6973efb8c59c8b8bd0d0c954618722
prerequisite-patch-id: 32cb914a2879991546162c9c87e371e7faf56c27
prerequisite-patch-id: 322468b8512360f3addd2e9788a3b53166fc3997
prerequisite-patch-id: 7b9e82394c1c3b8f7cb04ed14c6c17e7e6a19020
prerequisite-patch-id: 3af9eaf27eb6d35fb955ecfc162eb37116017975
prerequisite-patch-id: f4d49b9d1b056eb6cc0cf6a4a325e7263f2b983a
prerequisite-patch-id: c8d6dbdb8aa9d7ec6d927730603743d5677b6be5
prerequisite-patch-id: 26988cdaf6ee0457456b6b8d540d5a65ca38a958
prerequisite-patch-id: 3d6414af32ee36b00119f51559db28619636eaac
prerequisite-patch-id: c02ca3c9f13194fcd0e28d38fd95b5fe53c70dbb
prerequisite-patch-id: 781858eaa6e83bbdeb93ae0a37f302c05c628eed
prerequisite-patch-id: 92ed0db90e5a9b2245a5c2f218eccd2273afaf57
prerequisite-patch-id: 8c90d4d4986d0c7fdd6d58c95c20c471fc86aa9f
prerequisite-patch-id: a1b7a5d3d77c1a73c3910cc164ac9db3080b2e4a
prerequisite-patch-id: ef3713c55e70a0989973bd6e202437c6286ed3c2
prerequisite-patch-id: 57ca3059c16149dd215e6eec762a518e0fff951b
prerequisite-patch-id: c926662654d9de14f91d248cbe148220575fa3d9
prerequisite-patch-id: 067b18004fd5d999ff55a7d11d7ce6e81bfa64e8
prerequisite-patch-id: de79cdd547ed2c533cb41c1821de55df7913643b
prerequisite-patch-id: d6b964b306c07b5bfb11c81aeb84c28285ab9057
prerequisite-patch-id: 58872ff91036760b09421534db73a7a32b8b0cd8
prerequisite-patch-id: bb1cd1e4ffb7c6cf4caf00afe5790829d44e6ff0
prerequisite-patch-id: b5cbd461ddd03b29deb88cbd23937baacf78ee1c
prerequisite-patch-id: 19f788270d2f9d378518d5392f2ab0880e081d66
prerequisite-patch-id: 7d8275e3dbf9e113180022c4e5b94cf3eb419111
prerequisite-patch-id: 9ce41b8de9a7ecccbf97c32d163f84c1c9722125
prerequisite-patch-id: 9b80bb62fa48429ad4e81bb3a4b86312a4a1c53c
prerequisite-patch-id: 27a95bc7d0485ece3d9b395ecca1878fc2d9bc54
prerequisite-patch-id: 8bc8f13e79bd2190ca7811b8716d61492ed63443
prerequisite-patch-id: 030ea61e637f4bd9ff6d767fa051ec9c4fe127b0
prerequisite-patch-id: a8bbd8df8cea0a80b751abf8ae37052397796646
prerequisite-patch-id: c8a9e84032f2a564da35784e65b1a9d1fa216d90
prerequisite-patch-id: f16f57771d909f3f8586e0b49b63e4556ba462fb
prerequisite-patch-id: b735c0f60bcd79620b8646c9fc8f01dae1416af3
prerequisite-patch-id: b87ac3131e6a14cac6397416e04d3e2099f41e94
prerequisite-patch-id: 3a076d5884a571019b960a0cdbc9eec35b8c2124
prerequisite-patch-id: aa58e93a679af0eb4a8e414fe38e633d1af7bec5
prerequisite-patch-id: 0cce2e2fbd27c039f65e1d7b56ac53955dbb47a3
prerequisite-patch-id: e5524f966846111741bd533f8f5e03193c489a95
prerequisite-patch-id: 1a8fdaf3c883b720f34b8ddc7e3ec1e6a64ec7a3
prerequisite-patch-id: 9ba739f99f9559f8ac47415830d876bba47b898b
prerequisite-patch-id: 56e1c9b7a8afb4eb705fcbf57dec5c8b6e2a2dab
prerequisite-patch-id: 0dd60f63d89bef5a71681564048e91a95b702905
prerequisite-patch-id: 5870008c98d6e06cffd82271673b9ae1dc9657de
prerequisite-patch-id: e1dedacfca1f3dee85d005a65f9800ab21fb4efa
prerequisite-patch-id: cff9a1d8c989625690cb4305ecd437bf25c486b9
prerequisite-patch-id: 997b506f0ce7e6c77c4c330c525d682522ee4332
prerequisite-patch-id: df5232e4567d0db91b05168b6a5fe644d5350e92
prerequisite-patch-id: 6267fb72471d5966f62f3923c8c654763c2748a3
prerequisite-patch-id: 6f19efc6752136742279ff357b7cd2f2def9ae1e
prerequisite-patch-id: 188aae06920f97ebda5c9efc01b79ac2918b7db8
prerequisite-patch-id: c853c289ba27b339197baf0c087c9a32e8651835
prerequisite-patch-id: 7de6823eb03faa9a72dee3d03916e55f42546a06
prerequisite-patch-id: 3acc8bd40bef94481fe639b902b2ec8d6801ad7b
prerequisite-patch-id: 47a99c7bdee3e0ccf62c025d72223d69ea53d5c6
prerequisite-patch-id: e6ae2ef85537c88c3f50edaf3460ba0440f01325
prerequisite-patch-id: fe2443e28a4d1e344b751a7f05ef57b60ac82f32
prerequisite-patch-id: 5d4691df570760ba13f99fe8855861b591d966c2
prerequisite-patch-id: 220350c05acbb68719d5a0f793a30fdd57d6981c
prerequisite-patch-id: 84b6f933827a31248542fdd543d85ec4c0487837
prerequisite-patch-id: 50e76a3dc78f1fb0ea17cfaaaa657b5e1563475a
prerequisite-patch-id: 040827ea3b6dceafe4a1e89b3c1567d0cfad3590
prerequisite-patch-id: 6db2553d2f3acc655abe2f8fe20c5c23fb301341
prerequisite-patch-id: 040b1679f07e3467b6252f7d56d846b2b68b7211
prerequisite-patch-id: c285a18a9c8faf7035f8be0b06497147929c918f
prerequisite-patch-id: e16b0ba741839304a42afb55a741d310d3c053bd
prerequisite-patch-id: 738966148fede59c182a80eca433f19bdbadac43
prerequisite-patch-id: bc255cc38e81b3c4a78bd2d5ce0cf795444c4aad
prerequisite-patch-id: 82c18c493c4571aa610811526bcb59eddb982efd
prerequisite-patch-id: beb4045020c2ea9709e2dfa99b329bcb34521e04
prerequisite-patch-id: a128e56d7b928e078615f7dbe7912a7515fa55a0
prerequisite-patch-id: b392063c05ae4d544782ef57f7704c6ba10abd63
prerequisite-patch-id: 245cf020ae7385933f86d1489cbc90ff126cc0f1
prerequisite-patch-id: ae1b27ca4d49a99d2378c35a37929431138fd213
prerequisite-patch-id: 478e995d8b517ed246dbe5465da1cb4594c70290
prerequisite-patch-id: 27c200d66c2931875dc7daed5d3bcdc55e4beb27
prerequisite-patch-id: 2ceca28146f8a923b24eaadb405e9d138d9eed00
prerequisite-patch-id: 86d7e7bb8fd919d500f5aeaecb13b2a0aecb0fd3
prerequisite-patch-id: cda4b4917f8311487bead04f53718f5a84e2a291
prerequisite-patch-id: c3ef998cbddc3580a384847cbf0001c0bd2c959d
prerequisite-patch-id: f61959b401deb0b00ef84a376e939a1f8f7c0126
prerequisite-patch-id: b8bda2a11ea78e73715b5a78a750fb592985a9b6
prerequisite-patch-id: 6c2813ed415b4e24d098d901ff01d8453955bc69
prerequisite-patch-id: 962eb6c153ef7fb947a537036a3e8324709d27c4
prerequisite-patch-id: 3a86edeeb195cbc2a451f4e968bdf7a4fa8130ef
prerequisite-patch-id: db3bc9a6add19ec640059ea30660719220d3d536
prerequisite-patch-id: 0f7b7d43ba61d882d650a53985b2ae97cd88292d
prerequisite-patch-id: ad768c6226f99de072024ff384b06c9206c38960
prerequisite-patch-id: 9b09d90179025f353092ec8a9c8b4e2e8bd46eab
prerequisite-patch-id: d933a5549788a377a39803243b8894d15059b662
prerequisite-patch-id: 8afa7acfefdacb5203d9dee4f34e8f4e70432bc6
prerequisite-patch-id: a84aa6e3d507ed10541d4ac16abf08beec67e29b
prerequisite-patch-id: 7c9321685c0c33cb9d1438797d2cb2bb540276c4
prerequisite-patch-id: 2920d2816c4bcf6e7774b35efd49990aef2d76c9
prerequisite-patch-id: 703a478d678042c958791323d246a6edca203c60
prerequisite-patch-id: 0d3bda50947f0ff6ca52fb047672d766b9342a36
prerequisite-patch-id: b3fe70b4b1234e9b47b9d320eaad1ba3c9191060
prerequisite-patch-id: 60fe7477b84c88b65d3aeff09a9a017ebff95c3d
prerequisite-patch-id: af5a8df846526606f8a838b4c774ce79a2140c84
prerequisite-patch-id: 0b4dbed116f5fb66bacce3fef73e480ffaa6b882
prerequisite-patch-id: c0c202b9d393c904ab1d20faf6e33f1260c12b76
prerequisite-patch-id: 19bc09ce78bfe018f97254fb515703e6d378afec
prerequisite-patch-id: 266125aa6b546f928dc1e4567f8979a6b38ec0ab
prerequisite-patch-id: 19573944eb1292fbd23d55a7469b88b259410904
prerequisite-patch-id: a32e260160a9d4519390e3eabecb45b4d2af7e79
prerequisite-patch-id: d5a57f3e37b2544f62d8cf12cd2ea243512f75fb
-- 
2.39.1

Re: State of core-updates

[Andreas Enge]

Am Sat, Mar 18, 2023 at 04:36:26PM +0000 schrieb Kaelyn:
> I'm at a complete loss as to why the patch won't apply properly.

Ah, the joys of email formatting maybe.

> I've attached the original patch as generated by "git format-patch

Thanks, I applied and pushed it and am closing the bug.

Andreas

Re: Offloading problems on berlin

[Ludovic Courtès]

Hi,

Andreas Enge <andreas@enge.fr> skribis:

> And it happens quite systematically with large packages sent as inputs.
> When trying to build openjdk, I get without pause output like this:
>    building /gnu/store/gqdzxi9idv4rby2g4j9s6h1m3qfbmjph-openjdk-15.0.9.drv...
>    guix offload: sending 2 store items (960 MiB) to '141.80.167.158'...
>    exporting path `/gnu/store/lil0s7gijwglfbvx4ailf9fqjmrw5jw9-openjdk-15.0.9-checkout'
>    exporting path `/gnu/store/ri7i5r91p8zj4jnznsjxnh35n99fb8k6-openjdk-14.0.2-jdk'
> and then it stops.
>
> After maybe 40 times or so it goes through.

If it’s this easy to reproduce, I hope we can gather more data
server-side and client-side.  (I tried and failed to reproduce it a few
days ago, maybe because I wasn’t transferring as much?)

Thanks,
Ludo’.

Re: Building more of ‘core-updates’ on ci.guix

[Ludovic Courtès]

Hi,

Andreas Enge <andreas@enge.fr> skribis:

> Would it be okay to add the following packages to etc/release-manifests.scm:
> openjdk
> unison (exercises ocaml)
> ghc-pandoc (exercises ghc)
> calibre (exercises Qt5 and python-pyqt)

I would maybe not add them to ‘etc/release-manifest.scm’ because that
goes beyond the original goal of that manifest, which is to ensure that
essential substitutes are available (see “make
assert-binaries-available”).

Now, maybe we’ve reached the point where we can get ci.guix to build all
of ‘core-updates’?

> icecat is supposed to be added as soon as rust is available on i686,
> but I suppose we could add it conditionally only on x86_64, no?
>
> Actually there is already a filter step in %system-manifest.
> The same holds for ungoogled-chromium. It should be enough to just
> add them.

Yes, it looks like we can safely uncomment icecat in ‘%system-packages’.

Thanks,
Ludo’.

Re: Building more of ‘core-updates’ on ci.guix

[Andreas Enge]

Am Wed, Mar 22, 2023 at 03:32:07PM +0100 schrieb Ludovic Courtès:
> Yes, it looks like we can safely uncomment icecat in ‘%system-packages’.

Done!

> Now, maybe we’ve reached the point where we can get ci.guix to build all
> of ‘core-updates’?

With staging built and the build farm being quite idle, I have come to the
same conclusion, so I have modified the specification to build everything,
and (hopefully) restarted the evaluation.

Andreas

Re: Building more of ‘core-updates’ on ci.guix

[Andreas Enge]

Am Thu, Mar 30, 2023 at 11:20:14AM +0200 schrieb Andreas Enge:
> With staging built and the build farm being quite idle, I have come to the
> same conclusion, so I have modified the specification to build everything,
> and (hopefully) restarted the evaluation.

Well, it does not seem to work.
   https://ci.guix.gnu.org/
shows "all" under build, but
   https://ci.guix.gnu.org/jobset/core-updates
has a few evaluations made after the change that do not take it into
account. For instance, 341091 on commit 35b208c shows no new builds.

Help welcome, I have no idea what is happening!

Andreas

Re: Building more of ‘core-updates’ on ci.guix

[Andreas Enge]

Am Thu, Mar 30, 2023 at 01:21:22PM +0200 schrieb Andreas Enge:
> Well, it does not seem to work.
>    https://ci.guix.gnu.org/
> shows "all" under build, but
>    https://ci.guix.gnu.org/jobset/core-updates
> has a few evaluations made after the change that do not take it into
> account. For instance, 341091 on commit 35b208c shows no new builds.
> Help welcome, I have no idea what is happening!

Ping! Without substitutes now further down the build graph, it becomes
difficult to work on missing pieces (if there are any left).

It looks like since my change to "all" of core-updates, the dashboard
has also disappeared; for instance I see no dots in
   https://ci.guix.gnu.org/eval/341091/dashboard

Andreas

Re: State of core-updates

[Simon Tournier]

Hi Andreas,

On mar., 14 mars 2023 at 21:43, Andreas Enge <andreas@enge.fr> wrote:

>> Well, maybe it could be helpful if now Berlin or Bordeaux starts to
>> build etc/release-manifest.scm.  WDYT?
>
> That sounds like a great next step. Someone just has to do it™...

The set of Someone is restricted since it requires special
privileges. :-)

Well, if the CI is not building a subset of packages, for instance the
etc/release-manifest.scm, then I am not convinced that rebuilding the
world again and again is worth the resources it requires, IMHO.

Anyway, I am just back from holidays and maybe core-updates had been
merged in the meantime… I have not read yet all the emails. ;-)

Cheers,
simon

Re: Building more of ‘core-updates’ on ci.guix

[Andreas Enge]

Hello all,

Am Fri, Mar 31, 2023 at 10:54:23AM +0200 schrieb Andreas Enge:
> > Well, it does not seem to work.
> >    https://ci.guix.gnu.org/
> > shows "all" under build, but
> >    https://ci.guix.gnu.org/jobset/core-updates
> > has a few evaluations made after the change that do not take it into
> > account. For instance, 341091 on commit 35b208c shows no new builds.
> > Help welcome, I have no idea what is happening!
> It looks like since my change to "all" of core-updates, the dashboard
> has also disappeared; for instance I see no dots in
>    https://ci.guix.gnu.org/eval/341091/dashboard

Ludovic and Chris have corrected a problem in dune.scm in commit
   01d9859821c5df6cc76c59e48fddd3c8cfa88ff0
Now all of core-updates is being built, and the dashboard is back.
Thanks a lot!

This means that people can now work on repairing their favourite missing
package, while having substitutes available from berlin (there are also
some on bordeaux).

The situation looks quite good for x86_64, and a bit less so on i686.
The aarch64 dashboard is completely red, due to an early build failure
by timeout of gcc.

powerpc is also completely red due to an early build failure in libstdc++,
see the last few lines of
   https://ci.guix.gnu.org/build/707624/log/raw
and this bug report:
   http://issues.guix.trop.in/61879

Andreas

Re: Building more of ‘core-updates’ on ci.guix

[Josselin Poiret]

[-- Attachment #1: Type: text/plain, Size: 756 bytes --]

Hi Andreas and everyone,

Andreas Enge <andreas@enge.fr> writes:

> Ludovic and Chris have corrected a problem in dune.scm in commit
>    01d9859821c5df6cc76c59e48fddd3c8cfa88ff0
> Now all of core-updates is being built, and the dashboard is back.
> Thanks a lot!
>
> This means that people can now work on repairing their favourite missing
> package, while having substitutes available from berlin (there are also
> some on bordeaux).

Should we organize a code sprint soon to bring the community together
and try and get this finally merged?  I can take care of sending a mail
to guix-devel, as long as we have enough helping hands for the fateful
day(s).

If so, would next week-end (15-16 april) work?

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]

Re: core-updates sprint (was: Building more of ‘core-updates’ on ci.guix)

[Andreas Enge]

Am Sat, Apr 08, 2023 at 12:28:07PM +0200 schrieb Josselin Poiret:
> Should we organize a code sprint soon to bring the community together
> and try and get this finally merged?  I can take care of sending a mail
> to guix-devel, as long as we have enough helping hands for the fateful
> day(s).
> If so, would next week-end (15-16 april) work?

Excellent idea! I will be available one of the days (tentatively Sunday,
but it will depend on the weather as I would like to go to a gardening
faire ;-)) I suppose we would then coordinate on the #guix channel on IRC?

The powerpc bug has apparently been fixed by one of the latest commits,
so it makes sense to advance. aarch64 is in very bad shape (maybe due to
a lack of build power), and i686 could also do better. But I think we have
a basis for substantial progress.

Andreas

Debugging Guix beyond pk (was Re: Notes from the Guix Days)

[Simon Tournier]

Hi Maxim,

On ven., 17 mars 2023 at 11:07, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:

>>   https://gitlab.com/pjotrp/guix-days-fosdem-2023/-/tree/main/
>
> This is nice, I just peeked at "Debugging Guix beyond pk".  I'll
> bookmark and read more of it, thank you!

I was very interested by this session, especially after the recent
thread [1] about Guile debugger.  In that thread [1], Ludo wrote,
quoting:

        Also, I think I mentioned before that I almost never use breakpoints on
        Guile code—not because of some deficiency of the debugger, not (just)
        because I’m silly or inexperienced, but because it’s rarely the right
        tool for the job.

and that’s the conclusion I came back to home: the good ol’ ’pk’ is just
the right tool for the job – considering the current state of Guile
debugger as discussed in this thread [1].

That’s said, the notes do not mention ’guix-derivation-mode’ from the
package emacs-guix.  Well, last do not miss ’guix-scheme-mode’ which
eases the reading of Scheme “builder” code – it is not always
autoloaded.

1: https://yhetil.org/guix/87fse69czr.fsf@gnu.org


Cheers,
simon

Re: Building more of ‘core-updates’ on ci.guix

[Simon Tournier]

Hi,

On sam., 08 avril 2023 at 12:28, Josselin Poiret <dev@jpoiret.xyz> wrote:

> Should we organize a code sprint soon to bring the community together
> and try and get this finally merged?  I can take care of sending a mail
> to guix-devel, as long as we have enough helping hands for the fateful
> day(s).

Nice idea!

I would suggest to send an email to guix-devel explaining how to
reconfigure using ’core-updates’ for testing and then report the
potential issues.

As an example:

--8<---------------cut here---------------start------------->8---
$ guix time-machine --branch=core-updates -- weather
computing 22 758 package derivations for x86_64-linux...
looking for 23 843 store items on https://ci.guix.gnu.org...
https://ci.guix.gnu.org ☀
  85.2% substitutes available (20 310 out of 23 843)
  at least 99 872,4 MiB of nars (compressed)
  161 269,2 MiB on disk (uncompressed)
  0,005 seconds per request (121,3 seconds in total)
  196,6 requests per second

  27.6% (976 out of 3 533) of the missing items are queued
  at least 1 000 queued builds
      aarch64-linux: 32 (3.2%)
      powerpc64le-linux: 13 (1.3%)
      x86_64-linux: 955 (95.5%)
  build rate: 508.47 builds per hour
      x86_64-linux: 485.98 builds per hour
      i686-linux: 62.03 builds per hour
looking for 23 843 store items on https://bordeaux.guix.gnu.org...
https://bordeaux.guix.gnu.org ⛈
  35.5% substitutes available (8 467 out of 23 843)
  at least 17 312,7 MiB of nars (compressed)
  62 000,0 MiB on disk (uncompressed)
  0,010 seconds per request (239,3 seconds in total)
  99,7 requests per second
  (continuous integration information unavailable)
--8<---------------cut here---------------end--------------->8---

Then, the missing from my manifest are:

--8<---------------cut here---------------start------------->8---
$ guix time-machine --branch=core-updates \
       -- weather -m ~/.config/guix/manifests/emacs.scm --display-missing

[...]

Substitutes are missing for the following items:
  /gnu/store/qwm340cgp45w231jzhgs131vv2y4a8d6-ocaml-yojson-2.0.2                                                                            x86_64-linux
  /gnu/store/3d4n5l41vvcqby9jsrwf582n5mqss3di-ocaml-merlin-4.7-414                                                                          x86_64-linux
  /gnu/store/wc2srqbis7nyn0kbx5z3lv17xncr7wvc-ocaml-uuseg-15.0.0                                                                            x86_64-linux
  /gnu/store/8ij1pgrjrnzs8nzhq7c8xy1fvlyh1fkk-ocaml-uucp-15.0.0                                                                             x86_64-linux
  /gnu/store/rm0c052hajwypds3dfmz3dbhgxsx7bwi-ocaml-uutf-1.0.3                                                                              x86_64-linux
  /gnu/store/92sq9lr2y5k1zmfxj2z1ab2apzmhz1cf-ocaml-zed-3.2.1                                                                               x86_64-linux
  /gnu/store/h8v335ykhqkmcdv329w2wr0m3fpqny26-ocaml-odoc-2.2.0                                                                              x86_64-linux
  /gnu/store/srnhncz8lr55q677bqpnhfsla59cbh42-ocaml-mew-0.1.0                                                                               x86_64-linux
  /gnu/store/mrz4hihvdmf67rdpph821881fw7lz3rl-ocaml-mew-vi-0.5.0                                                                            x86_64-linux
  /gnu/store/dlsqm5yw7l8a33flr9r11k58ywk57s8x-ocaml-react-1.2.2                                                                             x86_64-linux
  /gnu/store/fk3hyh3lr145z6hglbpy3hph13lqw0hb-ocaml-lwt-react-1.2.0                                                                         x86_64-linux
  /gnu/store/km6lqkbrxssmf3h7ryy01ab72z5a30ry-ocaml-topkg-1.0.6                                                                             x86_64-linux
  /gnu/store/ddff0c1zb3nkfns72c1xg87hs6kyqcag-ocaml-mtime-2.0.0                                                                             x86_64-linux
  /gnu/store/9vz8xard511cz04cpfnvgvia3r5avx2s-ocaml-fmt-0.9.0                                                                               x86_64-linux
  /gnu/store/lbfazpx5fgk6jabas4pyvibk3wp4y1qv-ocaml-logs-0.7.0                                                                              x86_64-linux
  /gnu/store/h899y7ah0a1rxls005xsjz7zzynrxj2h-ocaml-lambda-term-3.3.1                                                                       x86_64-linux
  /gnu/store/l2mg99br25hsmk2w5h6hxlcch95py3hp-ocaml-utop-2.10.0                                                                             x86_64-linux
--8<---------------cut here---------------end--------------->8---

Well, from https://ci.guix.gnu.org/ let click on the “screen”
(dashboard) under Action and then in the search bar, let type “ocaml-”
thus it display all the red.  Let pick one red: ocaml-angstrom-0.15.0,
then “Show more“ then the red cross and we are at ocaml-ppxlib-0.25.1.
Let click to ‘raw’, bottom, the error seems:

--8<---------------cut here---------------start------------->8---
+  egrep: warning: egrep is obsolescent; using grep -E
--8<---------------cut here---------------end--------------->8---

probably because the update of grep from 3.6 to 3.8.  Then, I have my
homework at fixing these OCaml packages… if no one beats me.. :-)


Cheers,
simon

Re: Debugging Guix beyond pk (was Re: Notes from the Guix Days)

[Maxim Cournoyer]

Hi Simon,

Simon Tournier <zimon.toutoune@gmail.com> writes:

> Hi Maxim,
>
> On ven., 17 mars 2023 at 11:07, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
>
>>>   https://gitlab.com/pjotrp/guix-days-fosdem-2023/-/tree/main/
>>
>> This is nice, I just peeked at "Debugging Guix beyond pk".  I'll
>> bookmark and read more of it, thank you!
>
> I was very interested by this session, especially after the recent
> thread [1] about Guile debugger.  In that thread [1], Ludo wrote,
> quoting:
>
>         Also, I think I mentioned before that I almost never use breakpoints on
>         Guile code—not because of some deficiency of the debugger, not (just)
>         because I’m silly or inexperienced, but because it’s rarely the right
>         tool for the job.
>
> and that’s the conclusion I came back to home: the good ol’ ’pk’ is just
> the right tool for the job – considering the current state of Guile
> debugger as discussed in this thread [1].

I agree it's the "right" as in "best" tool for the job given the current
situation that makes stepping Guile code difficult/impossible to follow
or stop where one wants.  I still think a more user-friendly/capable
debugger would be nice, but haven't had the opportunity to take actions
yet.  The obvious low hanging fruit would be to start with documenting
'pk' in the Guile user manual :-).

> That’s said, the notes do not mention ’guix-derivation-mode’ from the
> package emacs-guix.  Well, last do not miss ’guix-scheme-mode’ which
> eases the reading of Scheme “builder” code – it is not always
> autoloaded.
>
> 1: https://yhetil.org/guix/87fse69czr.fsf@gnu.org

I know these, they are very useful.  Not too discoverable too, I reckon!
Thanks for pointing them out.

-- 
Thanks,
Maxim