From 210bbf9a391612a4e28883a288168d9a23fe66b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Sep 2024 11:18:03 +0200 Subject: man-db: Correctly resolve man page links. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Fixes a bug introduced in 822455580273ea8b3c1059922e2b41a395103164 whereby a link such as “.so man1/bzdiff.1” would resolve to the file that contains the link (in this case ‘bzcmp.1.zst’), as opposed to the actual link target. As a result, ‘man-page->entry’ would recurse, reopening the man page that contains the link until file descriptor exhaustion. * guix/man-db.scm (mandb-entries): In second argument to ‘man-page->entry’, return either FILE-GZ or FILE-ZST, but not FILE. Change-Id: I06a7a6905a98524efc889a18e81352bf9eec5743 --- guix/man-db.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/man-db.scm b/guix/man-db.scm index 9cb07493ba..bba90ed473 100644 --- a/guix/man-db.scm +++ b/guix/man-db.scm @@ -223,7 +223,6 @@ for it." ".gz")) (file-zst (string-append directory "/" link ".zst"))) - (and (or (file-exists? file-gz) - (file-exists? file-zst) file) - file))))) + (or (and (file-exists? file-gz) file-gz) + (and (file-exists? file-zst) file-zst)))))) (man-files directory))) -- cgit v1.2.3 guix/log/gnu/packages/boost.scm'>
AgeCommit message (Expand)Author
2019-02-23gnu: Add boost-signals2....* gnu/packages/boost.scm (boost-signals2): New variable. Ricardo Wurmus
2019-01-09Merge remote-tracking branch 'origin/master' into stagingEfraim Flashner
2019-01-07gnu: Remove unnecessary build-side module imports....* gnu/packages/batik.scm, gnu/packages/boost.scm, gnu/packages/calendar.scm, gnu/packages/gl.scm, gnu/packages/lua.scm, gnu/packages/qt.scm, gnu/packages/simulation.scm, gnu/packages/terminals.scm: Remove unnecessary import of (guix build utils). * gnu/packages/emacs.scm: Remove unnecessary imports of (guix ...). * gnu/packages/libcanberra.scm: Use (srfi srfi-1) instead of (guix build utils) for 'alist-delete'. * gnu/packages/wxwidgets.scm: Likewise. Ludovic Courtès
2018-12-12gnu: boost: Update to 1.69.0....* gnu/packages/boost.scm (boost): Update to 1.69.0. [source](uri): Add mirror. Marius Bakke
2018-12-12gnu: Remove special Boost C++14 variant....This is no longer needed since commit a7ff66998f6e0eeb5da485bab7f6e0b55a46651e. * gnu/packages/boost.scm (boost-cxx11): Remove variable. * gnu/packages/audio.scm (supercollider)[inputs]: Change BOOST-CXX11 to BOOST. * gnu/packages/compression.scm (innoextract)[inputs]: Likewise. * gnu/packages/mpd.scm (ncmpcpp)[inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Likewise. Marius Bakke
2018-12-09Merge branch 'master' into stagingMarius Bakke
2018-12-07gnu: Add a C++14 variant of Boost for packages that need it....Fixes <https://bugs.gnu.org/33605> and <https://bugs.gnu.org/33610>. * gnu/packages/boost.scm (boost-cxx14): New variable. * gnu/packages/compression.scm (innoextract)[inputs]: Use it. * gnu/packages/mpd.scm (ncmpcpp)[inputs]: Use it. Leo Famulari
2018-12-05gnu: Boost: Build with C++14....Some parts of Boost which are used by other Guix packages require C++14 support. Fixes <https://bugs.gnu.org/33605>. * gnu/packages/boost.scm (boost)[arguments]: Pass 'cxxflags=-std=c++14' to #:make-flags. Leo Famulari
2018-11-25gnu: mdds: Update to 1.4.3....* gnu/packages/boost.scm (mdds): Update to 1.4.3. Marius Bakke
2018-10-17gnu: boost-for-mysql: Remove unnecessary phase....* gnu/packages/boost.scm (boost-for-mysql)[arguments]: Remove custom 'provide-libboost_python phase. Add removed '/bin/sh' substitution. Efraim Flashner
2018-08-25Merge branch 'staging' into core-updatesMarius Bakke
2018-08-24gnu: boost: Move 1.59.0 definition to boost.scm....Fixes a regression introduced in commit 7cbf06d8c2935abfc6c688cf3f9b99e0e5393960 where the top-level code of these two modules would depend on each other, leading to "boost: unbound variable" kind of errors in some circumstances. * gnu/packages/databases.scm (boost-for-mysql): Move to... * gnu/packages/boost.scm (boost-for-mysql): ... here. Make public and add 'properties' field. Ludovic Courtès
2018-08-23gnu: boost: Update to 1.68.0....* gnu/packages/boost.scm (boost): Update to 1.68.0. [arguments]: Remove /bin/sh substitution. Marius Bakke
2018-08-23gnu: boost: Provide libboost_python compatibility symlink....* gnu/packages/boost.scm (boost)[arguments]: Add phase 'provide-libboost_python'. Marius Bakke