* core-updates vs. core-updates-next [not found] ` <20160526173645.520A2220153@vcs.savannah.gnu.org> @ 2016-05-27 8:14 ` Ludovic Courtès 2016-05-27 14:56 ` Leo Famulari 0 siblings, 1 reply; 4+ messages in thread From: Ludovic Courtès @ 2016-05-27 8:14 UTC (permalink / raw) To: Leo Famulari; +Cc: guix-devel Hi! leo@famulari.name (Leo Famulari) skribis: > commit b0bbf2491e346a355c1ec5584c16de7fbfa14f5e > Author: Leo Famulari <leo@famulari.name> > Date: Thu May 26 13:24:41 2016 -0400 > > gnu: expat: Remove replacement. > > * gnu/packages/xml.scm (expat)[replacement]: Remove field. > (expat/fixed): Remove variable. [...] > commit aee7f2e98ae2cbbd0cd765beda6c0a4279929c94 > Author: Leo Famulari <leo@famulari.name> > Date: Thu May 26 22:45:51 2016 -0400 > > gnu: libxslt: Update to 1.1.29. > > * gnu/packages/patches/libxslt-CVE-2015-7995.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Remove it. > * gnu/packages/xml.scm (libxslt): Update to 1.1.29. > [source]: Remove patch. Clarification: until Hydra has started building all of core-updates, it’s OK to push non-core updates like these to core-updates. There are still a couple of issues at <https://hydra.gnu.org/jobset/gnu/core-updates> to be fixed in the core packages before we can ask Hydra to build all of core-updates. Until then, feel free! :-) Ludo’. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: core-updates vs. core-updates-next 2016-05-27 8:14 ` core-updates vs. core-updates-next Ludovic Courtès @ 2016-05-27 14:56 ` Leo Famulari 2016-05-28 15:38 ` Ludovic Courtès 0 siblings, 1 reply; 4+ messages in thread From: Leo Famulari @ 2016-05-27 14:56 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel On Fri, May 27, 2016 at 10:14:09AM +0200, Ludovic Courtès wrote: > Hi! > > leo@famulari.name (Leo Famulari) skribis: > > > commit b0bbf2491e346a355c1ec5584c16de7fbfa14f5e > > Author: Leo Famulari <leo@famulari.name> > > Date: Thu May 26 13:24:41 2016 -0400 > > > > gnu: expat: Remove replacement. > > > > * gnu/packages/xml.scm (expat)[replacement]: Remove field. > > (expat/fixed): Remove variable. > > [...] > > > commit aee7f2e98ae2cbbd0cd765beda6c0a4279929c94 > > Author: Leo Famulari <leo@famulari.name> > > Date: Thu May 26 22:45:51 2016 -0400 > > > > gnu: libxslt: Update to 1.1.29. > > > > * gnu/packages/patches/libxslt-CVE-2015-7995.patch: Delete file. > > * gnu/local.mk (dist_patch_DATA): Remove it. > > * gnu/packages/xml.scm (libxslt): Update to 1.1.29. > > [source]: Remove patch. > > Clarification: until Hydra has started building all of core-updates, > it’s OK to push non-core updates like these to core-updates. > > There are still a couple of issues at > <https://hydra.gnu.org/jobset/gnu/core-updates> to be fixed in the core > packages before we can ask Hydra to build all of core-updates. Until > then, feel free! :-) Okay, do you think I should move the commits from core-updates-next to core-updates? ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: core-updates vs. core-updates-next 2016-05-27 14:56 ` Leo Famulari @ 2016-05-28 15:38 ` Ludovic Courtès 2016-05-28 16:04 ` Leo Famulari 0 siblings, 1 reply; 4+ messages in thread From: Ludovic Courtès @ 2016-05-28 15:38 UTC (permalink / raw) To: Leo Famulari; +Cc: guix-devel Leo Famulari <leo@famulari.name> skribis: > On Fri, May 27, 2016 at 10:14:09AM +0200, Ludovic Courtès wrote: >> Hi! >> >> leo@famulari.name (Leo Famulari) skribis: >> >> > commit b0bbf2491e346a355c1ec5584c16de7fbfa14f5e >> > Author: Leo Famulari <leo@famulari.name> >> > Date: Thu May 26 13:24:41 2016 -0400 >> > >> > gnu: expat: Remove replacement. >> > >> > * gnu/packages/xml.scm (expat)[replacement]: Remove field. >> > (expat/fixed): Remove variable. >> >> [...] >> >> > commit aee7f2e98ae2cbbd0cd765beda6c0a4279929c94 >> > Author: Leo Famulari <leo@famulari.name> >> > Date: Thu May 26 22:45:51 2016 -0400 >> > >> > gnu: libxslt: Update to 1.1.29. >> > >> > * gnu/packages/patches/libxslt-CVE-2015-7995.patch: Delete file. >> > * gnu/local.mk (dist_patch_DATA): Remove it. >> > * gnu/packages/xml.scm (libxslt): Update to 1.1.29. >> > [source]: Remove patch. >> >> Clarification: until Hydra has started building all of core-updates, >> it’s OK to push non-core updates like these to core-updates. >> >> There are still a couple of issues at >> <https://hydra.gnu.org/jobset/gnu/core-updates> to be fixed in the core >> packages before we can ask Hydra to build all of core-updates. Until >> then, feel free! :-) > > Okay, do you think I should move the commits from core-updates-next to > core-updates? Yes, please! Just cherry-picking them and that should be fine. Thank you, Ludo’. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: core-updates vs. core-updates-next 2016-05-28 15:38 ` Ludovic Courtès @ 2016-05-28 16:04 ` Leo Famulari 0 siblings, 0 replies; 4+ messages in thread From: Leo Famulari @ 2016-05-28 16:04 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel On Sat, May 28, 2016 at 05:38:31PM +0200, Ludovic Courtès wrote: > > Okay, do you think I should move the commits from core-updates-next to > > core-updates? > > Yes, please! Just cherry-picking them and that should be fine. Both patches can't be cherry-picked smoothly. In both cases, there have been other changes to the packages on core-updates that are not present on core-updates-next. Even if I resolve the conflicts while cherry-picking, I think we will get conflicts again whenever we merge what is now core-updates-next. For expat, it was updated to 2.1.1, and for libxslt, the docs were made to build reproducibly. So, even though it will look a bit messy in the logs, I wonder if it's best to revert them on core-updates-next and manually recreate the changes on core-updates? And in the future, I will *definitely* check for this situation before pushing changes to a ...-next branch. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-28 16:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160526173645.9317.58057@vcs.savannah.gnu.org>
[not found] ` <20160526173645.520A2220153@vcs.savannah.gnu.org>
2016-05-27 8:14 ` core-updates vs. core-updates-next Ludovic Courtès
2016-05-27 14:56 ` Leo Famulari
2016-05-28 15:38 ` Ludovic Courtès
2016-05-28 16:04 ` Leo Famulari
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).