[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
52/66: gnu: openssh: Use invoke.
From: |
Mark H. Weaver |
Subject: |
52/66: gnu: openssh: Use invoke. |
Date: |
Fri, 23 Mar 2018 04:46:47 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 27b6adb715c0ac54888f451032736475f69ed12a
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 23 03:30:00 2018 -0400
gnu: openssh: Use invoke.
* gnu/packages/ssh.scm (openssh)[arguments]: Use invoke and remove vestigial
plumbing in the custom install phase.
---
gnu/packages/ssh.scm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 050ef05..79aff94 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -184,17 +184,16 @@ a server that supports the SSH-2 protocol.")
(replace 'install
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
;; install without host keys and system configuration files
- (and (zero? (apply system* "make" "install-nosysconf" make-flags))
- (begin
- (install-file "contrib/ssh-copy-id"
- (string-append (assoc-ref outputs "out")
- "/bin/"))
- (chmod (string-append (assoc-ref outputs "out")
- "/bin/ssh-copy-id") #o555)
- (install-file "contrib/ssh-copy-id.1"
- (string-append (assoc-ref outputs "out")
- "/share/man/man1/"))
- #t)))))))
+ (apply invoke "make" "install-nosysconf" make-flags)
+ (install-file "contrib/ssh-copy-id"
+ (string-append (assoc-ref outputs "out")
+ "/bin/"))
+ (chmod (string-append (assoc-ref outputs "out")
+ "/bin/ssh-copy-id") #o555)
+ (install-file "contrib/ssh-copy-id.1"
+ (string-append (assoc-ref outputs "out")
+ "/share/man/man1/"))
+ #t)))))
(synopsis "Client and server for the secure shell (ssh) protocol")
(description
"The SSH2 protocol implemented in OpenSSH is standardised by the
- 42/66: gnu: mesa-headers: Return #t from all phases., (continued)
- 42/66: gnu: mesa-headers: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 32/66: gnu: imake: Use invoke., Mark H. Weaver, 2018/03/23
- 44/66: gnu: mozjs: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 40/66: gnu: man-db: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 41/66: gnu: mariadb: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 39/66: gnu: lua5.1-socket: Use invoke., Mark H. Weaver, 2018/03/23
- 46/66: gnu: address@hidden: Use invoke., Mark H. Weaver, 2018/03/23
- 54/66: gnu: postgresql: Use invoke., Mark H. Weaver, 2018/03/23
- 50/66: gnu: nss-certs: Use invoke., Mark H. Weaver, 2018/03/23
- 53/66: gnu: pciutils: Use invoke., Mark H. Weaver, 2018/03/23
- 52/66: gnu: openssh: Use invoke.,
Mark H. Weaver <=
- 35/66: gnu: libsoup: Use invoke., Mark H. Weaver, 2018/03/23
- 25/66: gnu: address@hidden: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 38/66: gnu: lua5.1-expat: Use invoke., Mark H. Weaver, 2018/03/23
- 37/66: gnu: lua: Use invoke., Mark H. Weaver, 2018/03/23
- 24/66: gnu: address@hidden: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 43/66: gnu: mesa-utils: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 45/66: gnu: address@hidden: Use invoke., Mark H. Weaver, 2018/03/23
- 47/66: gnu: mysql: Return #t from all phases., Mark H. Weaver, 2018/03/23
- 49/66: gnu: nss: Use invoke., Mark H. Weaver, 2018/03/23
- 51/66: gnu: le-certs: Use invoke., Mark H. Weaver, 2018/03/23