Unverified Commit 6e5f9e8b authored by Lin Jian's avatar Lin Jian
Browse files

emacs: bump package-build used by melpaBuild 

This bump causes a few build failures because
package--description-file cannot correctly parse some package names.
We report that to upstream Emacs as bug#77143.  Refer to that bug for
more information.  A dirty patch is vendored in elpa2nix.el to fix
those build failures.

This bump also fixes magit-p4 build failure[1].

[1]: https://hydra.nix-community.org/build/4516070
parent ad83cdf1

pkgs/applications/editors/emacs/build-support/elpa2nix.el

+10 −0
Original line number Diff line number Diff line 
(require 'package)

(package-initialize)



;; TODO remove this patch when Emacs bug#77143 is fixed

;; see that bug for more info

(defun package--description-file (dir)

  "Return package description file name for package DIR."

  (concat (let ((subdir (file-name-nondirectory

                         (directory-file-name dir))))

            (if (string-match "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\|snapshot\\)[0-9]+\\)*\\)\\'" subdir)

                (match-string 1 subdir) subdir))

          "-pkg.el"))



(defun elpa2nix-install-package ()

  (if (not noninteractive)

      (error "`elpa2nix-install-package' is to be used only with -batch"))

pkgs/applications/editors/emacs/build-support/melpa.nix

+6 −3
Original line number Diff line number Diff line
@@ -24,11 +24,14 @@ let 
    src = fetchFromGitHub {

      owner = "melpa";

      repo = "package-build";

      rev = "d5661f1f1996a893fbcbacb4d290c57acab4fb0e";

      hash = "sha256-zVhFR2kLLkCKC+esPBbIk3qOa033YND1HF9GiNI4JM8=";

      rev = "d1722503145facf96631ac118ec0213a73082b76";

      hash = "sha256-utsZLm9IF9UkTwxFWvJmwA3Ox4tlMeNNTo+f/CqYJGA=";

    };



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

    prePatch = ''

      substituteInPlace package-build.el \

        --replace-fail '(format "--mtime=@%d" time)' '"--mtime=@0"'

    '';



    dontConfigure = true;

    dontBuild = true;

pkgs/applications/editors/emacs/build-support/melpa2nix.el

+3 −5
Original line number Diff line number Diff line
@@ -12,11 +12,9 @@ 
  (let* ((default-directory (package-recipe--working-tree rcp)))

    (unwind-protect

        (let ((files (package-build-expand-files-spec rcp t)))

          (unless files

            (error "Unable to find files matching recipe patterns"))

          (if (> (length files) 1)

              (package-build--build-multi-file-package rcp files)

            (package-build--build-single-file-package rcp files))))))

          (if files

              (funcall package-build-build-function rcp files)

            (error "Unable to find files matching recipe patterns"))))))



(defun melpa2nix-build-package ()

  (unless noninteractive

pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff --git a/package-build.el b/package-build.el

index 29cdb61..c19be1b 100644

--- a/package-build.el

+++ b/package-build.el

@@ -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" 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)