From af77b20e9ace6810b8dde35d613c3a026569ccab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 19 Oct 2025 11:25:31 +0100 Subject: [PATCH] gnu: Merge (gnu packages fsf) into (gnu packages books). * gnu/packages/fsf.scm (book-faif): Move from here ... * gnu/packages/books.scm: ... to here. * gnu/packages/fsf.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister file. * po/packages/POTFILES.in: Likewise. Change-Id: Ia84ac242f0cda711a23e969e32049e93007a1f8b --- gnu/local.mk | 1 - gnu/packages/books.scm | 51 ++++++++++++++++++++++++++++- gnu/packages/fsf.scm | 72 ----------------------------------------- po/packages/POTFILES.in | 1 - 4 files changed, 50 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/fsf.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2ee6311ee63..a1b653b961a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -298,7 +298,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/fortran-xyz.scm \ %D%/packages/freedesktop.scm \ %D%/packages/freeipmi.scm \ - %D%/packages/fsf.scm \ %D%/packages/ftp.scm \ %D%/packages/fribidi.scm \ %D%/packages/fvwm.scm \ diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm index ada2cfe0603..1c6fba8a462 100644 --- a/gnu/packages/books.scm +++ b/gnu/packages/books.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2023, 2024, 2025 Artyom V. Poptsov ;;; Copyright © 2023 Adam Faiz +;;; Copyright © 2023 宋文武 +;;; Copyright © 2023-2025 Artyom V. Poptsov ;;; Copyright © 2025 Gabriel Santos ;;; ;;; This file is part of GNU Guix. @@ -21,6 +22,7 @@ (define-module (gnu packages books) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix gexp) @@ -55,6 +57,53 @@ #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) +(define-public book-faif + (package + (name "book-faif") + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.fsf.org/faif/faif-" version + ".tar.bz2")) + (sha256 + (base32 + "0qf14d0n6k1dn9z0fdnx9qkhn4iq685xd443w7l7w54bm931p7dw")))) + (build-system copy-build-system) + (native-inputs + (list (texlive-local-tree + (list texlive-caption + texlive-endnotes + texlive-etoolbox + texlive-fncychap + texlive-helvetic + texlive-times + texlive-ucs)))) + (arguments + (list + #:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'writable-texmfvar + ;; Generating font shapes require a writable TEXMFVAR directory. + (lambda _ (setenv "TEXMFVAR" "/tmp"))) + (add-before 'install 'build + (lambda _ + (invoke "pdflatex" "faif-2.0.tex")))))) + (home-page "https://www.fsf.org/faif") + (synopsis "Free as in Freedom (2.0)") + (description + "In 2002, Sam Williams wrote Free as in Freedom, a biography of Richard +M. Stallman. In its epilogue, Williams expressed hope that choosing to +distribute his book under the GNU Free Documentation License would enable and +encourage others to share corrections and their own perspectives through +modifications to his work. Free as in Freedom (2.0) is Stallman's revision of +the original biography. While preserving Williams's viewpoint, it includes +factual corrections and extensive new commentary by Stallman, as well as new +prefaces by both authors written for the occasion. It is a rare kind of +biography, where the reader has the benefit of both the biographer's original +words and the subject's response.") + (license license:fdl1.3+))) + (define-public book-sparc (package (name "book-sparc") diff --git a/gnu/packages/fsf.scm b/gnu/packages/fsf.scm deleted file mode 100644 index 33181e59275..00000000000 --- a/gnu/packages/fsf.scm +++ /dev/null @@ -1,72 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2023 宋文武 -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages fsf) - #:use-module (gnu packages tex) - #:use-module (guix build-system copy) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public book-faif - (package - (name "book-faif") - (version "2.0") - (source (origin - (method url-fetch) - (uri (string-append "https://www.fsf.org/faif/faif-" version - ".tar.bz2")) - (sha256 - (base32 - "0qf14d0n6k1dn9z0fdnx9qkhn4iq685xd443w7l7w54bm931p7dw")))) - (build-system copy-build-system) - (native-inputs - (list (texlive-local-tree - (list texlive-caption - texlive-endnotes - texlive-etoolbox - texlive-fncychap - texlive-helvetic - texlive-times - texlive-ucs)))) - (arguments - (list - #:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'writable-texmfvar - ;; Generating font shapes require a writable TEXMFVAR directory. - (lambda _ (setenv "TEXMFVAR" "/tmp"))) - (add-before 'install 'build - (lambda _ - (invoke "pdflatex" "faif-2.0.tex")))))) - (home-page "https://www.fsf.org/faif") - (synopsis "Free as in Freedom (2.0)") - (description - "In 2002, Sam Williams wrote Free as in Freedom, a biography of Richard -M. Stallman. In its epilogue, Williams expressed hope that choosing to -distribute his book under the GNU Free Documentation License would enable and -encourage others to share corrections and their own perspectives through -modifications to his work. Free as in Freedom (2.0) is Stallman's revision of -the original biography. While preserving Williams's viewpoint, it includes -factual corrections and extensive new commentary by Stallman, as well as new -prefaces by both authors written for the occasion. It is a rare kind of -biography, where the reader has the benefit of both the biographer's original -words and the subject's response.") - (license license:fdl1.3+))) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index a472c95746d..b48ee805c63 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -163,7 +163,6 @@ gnu/packages/fortran-xyz.scm gnu/packages/freedesktop.scm gnu/packages/freeipmi.scm gnu/packages/fribidi.scm -gnu/packages/fsf.scm gnu/packages/ftp.scm gnu/packages/fvwm.scm gnu/packages/gambas.scm