From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0PLIKMYjEGdmqgAAe85BDQ:P1 (envelope-from ) for ; Wed, 16 Oct 2024 20:36:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 0PLIKMYjEGdmqgAAe85BDQ (envelope-from ) for ; Wed, 16 Oct 2024 22:36:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AFpuUv4S; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=BMNZHk9a; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729110982; a=rsa-sha256; cv=none; b=imKCuFKWrTcX+Vdrj6tL/ewaXHuEvjXfNWJLXqyGYMkQ3FJknoZ+0ga6stZ5rVeqyb1lIS jGGoNVhrHLLd5QzB4KcFqXr2yxMlojyXiLXJqdFLTukdAzItNLpXzTFUBfNkjHe8qYf0ik 1WRW6pTDq1ygy4Ajq6JZdls16EkntuVrVJG2Z+ReKxZPKdZ5nWKICNp5pFkWlN97FTTIwk dMGwODsJ82F+u08coKPgQGF4YoTscFDsnNtvCzjzPDu27uogUf7xSyUiValvnJJY5K/ttB K/yrGoAz+htPlG5625wBCfnwL0cLoy/ywJ2bFLcYutY1bwXp5X356Ba2Uskguw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AFpuUv4S; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=BMNZHk9a; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729110982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=x9/56REt4z9xMtnMKf9z/b6Fo7eKdPYtqhyqvd5vNFE=; b=k+gh7/yz5wj1DYmfmifVzr9iFwQmFREDwhECr9u1KZZcu0clVfcwRAofQXoRWSKzg6Zeb2 0fQx8LKAcG8lifmqaMdqFJQ7TzHtYzoY5/9YHvkz+VZHztu0rXWBpYIlN8EHUDu8x5sByX mdvGyLmj44VvCsxipz9US8Ab9JNtdWcZfPohfq5X7sYP0GlR8bgMpcAmWzmAnSb9Vm2WFf 8pK+OLz2YoUwI2xE/TOYv5oT8Lh1nu55luUT+AiRXcQSuak5oF/5r6sp8sljjeLqMcqqey p6jUMkvTPlrb0ShwfYFA2y59OLH2GSHftZDjuhx1rG9XUw6vpeefYcc/NH4zAQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D8D5D74FAE for ; Wed, 16 Oct 2024 22:36:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1AkC-0002ea-UM; Wed, 16 Oct 2024 16:35:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1AkB-0002eP-2h for guix-patches@gnu.org; Wed, 16 Oct 2024 16:35:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t1AkA-00046o-QN for guix-patches@gnu.org; Wed, 16 Oct 2024 16:35:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=x9/56REt4z9xMtnMKf9z/b6Fo7eKdPYtqhyqvd5vNFE=; b=AFpuUv4SyDFAXMbklBWtCdiLwKNM5kSwD3iSE9FoXyQ3qJoTeVmc5caxyMgLJ2CP9NDxip0K+wDiUgURF68Xp7FZ23X3poVj/c6TUpedbGhFlSZ1UVJjVDsB/DEjDGUFhoXbYmhjmY3snlEuNP3WcxuqAtYl1MG5PFZ1NagEa98oqqLk4uhtT3lb5tpNpQEvSx/89aoG5/bKTusuY5duUdXpO78sYzDeUGpwi0N3CRSo2sigDasWdMfaheIrKVV15IP08l8gdk2HU3gBWqBUlJ9JUNBAi3XBGaCeKLOuxWCFfEokzzeINKKUA3l0RuDjS/cH6uUFkuLTXqvmthtp3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1AkU-0003yt-Mt for guix-patches@gnu.org; Wed, 16 Oct 2024 16:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73841] [PATCH] gnu: book-sparc: Update to 2.2.0. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Oct 2024 20:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73841 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73841@debbugs.gnu.org Cc: "Artyom V. Poptsov" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172911095615288 (code B ref -1); Wed, 16 Oct 2024 20:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2024 20:35:56 +0000 Received: from localhost ([127.0.0.1]:60642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1AkO-0003yW-E5 for submit@debbugs.gnu.org; Wed, 16 Oct 2024 16:35:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:36366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1AkL-0003yL-UL for submit@debbugs.gnu.org; Wed, 16 Oct 2024 16:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1Ak1-0002dP-Je for guix-patches@gnu.org; Wed, 16 Oct 2024 16:35:33 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t1Ajz-00045l-Ge for guix-patches@gnu.org; Wed, 16 Oct 2024 16:35:33 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-539e4824917so16913e87.3 for ; Wed, 16 Oct 2024 13:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729110929; x=1729715729; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x9/56REt4z9xMtnMKf9z/b6Fo7eKdPYtqhyqvd5vNFE=; b=BMNZHk9a/f2U+59EYxsWgkjxMXl+/EMd8Zt+SE1Sh3tjnKmdgX3R/mdMx2Ip/U78n7 Wyk+CmCYLRSJLoxsHFMj/CpDSM5W7Il6/VUK9KKKxVD7UH5FD2JRdzw9+ktpV6281hFk Qf6xDPkxskw5w7e0jvzJPEWgrt93yhryq1nqEYxlBcg8Z8VazPC09dO4BNio4j5rzfSY lsQx1hsONuEWRZAPhTrDTCyhfUze6Fy0MWjEeuzuBbZxUvZ0qX0Cty2OnlabwsTJvwPR 7R437uvRNeV8pmSsQ6L/o78S8+fMADutgF+85Ph+6+KXrOD83sPw5t0OCsNhalFBjxak bHww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729110929; x=1729715729; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x9/56REt4z9xMtnMKf9z/b6Fo7eKdPYtqhyqvd5vNFE=; b=XSnfAB5A97J2TMe+MBi74e7LnoXvQRJPZ0t0p/NLRGIE2rdRi44x/6khYUuZXtFj5A UL6WE4d6u+5e2vDdnsGP1BFaYNRLsuvf4DdQdXbEjxKuC8Es6/YtWy/h2rtFKLlxKov6 YnrnkURHbPNCvxklYHv/3YnuA1qDNgoCSoXe+bclxRQe9WT0K9KAQb6iCLG5G3fRudPV fjFeAyWBXWtDvOj/DZTiRN0jxR/hcaNN2fULw2wTXLb2ODDYdc4vu0K+wu2s5ODYWOgH 7RW7ZYNcWJrvUB8b3xt6WcqUR9qVdD5h1JHwy9FiRyYG14iXB5BqmUmzqjORRWoAhJpI DJhQ== X-Gm-Message-State: AOJu0Yw5xGvVSI/pmxjUcgms+YRZEtLQDLIlOxqaaBGOzgYy/IztXAVt tMms5kPVQgts4f47OTE12dlgglyG9B37KidRFdALUCKvMbYuQrHnDQIcpH0P X-Google-Smtp-Source: AGHT+IE43XsAfoG7tBN7+vrxHiLKQ+I7WjnVs+edhsFwFo/5dmhTIz3znLoAMN1eApCgAz+rHFNYmQ== X-Received: by 2002:a2e:a582:0:b0:2fb:57d4:3da1 with SMTP id 38308e7fff4ca-2fb651fd415mr6230441fa.11.1729110928502; Wed, 16 Oct 2024 13:35:28 -0700 (PDT) Received: from elephant.. ([95.79.12.162]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-539fffb1e91sm550194e87.98.2024.10.16.13.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 13:35:27 -0700 (PDT) From: "Artyom V. Poptsov" Date: Wed, 16 Oct 2024 23:35:23 +0300 Message-ID: <328a2d40fa5843b6e5d2dda1a2bfa78576e603e2.1729110923.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.41 X-Spam-Score: -0.41 X-Migadu-Queue-Id: D8D5D74FAE X-Migadu-Scanner: mx10.migadu.com X-TUID: MfAa7osVHmG5 * 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