emacs-next@29.0.60 self-reports as version 30.0.50

  • Done
  • quality assurance status badge
Details
3 participants
  • Jelle Licht
  • Liliana Marie Prikler
  • Simon Tournier
Owner
unassigned
Submitted by
Jelle Licht
Severity
normal

Debbugs page

Jelle Licht wrote 2 years ago
(address . bug-guix@gnu.org)
87r0us0yvu.fsf@fsfe.org
Hi guix,

Since commit 6f0c905324 on master, the version of our emacs-next package
was bumped to 29.0.60(-0.ac7ec87).

Yet:
Toggle snippet (4 lines)
jlicht@revint ~$ guix shell --pure emacs-next -- emacs --version
GNU Emacs 30.0.50

Is this some peculiarity of the Emacs's development cycle, or did we end
up having a "emacs-next-next" package?

Kind regards,
- Jelle
Liliana Marie Prikler wrote 2 years ago
[PATCH 2/2] gnu: emacs-next: Update to 29.0.60-1.f1f571e.
(address . 61513@debbugs.gnu.org)(name . Jelle Licht)(address . jlicht@fsfe.org)
4c405dcf2c0059204664c1f6f659e175b3fe2776.camel@gmail.com
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-1.f1f571e.
---
Note: Haven't tried to build the commit yet, but the hash checks out.

gnu/packages/emacs.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e230fdc84d..51ce4e481b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -391,8 +391,8 @@ (define* (emacs-byte-compile-directory dir)
(license license:gpl3+)))
(define-public emacs-next
- (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
- (revision "0"))
+ (let ((commit "f1f571e72ae10285762d3a941e56f7c4048272af")
+ (revision "1"))
(package
(inherit emacs)
(name "emacs-next")
@@ -411,7 +411,7 @@ (define-public emacs-next
"emacs-native-comp-driver-options.patch"))
(sha256
(base32
- "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
+ "1rildbxq53yvc2rllg2qccgxzbbnr6qbija0lyqacsy8dlzaysch"))))
(inputs
(modify-inputs (package-inputs emacs)
(prepend sqlite)))
--
2.39.1
Liliana Marie Prikler wrote 2 years ago
[PATCH 1/2] gnu: Add emacs-next-tree-sitter.
(address . 61513@debbugs.gnu.org)(name . Jelle Licht)(address . jlicht@fsfe.org)
90971f3b9d10d0cbb16dbe9aafa8b913e67f80b9.camel@gmail.com
* gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
(emacs-next): Remove tree sitter support.
---
gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)

Toggle diff (44 lines)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 953aad961c..e230fdc84d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -397,6 +397,35 @@ (define-public emacs-next
(inherit emacs)
(name "emacs-next")
(version (git-version "29.0.60" revision commit))
+ (source
+ (origin
+ (inherit (package-source emacs))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/emacs.git/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ ;; emacs-source-date-epoch.patch is no longer necessary
+ (patches (search-patches "emacs-exec-path.patch"
+ "emacs-fix-scheme-indent-function.patch"
+ "emacs-native-comp-driver-options.patch"))
+ (sha256
+ (base32
+ "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
+ (inputs
+ (modify-inputs (package-inputs emacs)
+ (prepend sqlite)))
+ (native-inputs
+ (modify-inputs (package-native-inputs emacs)
+ (prepend autoconf))))))
+
+(define-public emacs-next-tree-sitter
+ (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
+ (revision "0"))
+ (package
+ (inherit emacs)
+ (name "emacs-next-tree-sitter")
+ (version (git-version "30.0.50" revision commit))
(source
(origin
(inherit (package-source emacs))

base-commit: 312f1f41d3f3f3e5d2c36ff46920c6dce1c21a17
--
2.39.1
Simon Tournier wrote 2 years ago
(name . Jelle Licht)(address . jlicht@fsfe.org)
87mt584oek.fsf@gmail.com
Hi,

On jeu., 16 févr. 2023 at 21:36, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:
Toggle quote (3 lines)
> * gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
> (emacs-next): Remove tree sitter support.

Naive question: why not squash the 2 patches? Adding the new variable
and fix the version of emacs-next.

Cheers,
simon
Liliana Marie Prikler wrote 2 years ago
(name . Jelle Licht)(address . jlicht@fsfe.org)
d60b119458c4c75843f14ea4d984631c9c2dc3a9.camel@gmail.com
Am Montag, dem 20.02.2023 um 11:33 +0100 schrieb Simon Tournier:
Toggle quote (9 lines)
> Hi,
>
> On jeu., 16 févr. 2023 at 21:36, Liliana Marie Prikler
> <liliana.prikler@gmail.com> wrote:
> > * gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
> > (emacs-next): Remove tree sitter support.
>
> Naive question: why not squash the 2 patches?  Adding the new
> variable and fix the version of emacs-next.
Because the next patch "upgrades" emacs-next to the then HEAD of the
emacs-29 branch, which wasn't hitherto packaged in Guix.
Alternatively, one could reset it to an earlier version in the first
commit, but we have a(n informal) policy that discourages downgrades.

Cheers
Simon Tournier wrote 2 years ago
(name . Jelle Licht)(address . jlicht@fsfe.org)
86ilfv9ot2.fsf@gmail.com
Hi,

On Mon, 20 Feb 2023 at 20:21, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:

Toggle quote (8 lines)
>> Naive question: why not squash the 2 patches?  Adding the new
>> variable and fix the version of emacs-next.
>
> Because the next patch "upgrades" emacs-next to the then HEAD of the
> emacs-29 branch, which wasn't hitherto packaged in Guix.
> Alternatively, one could reset it to an earlier version in the first
> commit, but we have a(n informal) policy that discourages downgrades.

Ah indeed, thanks for the explanations.

IIUC, the error seems Guix commit
6f0c9053244d6b4cfc4130c963a15dbf83cbcdac in the first place, introducing
Emacs commit ac7ec87a7a0db887e4ae7fe9005aea517958b778 which is not from
the Emacs 29 series but from the Emacs 30 series.

Well, I do not think if we can speak about downgrade here. :-) Anyway.

It LGTM.


Cheers,
simon
Liliana Marie Prikler wrote 2 years ago
(name . Jelle Licht)(address . jlicht@fsfe.org)
2e7846097a2c13f2d281f8442cbc69a25fb60b89.camel@gmail.com
Am Dienstag, dem 21.02.2023 um 13:38 +0100 schrieb Simon Tournier:
Toggle quote (1 lines)
> It LGTM.
And it pushed now :)
Closed
?
Your comment

This issue is archived.

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

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