| Message ID | 4d89b94c52a511c47151e44c0102cc974f7aab11.1690675204.git.me@tobias.gr |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#65000] gnu: emacs-next: Update to 29.1. | expand |
Am Sonntag, dem 30.07.2023 um 02:00 +0200 schrieb Tobias Geerinckx- Rice: > * gnu/packages/emacs.scm (emacs-next): Update to 29.1. > --- > > gnu/packages/emacs.scm | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index d3689c2474..a9db4e3bd0 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -394,7 +394,7 @@ (define-public emacs-next > (package > (inherit emacs) > (name "emacs-next") > - (version "29.0.92") > + (version "29.1") > (source > (origin > (inherit (package-source emacs)) > @@ -408,8 +408,7 @@ (define-public emacs-next > "emacs-fix-scheme-indent- > function.patch" > "emacs-native-comp-driver- > options.patch")) > (sha256 > - (base32 > - "1h3p325859svcy43iv7wr27dp68049j9d44jq5akcynqdkxz4jjn")))) > + (base32 > "1a0qng5dpjqsv7hqkg9kbwczhg41v1pdvps297q4bglasg1c4w6w")))) Welp, given that this is a release, it's no longer, "emacs-next", isn't it? I think we should take this version and hash to emacs-team, build the packages there and then merge back to master. Sadly, there's a little conflict with Jan's patch a while earlier that I forgot to feed back… > (inputs > (modify-inputs (package-inputs emacs) > (prepend sqlite))) > > base-commit: 75b95af9d64563f316992af141cde4f5f4f36441 > prerequisite-patch-id: c0bdedcb95ea290b7036b5239646ab8737ee8fc3 > prerequisite-patch-id: 4653095cc42bfe83fb84ce39153d654dd978e266 > prerequisite-patch-id: 3a608773b8cb7bc3412694d5ca199b8f629d8260 > prerequisite-patch-id: afc5306ed6431f67cb5acb7e35d06d3149dd24bb > prerequisite-patch-id: c1aff03b799213ed4a5e27022b8a0bb704677bfd > prerequisite-patch-id: 6d0a606ec0f4791b9f7804fe811ddc247a94fc3d > prerequisite-patch-id: 1c282f720a5ade12d9d8cdc574fc321b4d29fbec > prerequisite-patch-id: 17b490d8ce892558026245b009ebda7a32c8cbea > prerequisite-patch-id: c9162290fa29df5c020b99a38ac2a8dc6a78ef05 > prerequisite-patch-id: a6b89688a03e41460d1332acfdeb8abd9980e7e5 > prerequisite-patch-id: a7e88bbe57e9330efcaf2023d1a3d3a6d681dd07 > prerequisite-patch-id: a878b8d1c6d10c196d0a8bf3c0d1379f0ce1849b > prerequisite-patch-id: 7e6e4ab87b52996e9bb6cd8595889f21ba87e9fe > prerequisite-patch-id: 6f86f2a54f77c0e8841b6f22953c2f748e358107 > prerequisite-patch-id: 7c88071ffd6af8c9de9a44ef2e745e3b111d28e7 > prerequisite-patch-id: dacf336396c4f629906e4689dc2868d437179a37 > prerequisite-patch-id: 35641348fcba881313d08cb85da3722ba0891264 > prerequisite-patch-id: ea98f949fde81f63a309e36405b87463dc07ac50 > prerequisite-patch-id: a299994eb9a52db942a5cc3a038b8bc34529c799 > prerequisite-patch-id: 9ffc6d3a9be37af59ec29bfce0543cf8371edacb > prerequisite-patch-id: c489fbc8af7d431f9372d0b8bc9e4c609703680e > prerequisite-patch-id: 471c932817cc1044fd03f56e1a1f84e4ce4029a9 > prerequisite-patch-id: 88f3a5981ea62ce654a48c258df09315f24ba73e > prerequisite-patch-id: 62b7b8d8b26d642f524d45e910f7685a57345d76 > prerequisite-patch-id: 6ad7cb518d3f48614c97e7ef851289a8f4375306 > prerequisite-patch-id: b6630bfc6abc407afac53074820b61aa676c6f0a Quite a number of prerequisites ;)
On 2023-08-01 22:27, Liliana Marie Prikler wrote: > Welp, given that this is a release, it's no longer, "emacs-next", isn't > it? Oh? To me, "-next" does not imply ‘not a release’. It can mean all sorts of fun things, like ‘known to be broken if you hold it wrong’, ‘simply not as tested as the primary package’, or even ‘I didn't wanna wait for a whole proper "emacs" integration cycle to get this upstream ;-)’. Yeah, that's the one. > Quite a number of prerequisites ;) Local branches are for gits! Constantly rebasing keeps the fingers strong. Buff regards, T G-R Sent from a Web browser. Excuse or enjoy my brevity.
Am Dienstag, dem 01.08.2023 um 23:10 +0200 schrieb Tobias Geerinckx- Rice: > On 2023-08-01 22:27, Liliana Marie Prikler wrote: > > Welp, given that this is a release, it's no longer, "emacs-next", > > isn't it? > > Oh? To me, "-next" does not imply ‘not a release’. > > It can mean all sorts of fun things, like ‘known to be broken if you > hold it wrong’, ‘simply not as tested as the primary package’, or > even ‘I didn't wanna wait for a whole proper "emacs" integration > cycle to get this upstream ;-)’. > > Yeah, that's the one. I mean, I can understand that. On the other hand, I don't think it'd be nice for emacs-team to diverge too far and a merge in celebration of "emacs-next" being actually released now would make a lot of sense imho. That being said it would also mean that folks would have to s/emacs-next/emacs their profiles. Andrew, WDYT?
On 2023-08-02 06:25, Liliana Marie Prikler wrote: > Am Dienstag, dem 01.08.2023 um 23:10 +0200 schrieb Tobias Geerinckx- > Rice: >> On 2023-08-01 22:27, Liliana Marie Prikler wrote: >> > Welp, given that this is a release, it's no longer, "emacs-next", >> > isn't it? >> >> Oh? To me, "-next" does not imply ‘not a release’. >> >> It can mean all sorts of fun things, like ‘known to be broken if you >> hold it wrong’, ‘simply not as tested as the primary package’, or >> even ‘I didn't wanna wait for a whole proper "emacs" integration >> cycle to get this upstream ;-)’. >> >> Yeah, that's the one. > I mean, I can understand that. On the other hand, I don't think it'd > be nice for emacs-team to diverge too far and a merge in celebration of > "emacs-next" being actually released now would make a lot of sense > imho. That being said it would also mean that folks would have to > s/emacs-next/emacs their profiles. > > Andrew, WDYT? I agree, let's take this to emacs package in emacs-team branch and merge back to master after depended packages are built.
Am Mittwoch, dem 02.08.2023 um 14:20 +0400 schrieb Andrew Tropin: > I agree, let's take this to emacs package in emacs-team branch and > merge back to master after depended packages are built. Pushed the emacs-brach team and merge master back in yesterday in the evening. Let's wait a bit for CI. Cheers
On 2023-08-14 07:45, Liliana Marie Prikler wrote: > Am Mittwoch, dem 02.08.2023 um 14:20 +0400 schrieb Andrew Tropin: >> I agree, let's take this to emacs package in emacs-team branch and >> merge back to master after depended packages are built. > Pushed the emacs-brach team and merge master back in yesterday in the > evening. Cool, thank you very much for working on it! > Let's wait a bit for CI. Does push to emacs-team trigger a CI? I can't find it in https://ci.guix.gnu.org/ UI.
Am Montag, dem 14.08.2023 um 14:12 +0400 schrieb Andrew Tropin: > On 2023-08-14 07:45, Liliana Marie Prikler wrote: > > > Am Mittwoch, dem 02.08.2023 um 14:20 +0400 schrieb Andrew Tropin: > > > I agree, let's take this to emacs package in emacs-team branch > > > and > > > merge back to master after depended packages are built. > > Pushed the emacs-brach team and merge master back in yesterday in > > the > > evening. > > Cool, thank you very much for working on it! > > > Let's wait a bit for CI. > > Does push to emacs-team trigger a CI? > > I can't find it in https://ci.guix.gnu.org/ UI. 何？どうして？ I literally just found out thanks to your mail that emacs-team is no longer on Cuirass. There should be better communication on this…
Am Montag, dem 14.08.2023 um 17:04 +0200 schrieb Liliana Marie Prikler: > Am Montag, dem 14.08.2023 um 14:12 +0400 schrieb Andrew Tropin: > > On 2023-08-14 07:45, Liliana Marie Prikler wrote: > > > > > Am Mittwoch, dem 02.08.2023 um 14:20 +0400 schrieb Andrew Tropin: > > > > I agree, let's take this to emacs package in emacs-team branch > > > > and > > > > merge back to master after depended packages are built. > > > Pushed the emacs-brach team and merge master back in yesterday in > > > the > > > evening. > > > > Cool, thank you very much for working on it! > > > > > Let's wait a bit for CI. > > > > Does push to emacs-team trigger a CI? > > > > I can't find it in https://ci.guix.gnu.org/ UI. > 何？どうして？ > > I literally just found out thanks to your mail that emacs-team is no > longer on Cuirass. There should be better communication on this… Turns out, I only have myself to blame here. Seems I configured a job for gnome-team but not one for emacs-team. Sorry, will fix shortly.
On 2023-08-14 17:31, Liliana Marie Prikler wrote: > Am Montag, dem 14.08.2023 um 17:04 +0200 schrieb Liliana Marie Prikler: >> Am Montag, dem 14.08.2023 um 14:12 +0400 schrieb Andrew Tropin: >> > On 2023-08-14 07:45, Liliana Marie Prikler wrote: >> > >> > > Am Mittwoch, dem 02.08.2023 um 14:20 +0400 schrieb Andrew Tropin: >> > > > I agree, let's take this to emacs package in emacs-team branch >> > > > and >> > > > merge back to master after depended packages are built. >> > > Pushed the emacs-brach team and merge master back in yesterday in >> > > the >> > > evening. >> > >> > Cool, thank you very much for working on it! >> > >> > > Let's wait a bit for CI. >> > >> > Does push to emacs-team trigger a CI? >> > >> > I can't find it in https://ci.guix.gnu.org/ UI. >> 何？どうして？ >> >> I literally just found out thanks to your mail that emacs-team is no >> longer on Cuirass. There should be better communication on this… > Turns out, I only have myself to blame here. Seems I configured a job > for gnome-team but not one for emacs-team. > > Sorry, will fix shortly. Thank you! :) It seems up and running.
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d3689c2474..a9db4e3bd0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -394,7 +394,7 @@ (define-public emacs-next (package (inherit emacs) (name "emacs-next") - (version "29.0.92") + (version "29.1") (source (origin (inherit (package-source emacs)) @@ -408,8 +408,7 @@ (define-public emacs-next "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch")) (sha256 - (base32 - "1h3p325859svcy43iv7wr27dp68049j9d44jq5akcynqdkxz4jjn")))) + (base32 "1a0qng5dpjqsv7hqkg9kbwczhg41v1pdvps297q4bglasg1c4w6w")))) (inputs (modify-inputs (package-inputs emacs) (prepend sqlite)))