gnu: emacs-mpdel: Update to 2.1.1.

* (emacs-mpdel): Update to 2.1.1. Change-Id: If9174f93fbf2ed9501ef39246d1637c00839fcc4 Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
gnu: emacs-libmpdel: Update to 2.1.0.
2025-10-01 18:05:17 +00:00 · 2025-09-29 20:02:26 +02:00 · 2025-09-29 20:02:26 +02:00 · 2025-09-29 20:02:25 +02:00
2 changed files with 74 additions and 66 deletions
--- a/gnu/packages/emacs-build.scm
+++ b/gnu/packages/emacs-build.scm
@ -524,64 +524,62 @@ Lisp.")
    (license license:expat)))

 (define-public makel
-  (let ((commit "2c831098c28a1f581b016532fa1f6e1c596b8ed1")
-        (revision "0"))
-    (package
-      (name "makel")
-      (version (git-version "0.8.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/DamienCassou/makel")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0lmfl27rqh1530j8g4z2k6y6mc25n54bjkqriqdkw3703kliyvry"))))
-      (build-system copy-build-system)
-      (arguments
-       (list
-        ;; Some tests are currently broken, see
-        ;; https://github.com/DamienCassou/makel/issues/6
-        #:tests? #f
-        #:modules
-        '((guix build copy-build-system)
-          (guix build utils)
-          (srfi srfi-1)
-          (srfi srfi-26)
-          (ice-9 ftw))
-         #:install-plan ''(("makel.mk" "include/")
-                           ("README.org" "share/docs/"))
-         #:phases
-         #~(modify-phases %standard-phases
-             (add-before 'install 'inject-deps
-               (lambda _
-                 (substitute* "makel.mk"
-                   (("^MAKEL_LOAD_PATH=(.*)$" all rest)
-                    (string-append
-                     "MAKEL_LOAD_PATH=-L "
-                     (string-join
-                      (filter-map
-                       (lambda (dir)
-                         (let ((path (scandir dir)))
-                           (and (eq? (length path) 3) ; removes emacs
-                                (string-append dir "/" (last path)))))
-                       (string-split (getenv "EMACSLOADPATH") #\:))
-                      " -L ")
-                     " " rest)))))
-             (add-before 'install 'check
-               (lambda* (#:key tests? #:allow-other-keys)
-                 (if tests?
-                     (with-directory-excursion "test"
-                       (invoke "bash" "run-tests.sh"))
-                     (format #f "Test suite not run.~%")))))))
-      (native-inputs (list bash-minimal emacs-minimal))
-      (inputs (list emacs-buttercup emacs-package-lint))
-      (home-page "https://github.com/DamienCassou/makel")
-      (synopsis "Makefile to help checking Emacs packages")
-      (description "This package provides a makefile to help checking Emacs
-packages.")
-      (license license:gpl3+))))
+  (package
+    (name "makel")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/DamienCassou/makel")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "143bdy4c81jbmp5sk1arnlmpc4dsw85n601x9rii2dgyn186l8si"))))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:modules
+      #~((guix build copy-build-system)
+         (guix build utils)
+         (srfi srfi-1)
+         (srfi srfi-26)
+         (ice-9 ftw))
+      #:install-plan
+      #~'(("makel.mk" "include/")
+          ("README.org" "share/docs/"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'inject-deps
+            (lambda _
+              (substitute* "makel.mk"
+                (("^MAKEL_LOAD_PATH=(.*)$" all rest)
+                 (string-append
+                  "MAKEL_LOAD_PATH=-L "
+                  (string-join
+                   (filter-map
+                    (lambda (dir)
+                      (let ((path (scandir dir)))
+                        (and (eq? (length path) 3) ; removes emacs
+                             (string-append dir "/" (last path)))))
+                    (string-split (getenv "EMACSLOADPATH") #\:))
+                   " -L ")
+                  " " rest)))))
+          (add-before 'install 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (if tests?
+                  (with-directory-excursion "test"
+                    (invoke "bash" "run-tests.sh"))
+                  (format #f "Test suite not run.~%")))))))
+    (native-inputs
+     (list bash-minimal emacs-minimal))
+    (inputs
+     (list emacs-buttercup emacs-package-lint))
+    (home-page "https://github.com/DamienCassou/makel")
+    (synopsis "Makefile to help checking Emacs packages")
+    (description
+     "This package provides a Makefile to help checking Emacs packages.")
+    (license license:gpl3+)))

 ;; This is an alternative version patches for internal Guix tests.
 ;; The user-facing version is in emacs-xyz.scm
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@ -34442,7 +34442,7 @@ from Emacs.")
 (define-public emacs-libmpdel
  (package
    (name "emacs-libmpdel")
-    (version "2.0.0")
+    (version "2.1.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@ -34451,10 +34451,20 @@ from Emacs.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4"))))
+                "1indy1y31g68i3a4j6nbx3idybn5b11bjvlx9vkibraf622s2bls"))))
    (build-system emacs-build-system)
+    (arguments
+     (list
+      ;; XXX: "check" includes "lint-package-lint", which raises errors.
+      #:test-command #~(list "make" "test")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'inject-makel
+            (lambda* (#:key inputs #:allow-other-keys)
+              (symlink (search-input-file inputs "/include/makel.mk")
+                       "makel.mk"))))))
    (native-inputs
-     (list emacs-ert-runner))
+     (list emacs-ert-runner makel))
    (home-page "https://github.com/mpdel/libmpdel")
    (synopsis "Emacs library to communicate with Music Player Daemon (MPD)")
    (description
@ -34466,7 +34476,7 @@ music.")
 (define-public emacs-mpdel
  (package
    (name "emacs-mpdel")
-    (version "2.1.0")
+    (version "2.1.1")
    (source
     (origin
       (method git-fetch)
@ -34476,19 +34486,19 @@ music.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900"))))
+         "1i7ymg0ls984vjmzjz0sbg280i47c6j79vr725x94xdpj6ci35qr"))))
    (build-system emacs-build-system)
    (arguments
     (list
-      ;; XXX: ‘check’ includes ‘lint-package-lint’, which raises errors.
-      #:test-command #~(list "make" "test" "lint-checkdoc")
+      ;; XXX: "check" includes "lint-package-lint", which raises errors.
+      #:test-command #~(list "make" "test")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'inject-makel
            (lambda* (#:key inputs #:allow-other-keys)
              (symlink (search-input-file inputs "/include/makel.mk")
                       "makel.mk"))))))
-    (inputs (list makel))
+    (native-inputs (list makel))
    (propagated-inputs
     (list emacs-libmpdel emacs-navigel))
    (home-page "https://gitea.petton.fr/mpdel/mpdel")