ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Don't compare <pam-service> objects with 'equal?'.

Browse source 
Fixes <http://bugs.gnu.org/20037>.
Reported by 宋文武 <iyzsong@gmail.com> and Tomáš Čech.

* gnu/system.scm (operating-system-etc-directory): Remove call to
  'delete-duplicates'.
* gnu/system/linux.scm (pam-services->directory)[builder]: Add call to
  'delete-duplicates'.
This commit is contained in:
Ludovic Courtès 2015-03-10 18:07:48 +01:00
parent b9156ccc08
commit 11dddd8a3e
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/system.scm
View file

@ -511,9 +511,8 @@ (define (operating-system-etc-directory os)
((services (operating-system-services os)) ((services (operating-system-services os))
(pam-services -> (pam-services ->
;; Services known to PAM. ;; Services known to PAM.
(delete-duplicates
(append (operating-system-pam-services os) (append (operating-system-pam-services os)
(append-map service-pam-services services)))) (append-map service-pam-services services)))
(profile-drv (operating-system-profile os)) (profile-drv (operating-system-profile os))
(skeletons (operating-system-skeletons os)) (skeletons (operating-system-skeletons os))
(/etc/hosts (or (operating-system-hosts-file os) (/etc/hosts (or (operating-system-hosts-file os)

10
gnu/system/linux.scm
View file

@ -100,13 +100,19 @@ (define (pam-services->directory services)
services)))) services))))
(define builder (define builder
#~(begin #~(begin
(use-modules (ice-9 match)) (use-modules (ice-9 match)
(srfi srfi-1))
(mkdir #$output) (mkdir #$output)
(for-each (match-lambda (for-each (match-lambda
((name file) ((name file)
(symlink file (string-append #$output "/" name)))) (symlink file (string-append #$output "/" name))))
'#$(zip names files))))
;; Since <pam-service> objects cannot be compared with
;; 'equal?' since they contain gexps, which contain
;; closures, use 'delete-duplicates' on the build-side
;; instead. See <http://bugs.gnu.org/20037>.
(delete-duplicates '#$(zip names files)))))
(gexp->derivation "pam.d" builder))) (gexp->derivation "pam.d" builder)))