Subject: bug#59086: closed (Re: [bug#59086] [PATCH] gnu: teximpatient: Update to 2.4-0.e3666ab.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 07 Nov 2022 20:07:03 +0000

Your bug report

#59086: [PATCH] gnu: teximpatient: Update to 2.4-0.e3666ab.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
59086: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59086
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#59086] [PATCH] gnu: teximpatient: Update to 2.4-0.e3666ab.
From: Christopher Baines <[email-masked]>
To: [email-masked]
Cc: [email-masked], [email-masked]
Date: Mon, 07 Nov 2022 21:05:18 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

[email-masked] writes:

> From: Morgan Smith <[email-masked]>
>
> * gnu/packages/tex.scm (teximpatient): Update to 2.4-0.e3666ab
> [source]: Use git repository
> [native-inputs]: Add autoconf
> [arguments]: Make build reproducible
> ---
>  gnu/packages/tex.scm | 94 ++++++++++++++++++++++++++------------------
>  1 file changed, 56 insertions(+), 38 deletions(-)

I guess it's not ideal that there hasn't been release, but anyway,
thanks for taking the time to work on and update the package.

The changes seem reasonable to me, so I've pushed this to master as
2c1fc058c58c716575260170ff4f3cf9afbf24fb.

Thanks again,

Chris

Subject: [PATCH] gnu: teximpatient: Update to 2.4-0.e3666ab.
From: [email-masked]
To: [email-masked]
Cc: Morgan Smith <[email-masked]>
Date: Sun, 6 Nov 2022 21:15:24 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

From: Morgan Smith <[email-masked]>

* gnu/packages/tex.scm (teximpatient): Update to 2.4-0.e3666ab
[source]: Use git repository
[native-inputs]: Add autoconf
[arguments]: Make build reproducible
---
 gnu/packages/tex.scm | 94 ++++++++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7d41d16dd0..a44936ada9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8211,46 +8211,64 @@ (define-public texmaker
     (license license:gpl2+)))
 
 (define-public teximpatient
-  (package
-    (name "teximpatient")
-    (version "2.4")
-    (source (origin
-              (method url-fetch/tarbomb)
-              (uri (string-append "mirror://gnu/" name "/" name "-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0h56w22d99dh4fgld4ssik8ggnmhmrrbnrn1lnxi1zr0miphn1sd"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; there are none
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-packaging-error
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; This file should have been part of the tarball.
-             (install-file (car
-                            (find-files
-                             (assoc-ref inputs "automake")
-                             "^install-sh$"))
-                           ".")
-             ;; Remove generated file.
-             (delete-file "book.pdf")
-             #t)))))
-    (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                        texlive-palatino
-                                        texlive-zapfding
-                                        texlive-knuth-lib
-                                        texlive-mflogo-font
-                                        texlive-pdftex)))
-       ("automake" ,automake)))
-    (home-page "https://www.gnu.org/software/teximpatient/")
-    (synopsis "Book on TeX, plain TeX and Eplain")
-    (description "@i{TeX for the Impatient} is a ~350 page book on TeX,
+  ;; The homepage seems to be distributing this version which is currently the
+  ;; most recent commit
+  (let ((commit "e3666abff186832fd9c467ceda3958058f30bac2")
+        (revision "0"))
+    (package
+      (name "teximpatient")
+      (version (git-version "2.4" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url
+                       "https://git.savannah.gnu.org/git/teximpatient.git/")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0r30383nmly7w29il6v3vmilnnyrzak0x0qmabjvnpaga9ansjmi"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ;there are none
+         #:allowed-references ("out")
+         #:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'fix-build
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (chdir "teximpatient")
+
+                        ;; Remove generated files
+                        (for-each delete-file
+                                  '("book.pdf"
+                                    "book.aux"
+                                    "book.ccs"
+                                    "book.log"
+                                    "book.idx"
+                                    "config.log"
+                                    "config.status"
+                                    "configure"
+                                    "Makefile"))
+                        (delete-file-recursively "autom4te.cache")
+
+                        ;; make build reproducible
+                        (substitute* "eplain.tex"
+                          (("timestamp.*%")
+                           (string-append "timestamp{"
+                                          ,version "}"))))))))
+      (native-inputs (list autoconf automake
+                           (texlive-updmap.cfg (list texlive-amsfonts
+                                                     texlive-palatino
+                                                     texlive-zapfding
+                                                     texlive-knuth-lib
+                                                     texlive-mflogo-font
+                                                     texlive-pdftex))))
+      (home-page "https://www.gnu.org/software/teximpatient/")
+      (synopsis "Book on TeX, plain TeX and Eplain")
+      (description
+       "@i{TeX for the Impatient} is a ~350 page book on TeX,
 plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves,
 and Karl Berry.")
-    (license license:fdl1.3+)))
+      (license license:fdl1.3+))))
 
 (define-public lyx
   (package
-- 
2.38.0