me
/
guix
Archived
1
0
Fork 0
Code

gnu: openssh: Use modify-phases syntax. 

* gnu/packages/ssh.scm (openssh)[arguments]: Use modify-phases syntax.
master
Ricardo Wurmus 2015-11-27 10:57:03 +01:00
parent 70b002aa1d
commit a9ee11d5ab
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/ssh.scm
View File

@ -129,26 +129,25 @@ a server that supports the SSH-2 protocol.")
(arguments (arguments
`(#:test-target "tests" `(#:test-target "tests"
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'configure 'reset-/var/empty (add-after 'configure 'reset-/var/empty
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "Makefile" (substitute* "Makefile"
(("PRIVSEP_PATH=/var/empty") (("PRIVSEP_PATH=/var/empty")
(string-append "PRIVSEP_PATH=" out "/var/empty"))))) (string-append "PRIVSEP_PATH=" out "/var/empty")))
(alist-cons-before #t)))
'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
;; remove 't-exec' regress target which requires user 'sshd' ;; remove 't-exec' regress target which requires user 'sshd'
(substitute* "regress/Makefile" (substitute* "regress/Makefile"
(("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post) (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post)
(string-append pre post)))) (string-append pre post)))
(alist-replace #t))
'install (replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
;; install without host keys and system configuration files ;; install without host keys and system configuration files
(zero? (apply system* "make" "install-nosysconf" make-flags))) (zero? (apply system* "make" "install-nosysconf" make-flags)))))))
%standard-phases)))))
(synopsis "Client and server for the secure shell (ssh) protocol") (synopsis "Client and server for the secure shell (ssh) protocol")
(description (description
"The SSH2 protocol implemented in OpenSSH is standardised by the "The SSH2 protocol implemented in OpenSSH is standardised by the