;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; 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 <http://www.gnu.org/licenses/>. (define-module (gnu) #:use-module (guix i18n) #:use-module (guix diagnostics) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu services) #:export (use-package-modules use-service-modules use-system-modules)) ;;; Commentary: ;;; ;;; This composite module re-exports core parts the (gnu …) public modules. ;;; ;;; Code: (eval-when (eval load compile) (begin (define %public-modules '((gnu system) (gnu system mapped-devices) (gnu system file-systems) (gnu bootloader) (gnu bootloader grub) (gnu system keyboard) (gnu system pam) (gnu system shadow) ; 'user-account' (gnu system linux-initrd) (gnu system nss) (gnu services) (gnu services base) (gnu packages) (gnu packages base) (guix gexp))) ; so gexps can be used (for-each (let ((i (module-public-interface (current-module)))) (lambda (m) (module-use! i (resolve-interface m)))) %public-modules))) (define (%try-use-modules modules location make-hint) "Attempt to load all of MODULES. Report errors as coming from LOCATION, a <location> record, and use MAKE-HINT to produce a fix hint." (define (location->string loc) (match loc (#f "") (($ <location> file line column) (format #f "~a:~a:~a: " file line column)))) (for-each (lambda (module) (catch 'misc-error (lambda () (process-use-modules `((,module)))) (lambda _ (raise (apply make-compound-condition (formatted-message (G_ "module ~a not found") module) (condition (&error-location (location location))) (or (and=> (make-hint module) list) '())))))) modules)) (define (package-module-hint module) (define last-name (match module ((_ ... last) (symbol->string last)))) (match (find-packages-by-name last-name) (() (condition (&fix-hint (hint (G_ "\ You may use @command{guix package --show=foo | grep location} to search for the location of package @code{foo}. If you get the line @code{location: gnu/packages/bar.scm:174:2}, add @code{bar} to the @code{use-package-modules} form."))))) ((package _ ...) (condition (&fix-hint (hint (format #f (G_ "\ Try adding @code{(use-package-modules ~a)}.") (basename (location-file (package-location package)) ".scm")))))))) (define (service-module-hint module) (define last-name (match module ((_ ... last) last))) (match (lookup-service-types last-name) (() (condition (&fix-hint (hint (format #f (G_ "\ You may use @command{guix system search ~a} to search for a service matching @code{~a}. If you get the line @code{location: gnu/services/foo.scm:188:2}, add @code{foo} to the @code{use-service-modules} form.") last-name last-name))))) ((package _ ...) (condition (&fix-hint (hint (format #f (G_ "\ Try adding @code{(use-service-modules ~a)}.") (basename (location-file (service-type-location package)) ".scm")))))))) (define-syntax-rule (try-use-modules hint modules ...) (eval-when (expand load eval) (%try-use-modules '(modules ...) (source-properties->location (current-source-location)) hint))) (define-syntax-rule (use-package-modules module ...) (try-use-modules package-module-hint (gnu packages module) ...)) (define-syntax-rule (use-service-modules module ...) (try-use-modules service-module-hint (gnu services module) ...)) (define-syntax-rule (use-system-modules module ...) (try-use-modules (const #f) ;no hint (gnu system module) ...)) ;;; gnu.scm ends here td><a href='/guix/commit/tests/build-utils.scm?id=485ac28235bf8775914b905060266b09629c1bac'>utils: Allow text substitution even in the presence of NUL characters.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes <https://issues.guix.gnu.org/30116>. Before this change, the presence of a NUL character on a line meant that the (glibc) regexp engine used by Guile would either 1. stop scanning the string or 2. crash with the error "string contains #\\nul character", depending on the locale used. This change works around this limitation by first replacing the NUL character by an unused Unicode code point, doing the substitution, then reverting the replacement. * guix/build/utils.scm (unused-private-use-code-point) (replace-char): New procedures. (substitute): Make use of the above procedures to work around the NUL character regexp engine limitation. * tests/build-utils.scm: Add tests. Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> </span></span></td><td>Mark H Weaver</td></tr> <tr><td><span title='2020-11-16 11:21:42 +0100'>2020-11-16</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=977eb5d023cfdf8e336f1896480eea9cef5c04e9'>Properly deal with build directories containing '~'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes <https://bugs.gnu.org/44626>. Reported by Vagrant Cascadian <vagrant@debian.org>. * tests/build-utils.scm ("wrap-script, simple case"): Pass SCRIPT-CONTENTS to 'display' rather than 'format'. * gnu/services/base.scm (file-system->shepherd-service-name) [valid-characters, mount-point]: New variables. Filter out invalid store file name characters from the mount point of FILE-SYSTEM. </span></span></td><td>Ludovic Courtès</td></tr>