[bug#58638] [PATCH core-updates 0/2] build/gnu: Support compressing non-numeric man sections.

[bug#58638] [PATCH core-updates 0/2] build/gnu: Support compressing non-numeric man sections.

[Lilah Tascheter via Guix-patches via]

The regex currently used by compress-documentation to compress manpages only
supports numeric man sections, which sometimes isn't the case (eg
man-pages-posix section 0p). Guix compiles with this change, but I haven't been
able to actually test packages with it due to these patches rebuilding
everything.

I'm not sure if something similar should be done for the infopage regex? I'm not
familiar with it.

Lilah Tascheter (2):
  build/gnu: Support compressing non-numeric man sections.
  gnu: man-pages-posix: Remove redundant manpage compression.

 gnu/packages/man.scm            | 8 ++++----
 guix/build/gnu-build-system.scm | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


base-commit: 511d584906c6304a3dc6ffcf7096bb14c6bee222
-- 
2.37.3

[bug#58638] [PATCH core-updates 1/2] build/gnu: Support compressing non-numeric man sections.

[Lilah Tascheter via Guix-patches via]

* guix/build/gnu-build-system.scm (compress-documentation)
  [maybe-compress]: Expand regex to include man sections with alphabetic
  suffixes.
---
 guix/build/gnu-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index d84411c090..8f2997b4da 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -675,7 +675,7 @@ (define* (compress-documentation #:key outputs
 
   (define (maybe-compress output)
     (maybe-compress-directory (string-append output "/share/man")
-                              "\\.[0-9]+$")
+                              "\\.[0-9]+[:alpha:]*$")
     (maybe-compress-directory (string-append output "/share/info")
                               "\\.info(-[0-9]+)?$"))
 
-- 
2.37.3

[bug#58638] [PATCH core-updates 2/2] gnu: man-pages-posix: Remove redundant manpage compression.

[Lilah Tascheter via Guix-patches via]

* gnu/packages/man.scm (man-pages-posix)[arguments]: Don't run build
  phase.
---
 gnu/packages/man.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 9a3297fcaf..b56262d832 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -315,11 +315,11 @@ (define-public man-pages-posix
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f
-       ;; The compress-documentation phase doesn't pick up on our manpages as
-       ;; its regex doesn't support trailing letters, so manually compress.
-       #:make-flags ,#~(list (string-append "prefix=" #$output) "gz")
+       #:make-flags ,#~(list (string-append "prefix=" #$output))
        #:license-file-regexp "POSIX-COPYRIGHT"
-       #:phases (modify-phases %standard-phases (delete 'configure))))
+       ;; The build phase only compresses documentation, which we already do.
+       #:phases (modify-phases %standard-phases (delete 'configure)
+                                                (delete 'build))))
     (home-page "https://www.kernel.org/doc/man-pages/")
     (synopsis "Man pages from the POSIX.1-2013 standard")
     (description
-- 
2.37.3

bug#58638: [PATCH core-updates 2/2] gnu: man-pages-posix: Remove redundant manpage compression.

[Maxim Cournoyer]

Hi,

Lilah Tascheter <lilah@lunabee.space> writes:

> * gnu/packages/man.scm (man-pages-posix)[arguments]: Don't run build
>   phase.

Applied this series, thanks!

-- 
Thanks,
Maxim