Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

melpa: use newer package-build.el to work around a breaking change in Emacs 30 #276401

Closed
wants to merge 2 commits into from
Closed

melpa: use newer package-build.el to work around a breaking change in Emacs 30 #276401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8178cdf
melpa: Account for recent breaking change in Emacs 30
leungbk Dec 23, 2023
cb364ed
melpa: toss patches, and instead adjust to upstream breakages
leungbk Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/build-support/emacs/melpa.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
rev = "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d";
sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5";
rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0";
sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M=";
};

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

dontConfigure = true;
dontBuild = true;

Expand Down
17 changes: 6 additions & 11 deletions pkgs/build-support/emacs/melpa2nix.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@
(setq large-file-warning-threshold nil)

(defun melpa2nix-build-package-1 (rcp version commit)
(let ((source-dir (package-recipe--working-tree rcp)))
(unwind-protect
(let ((files (package-build-expand-files-spec rcp t)))
(cond
((= (length files) 1)
(package-build--build-single-file-package
rcp version commit files source-dir))
((> (length files) 1)
(package-build--build-multi-file-package
rcp version commit files source-dir))
(t (error "Unable to find files matching recipe patterns")))))))
(oset rcp version version)
(oset rcp commit commit)
(oset rcp time 0)
(let ((package-build-checkout-function #'ignore)
(package-build-cleanup-function #'ignore))
(package-build--package rcp)))

(defun melpa2nix-build-package ()
(if (not noninteractive)
Expand Down
40 changes: 0 additions & 40 deletions pkgs/build-support/emacs/package-build-dont-use-mtime.patch
View file
Open in desktop

This file was deleted.