diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
commit | 5d904d63f4d43e3f0e4be38c5f5404e029c00a22 (patch) | |
tree | b2893eceae99c967e0f49cdbfe084f6c7d4767c4 /gnu/system/nss.scm | |
parent | bab5f3a7f62150ae009e78d03c4b1f5b1646104c (diff) | |
parent | d0ee11b2f000c3c027fd8370bc2195266398444f (diff) | |
download | patches-5d904d63f4d43e3f0e4be38c5f5404e029c00a22.tar patches-5d904d63f4d43e3f0e4be38c5f5404e029c00a22.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/nss.scm')
-rw-r--r-- | gnu/system/nss.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/system/nss.scm b/gnu/system/nss.scm index f4d2855289..673b96c713 100644 --- a/gnu/system/nss.scm +++ b/gnu/system/nss.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,6 +93,8 @@ ;;; (define %compat + ;; Note: Starting from version 2.26, libc no longer provides libnss_compat + ;; so this specification has become useless. (name-service (name "compat") (reaction (lookup-specification (not-found => return))))) @@ -124,7 +126,7 @@ (ethers name-service-switch-ethers (default '())) (group name-service-switch-group - (default (list %compat %files))) + (default (list %files))) (gshadow name-service-switch-gshadow (default '())) (hosts name-service-switch-hosts @@ -136,7 +138,7 @@ (networks name-service-switch-networks (default (list %files %dns))) (password name-service-switch-password - (default (list %compat %files))) + (default (list %files))) (public-key name-service-switch-public-key (default '())) (rpc name-service-switch-rpc @@ -144,7 +146,7 @@ (services name-service-switch-services (default '())) (shadow name-service-switch-shadow - (default (list %compat %files)))) + (default (list %files)))) (define %default-nss ;; Default NSS configuration. |