Skip to content

Commit

Permalink
Support Emacs 26.1 again
Browse files Browse the repository at this point in the history
Since [1: 1ebac69] Emacs 26.1 effectively wasn't supported anymore and
[2: fa83e81] made that formal, but we should support that release at
least a while longer, which do by using the Compat package.

1: 2023-07-18 1ebac69
   package-recipe-validate-all: Report progress

2: 2023-12-24 fa83e81
   Fix CI build by requiring a newer Emacs
  • Loading branch information
tarsius committed Jan 2, 2024
1 parent 9f62062 commit 414b328
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ include default.mk

.PHONY: test

# https://github.com/emacscollective/workflows/blob/main/bin/install-deps
# expects this to find this in this file.
DEPS = compat

all: lisp

help:
Expand Down
2 changes: 1 addition & 1 deletion default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ELS += package-build.el
ELS += package-recipe-mode.el
ELCS = $(ELS:.el=.elc)

DEPS =
DEPS = compat

VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)

Expand Down
3 changes: 2 additions & 1 deletion package-build.el
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
;; Keywords: maint tools

;; Package-Version: 4.0.0.50-git
;; Package-Requires: ((emacs "27.1"))
;; Package-Requires: ((emacs "26.1") (compat "27.1"))

;; SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -42,6 +42,7 @@
;;; Code:

(require 'cl-lib)
(require 'compat nil t)
(require 'pcase)
(require 'subr-x)

Expand Down
1 change: 1 addition & 0 deletions package-recipe.el
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

;;; Code:

(require 'compat nil t)
(require 'eieio)
(require 'subr-x)
(require 'url-parse)
Expand Down

6 comments on commit 414b328

@tarsius
Copy link
Member Author

@tarsius tarsius commented on 414b328 Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@purcell I've restored support for Emacs 26.

@purcell
Copy link
Member

@purcell purcell commented on 414b328 Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh nice!

@purcell
Copy link
Member

@purcell purcell commented on 414b328 Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that some build machinery elsewhere (e.g. the stuff in nixpkgs that produces Nix packages from MELPA packages) assumes that package-build itself has no further dependencies. That code just grabs the package-build repo from github, so it should still work thanks to the noerror arg you're passing to require.

@tarsius
Copy link
Member Author

@tarsius tarsius commented on 414b328 Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's why I've added non-nil noerror. Well, to not complicate things on Melpa's own server really. 😁

@purcell
Copy link
Member

@purcell purcell commented on 414b328 Jan 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it was good thinking! Also, much more important note: Happy New Year! Hope 2024 and beyond are good for you. πŸ€œπŸ€›

@tarsius
Copy link
Member Author

@tarsius tarsius commented on 414b328 Jan 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy new year to you too! πŸ₯³

Please sign in to comment.