[bug#42093] [PATCH 0/2] gnu: emacs-nov-el: Update to 0.3.1.

[bug#42093] [PATCH 0/2] gnu: emacs-nov-el: Update to 0.3.1.

[Simon South]

These two patches together update emacs-nov-el, an Emacs major mode for
reading EPUB documents, to version 0.3.1.

The first patch undoes changes made in commits f0dab65 and 3d84967 to use a
commit identifier in place of a version tag, as the upstream repository has
now restored these tags.

The second patch updates the package to version 0.3.1.

--
Simon South
simon@simonsouth.net


Simon South (2):
  gnu: emacs-nov-el: Use version tag instead of commit.
  gnu: emacs-nov-el: Update to 0.3.1.

 gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

-- 
2.26.2

[bug#42093] [PATCH 1/2] gnu: emacs-nov-el: Use version tag instead of commit.

[Simon South]

* gnu/packages/emacs-xyz.scm (emacs-nov-el): Remove let binding and associated
comment; correct indentation.
[source]: Use version tag as commit identifier now that upstream has restored
this information.
---
 gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8b03ce347c..c83a7f5d95 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12550,39 +12550,36 @@ the format.")
     (license license:gpl3+)))
 
 (define-public emacs-nov-el
-  ;; Upstream does not tag releases.  Specify raw commit hash matching the
-  ;; release.
-  (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596"))
-    (package
-      (name "emacs-nov-el")
-      (version "0.3.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://depp.brause.cc/nov.el.git")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz"))))
-      (build-system emacs-build-system)
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'embed-path-to-unzip
-             (lambda _
-               (substitute* "nov.el"
-                 (("\\(executable-find \"unzip\"\\)")
-                  (string-append "\"" (which "unzip") "\"")))
-               #t)))))
-      (propagated-inputs
-       `(("emacs-dash" ,emacs-dash)
-         ("emacs-esxml" ,emacs-esxml)))
-      (inputs
-       `(("unzip" ,unzip)))
-      (home-page "https://depp.brause.cc/nov.el/")
-      (synopsis "Major mode for reading EPUBs in Emacs")
-      (description "@code{nov.el} provides a major mode for reading EPUB
+  (package
+    (name "emacs-nov-el")
+    (version "0.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://depp.brause.cc/nov.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'embed-path-to-unzip
+           (lambda _
+             (substitute* "nov.el"
+               (("\\(executable-find \"unzip\"\\)")
+                (string-append "\"" (which "unzip") "\"")))
+             #t)))))
+    (propagated-inputs
+     `(("emacs-dash" ,emacs-dash)
+       ("emacs-esxml" ,emacs-esxml)))
+    (inputs
+     `(("unzip" ,unzip)))
+    (home-page "https://depp.brause.cc/nov.el/")
+    (synopsis "Major mode for reading EPUBs in Emacs")
+    (description "@code{nov.el} provides a major mode for reading EPUB
 documents.
 
 Features:
@@ -12599,7 +12596,7 @@ Features:
 @item Image rescaling
 @end itemize
 ")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public epipe
   (package
-- 
2.26.2

[bug#42093] [PATCH 2/2] gnu: emacs-nov-el: Update to 0.3.1.

[Simon South]

* gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.3.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c83a7f5d95..c92d77e95e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12552,7 +12552,7 @@ the format.")
 (define-public emacs-nov-el
   (package
     (name "emacs-nov-el")
-    (version "0.3.0")
+    (version "0.3.1")
     (source
      (origin
        (method git-fetch)
@@ -12561,7 +12561,7 @@ the format.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz"))))
+        (base32 "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
-- 
2.26.2

bug#42093: [PATCH 0/2] gnu: emacs-nov-el: Update to 0.3.1.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]

On Sat, Jun 27, 2020 at 04:08:52PM -0400, Simon South wrote:
> These two patches together update emacs-nov-el, an Emacs major mode for
> reading EPUB documents, to version 0.3.1.
> 
> The first patch undoes changes made in commits f0dab65 and 3d84967 to use a
> commit identifier in place of a version tag, as the upstream repository has
> now restored these tags.
> 
> The second patch updates the package to version 0.3.1.
> 
> --
> Simon South
> simon@simonsouth.net
> 
> 
> Simon South (2):
>   gnu: emacs-nov-el: Use version tag instead of commit.
>   gnu: emacs-nov-el: Update to 0.3.1.
> 
>  gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++--------------------
>  1 file changed, 31 insertions(+), 34 deletions(-)
> 
> -- 
> 2.26.2
> 

Both patches look good. Patches pushed!


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]