Skip to content

Commit

Permalink
melpa: Account for recent breaking change in Emacs 30
Browse files Browse the repository at this point in the history
package--prepare-dependencies has been renamed in a recent revision of
Emacs 30.
  • Loading branch information
leungbk committed Dec 24, 2023
1 parent 42e8265 commit 8178cdf
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/build-support/emacs/melpa.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5";
};

patches = [ ./package-build-dont-use-mtime.patch ];
patches = [ ./package-build-dont-use-mtime.patch ./package-build-lm-package-requires.patch ];

dontConfigure = true;
dontBuild = true;
Expand Down
22 changes: 22 additions & 0 deletions pkgs/build-support/emacs/package-build-lm-package-requires.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/package-build.el b/package-build.el
index e572045..32affb2 100644
--- a/package-build.el
+++ b/package-build.el
@@ -553,9 +553,11 @@ still be renamed."
nil t)
(match-string-no-properties 1)))
"No description available.")
- (when-let ((require-lines (lm-header-multiline "package-requires")))
- (package--prepare-dependencies
- (package-read-from-string (mapconcat #'identity require-lines " "))))
+ (if (fboundp 'lm-package-requires)
+ (lm-package-requires)
+ (when-let ((require-lines (lm-header-multiline "package-requires")))
+ (package--prepare-dependencies
+ (package-read-from-string (mapconcat #'identity require-lines " ")))))
:kind (or type 'single)
:url (lm-homepage)
:keywords (lm-keywords-list)
--
2.42.0

0 comments on commit 8178cdf

Please sign in to comment.