-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ReApply PR #276943: "melpa2nix: update to work with Emacs HEAD"
- Loading branch information
Showing
3 changed files
with
27 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 12 additions & 31 deletions
43
pkgs/build-support/emacs/package-build-dont-use-mtime.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,21 @@ | ||
diff --git a/package-build.el b/package-build.el | ||
index e572045..9eb0f82 100644 | ||
index 29cdb61..c19be1b 100644 | ||
--- a/package-build.el | ||
+++ b/package-build.el | ||
@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir) | ||
(princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" | ||
(current-buffer))))) | ||
|
||
-(defun package-build--create-tar (name version directory mtime) | ||
+(defun package-build--create-tar (name version directory) | ||
"Create a tar file containing the contents of VERSION of package NAME. | ||
DIRECTORY is a temporary directory that contains the directory | ||
that is put in the tarball. MTIME is used as the modification | ||
@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime) | ||
;; prevent a reproducable tarball as described at | ||
@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory | ||
that is put in the tarball." | ||
(let* ((name (oref rcp name)) | ||
(version (oref rcp version)) | ||
- (time (oref rcp time)) | ||
(tar (expand-file-name (concat name "-" version ".tar") | ||
package-build-archive-dir)) | ||
(dir (concat name "-" version))) | ||
@@ -939,7 +938,7 @@ that is put in the tarball." | ||
;; prevent a reproducible tarball as described at | ||
;; https://reproducible-builds.org/docs/archives. | ||
"--sort=name" | ||
- (format "--mtime=@%d" mtime) | ||
- (format "--mtime=@%d" time) | ||
+ "--mtime=@0" | ||
"--owner=0" "--group=0" "--numeric-owner" | ||
"--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) | ||
(when (and package-build-verbose noninteractive) | ||
@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source- | ||
(package-build--desc-from-library | ||
name version commit files 'tar) | ||
(error "%s[-pkg].el matching package name is missing" | ||
- name)))) | ||
- (mtime (package-build--get-commit-time rcp commit))) | ||
+ name))))) | ||
(package-build--copy-package-files files source-dir target) | ||
(package-build--write-pkg-file desc target) | ||
(package-build--generate-info-files files source-dir target) | ||
- (package-build--create-tar name version tmp-dir mtime) | ||
+ (package-build--create-tar name version tmp-dir) | ||
(package-build--write-pkg-readme name files source-dir) | ||
(package-build--write-archive-entry desc)) | ||
(delete-directory tmp-dir t nil)))) | ||
-- | ||
2.37.2 | ||
|