* [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0.
@ 2024-10-16 20:35 Artyom V. Poptsov
2024-10-18 12:25 ` Ludovic Courtès
2024-10-19 15:26 ` bug#73841: " Artyom V. Poptsov
0 siblings, 2 replies; 3+ messages in thread
From: Artyom V. Poptsov @ 2024-10-16 20:35 UTC (permalink / raw)
To: 73841; +Cc: Artyom V. Poptsov
* gnu/packages/books.scm (book-sparc): Update to 2.2.0.
[inputs]: Add git, gnu-make, texlive-fancyvrb, and texlive-upquote.
[native-inputs]: Add autoconf and automake.
Change-Id: Icd19f295b8572428aea39f46c27e22f87d5dc7e1
---
gnu/packages/books.scm | 62 +++++++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm
index 5a6157d557..9f680b51e2 100644
--- a/gnu/packages/books.scm
+++ b/gnu/packages/books.scm
@@ -42,7 +42,7 @@ (define-module (gnu packages books)
(define-public book-sparc
(package
(name "book-sparc")
- (version "2.1.0")
+ (version "2.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -50,24 +50,14 @@ (define-public book-sparc
(commit (string-append "v" version))))
(sha256
(base32
- "1ns2vs5yb9z1hj9gq5y55qz7c9azzhr866b665s8fq50q5m4yhbc"))
+ "08aswb6cb02c0yqpkyj4vmfjvdjsffxqcqabivgv2gcgn8mhi4wm"))
(file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- (substitute* "version.tex.in"
- (("@COMMIT@") ""))
- (substitute* "Makefile"
- (("all: sparc.pdf") "all: install")
- (("^sparc.pdf:") "install:")
- (("(cp out/sparc.pdf) sparc.pdf" all cp)
- (string-append
- "mkdir -p $(DESTDIR)$(PREFIX)/share/doc/book-sparc"
- " && " cp
- " $(DESTDIR)$(PREFIX)/share/doc/book-sparc/sparc.pdf")))))))
+ (modules '((guix build utils)))))
(build-system gnu-build-system)
(native-inputs
- (list bash-minimal
+ (list autoconf
+ automake
+ bash-minimal
fontconfig
inkscape
lilypond
@@ -76,6 +66,8 @@ (define-public book-sparc
which))
(inputs
(list font-liberation
+ git
+ gnu-make
texlive-acronym
texlive-adjustbox
texlive-biblatex
@@ -85,6 +77,7 @@ (define-public book-sparc
texlive-chngcntr
texlive-circuitikz
texlive-collection-langcyrillic
+ texlive-fancyvrb
texlive-fontspec
texlive-glossaries
texlive-glossaries-english
@@ -101,16 +94,35 @@ (define-public book-sparc
texlive-textpos
texlive-transparent
texlive-trimspaces
+ texlive-upquote
texlive-xetex))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (delete 'check)
- (delete 'configure)
- (add-before 'build 'set-envs
- (lambda _
- (setenv "REPRODUCIBILITY" "yes")
- (setenv "PREFIX" #$output))))))
+ (arguments
+ (list #:tests? #f ; no tests
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'build 'configure-environment
+ (lambda* (#:key inputs make-flags parallel-build?
+ #:allow-other-keys)
+ (use-modules (ice-9 regex)
+ (srfi srfi-1))
+ (let* ((src (assoc-ref inputs "source"))
+ (rx (make-regexp "/gnu/store/(.*)-book-sparc-.*"))
+ (src-hash (match:substring (regexp-exec rx src) 1))
+ (random-seed
+ (fold (lambda (ch prev)
+ (+ (char->integer ch)
+ prev))
+ 0
+ (string->list src-hash))))
+ (setenv "RANDOMSEED" (number->string random-seed))
+ (setenv "REPRODUCIBILITY" "yes"))))
+ (replace 'install
+ (lambda _
+ (let ((doc-dir (string-append #$output
+ "/share/doc/sparc/")))
+ (mkdir-p doc-dir)
+ (copy-file "sparc.pdf"
+ (string-append doc-dir
+ "sparc.pdf"))))))))
(home-page "https://github.com/artyom-poptsov/SPARC")
(synopsis "Book on combining art and technology")
(description
base-commit: d95588242c605fbb72e25fe36a0903a1538e9018
--
2.46.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0.
2024-10-16 20:35 [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0 Artyom V. Poptsov
@ 2024-10-18 12:25 ` Ludovic Courtès
2024-10-19 15:26 ` bug#73841: " Artyom V. Poptsov
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2024-10-18 12:25 UTC (permalink / raw)
To: Artyom V. Poptsov; +Cc: 73841
Hi,
"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
> * gnu/packages/books.scm (book-sparc): Update to 2.2.0.
> [inputs]: Add git, gnu-make, texlive-fancyvrb, and texlive-upquote.
> [native-inputs]: Add autoconf and automake.
>
> Change-Id: Icd19f295b8572428aea39f46c27e22f87d5dc7e1
[...]
> (inputs
> (list font-liberation
> + git
> + gnu-make
I believe ‘gnu-make’ is unnecessary: it’s included by
‘gnu-build-system’.
> + #:phases #~(modify-phases %standard-phases
> + (add-before 'build 'configure-environment
> + (lambda* (#:key inputs make-flags parallel-build?
> + #:allow-other-keys)
> + (use-modules (ice-9 regex)
> + (srfi srfi-1))
Please avoid ‘use-modules’ in a non-top-level context: it’s not
guaranteed to work.
Instead, use #:modules.
> + (replace 'install
> + (lambda _
> + (let ((doc-dir (string-append #$output
> + "/share/doc/sparc/")))
> + (mkdir-p doc-dir)
> + (copy-file "sparc.pdf"
> + (string-append doc-dir
> + "sparc.pdf"))))))))
Shorter: (install-file "sparc.pdf" doc-dir).
Otherwise LGTM!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#73841: [PATCH] gnu: book-sparc: Update to 2.2.0.
2024-10-16 20:35 [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0 Artyom V. Poptsov
2024-10-18 12:25 ` Ludovic Courtès
@ 2024-10-19 15:26 ` Artyom V. Poptsov
1 sibling, 0 replies; 3+ messages in thread
From: Artyom V. Poptsov @ 2024-10-19 15:26 UTC (permalink / raw)
To: 73841-done
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
Pushed to "master" branch as 48097f511929053468ce6f09e0a24644c90fe670.
- avp
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-19 15:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-16 20:35 [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0 Artyom V. Poptsov
2024-10-18 12:25 ` Ludovic Courtès
2024-10-19 15:26 ` bug#73841: " Artyom V. Poptsov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).