;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès ;;; ;;; 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 system keyboard) #:use-module (guix gexp) #:use-module ((gnu packages xorg) #:select (xkeyboard-config console-setup)) #:use-module (srfi srfi-9 gnu) #:use-module (ice-9 match) #:export (keyboard-layout? keyboard-layout keyboard-layout-name keyboard-layout-variant keyboard-layout-model keyboard-layout-options keyboard-layout->console-keymap)) ;;; Commentary: ;;; ;;; This module provides a data structure to represent keyboard layouts ;;; according to the XKB naming and classification (see the 'xkeyboard-config' ;;; package). ;;; ;;; Code: (define-immutable-record-type (%keyboard-layout name variant model options) keyboard-layout? (name keyboard-layout-name) ;string (variant keyboard-layout-variant) ;#f | string (model keyboard-layout-model) ;#f | string (options keyboard-layout-options)) ;list of strings (define* (keyboard-layout name #:optional variant #:key model (options '())) "Return a new keyboard layout with the given NAME and VARIANT. NAME must be a string such as \"fr\"; VARIANT must be a string such as \"bepo\" or \"nodeadkeys\". See the 'xkeyboard-config' package for valid options." (%keyboard-layout name variant model options)) (define* (keyboard-layout->console-keymap layout #:key (xkeyboard-config xkeyboard-config)) "Return a Linux console keymap file for LAYOUT, a record. Layout information is taken from the XKEYBOARD-CONFIG package." (define build (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) (ice-9 popen) (ice-9 match)) (define pipe (open-pipe* OPEN_READ #+(file-append console-setup "/bin/ckbcomp") (string-append "-I" #+(file-append xkeyboard-config "/share/X11/xkb")) "-rules" "base" #$@(match (keyboard-layout-model layout) (#f '()) (model `("-model" ,model))) #$(keyboard-layout-name layout) #$(or (keyboard-layout-variant layout) "") #$(string-join (keyboard-layout-options layout) ","))) (call-with-output-file #$output (lambda (output) (dump-port pipe output))) ;; Note: ckbcomp errors out when the layout name is unknown, but ;; merely emits a warning when the variant is unknown. (unless (zero? (close-pipe pipe)) (error "failed to create console keymap for keyboard layout" #$(keyboard-layout-name layout)))))) (computed-file (string-append "console-keymap." (keyboard-layout-name layout)) build)) s on the Hurd, doing sudo ./pre-inst-env guix-daemon --disable-chroot --build-users-group=guixbuild & ./pre-inst-env guix build hello * nix/libutil/util.cc (killUser)[__GNU__]: Avoid kill -1 bug; kill only current process and ignore SIGKILL status in parent. Co-authored-by: Jan Nieuwenhuizen <janneke@gnu.org> Manolis Ragkousis 2020-01-12daemon: Account for deleted store files when deduplication is on....Previously, a store item that is a regular file would not be accounted for in the 'bytesFreed' value computed by 'deletePath' because its 'st_nlink' count would always be >= 2. This commit fixes that. * nix/libutil/util.hh (deletePath): Add optional 'linkThreshold' argument. * nix/libutil/util.cc (_deletePath): Add 'linkThreshold' argument and honor it. Pass it down in recursive call. (deletePath): Add 'linkThreshold' and honor it. * nix/libstore/gc.cc (LocalStore::deleteGarbage): Pass 'linkThreshold' argument to 'deletePath', with a value of 2 when PATH is a store item and deduplication is on. Ludovic Courtès 2019-11-29daemon: 'pathExists' uses 'statx' when available....* nix/libutil/util.cc (pathExists) [HAVE_STATX]: New code. Ludovic Courtès 2019-11-27daemon: 'deletePath' uses 'statx' when available....* nix/libutil/util.cc (_deletePath) [HAVE_STATX]: Use 'statx'. Ludovic Courtès 2019-08-30daemon: Don't reply on 'st_blocks'....Ported by Ludovic Courtès <ludo@gnu.org> from <https://github.com/NixOS/nix/commit/a2c4fcd5e9782dc8d2998773380c7171ee53b813>. * nix/libstore/gc.cc (LocalStore::removeUnusedLinks): Use 'st.st_size' instead of 'st.st_blocks * 512'. * nix/libutil/util.cc (_deletePath): Likewise. Eelco Dolstra