[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/18: gnu: corkscrew: Clean up dead code.
From: |
Tobias Geerinckx-Rice |
Subject: |
08/18: gnu: corkscrew: Clean up dead code. |
Date: |
Fri, 22 Jun 2018 17:22:17 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 5b34f56c1d645455137a16d94177a67358060fe4
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Jun 22 21:49:05 2018 +0200
gnu: corkscrew: Clean up dead code.
* gnu/packages/ssh.scm (corkscrew)[arguments]: Remove unnecessary
variables and procedure calls.
---
gnu/packages/ssh.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index caa8c78..cd92c62 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -329,25 +329,21 @@ libssh library.")
"1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd"))))
(build-system gnu-build-system)
(arguments
- ;; Replace configure phase as the ./configure script does not link
- ;; CONFIG_SHELL and SHELL passed as parameters
`(#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key outputs inputs system build target
- #:allow-other-keys #:rest args)
- (let* ((configure (assoc-ref %standard-phases 'configure))
- (prefix (assoc-ref outputs "out"))
- (bash (which "bash"))
+ ;; Replace configure phase as the ./configure script does not like
+ ;; CONFIG_SHELL and SHELL passed as parameters
+ (lambda* (#:key outputs build target #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bash (which "bash"))
;; Set --build and --host flags as the provided
config.guess
;; is not able to detect them
- (flags `(,(string-append "--prefix=" prefix)
+ (flags `(,(string-append "--prefix=" out)
,(string-append "--build=" build)
,(string-append "--host=" (or target build)))))
(setenv "CONFIG_SHELL" bash)
- (apply invoke bash
- (string-append "." "/configure")
- flags))))
+ (apply invoke bash "./configure" flags))))
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- branch master updated (71d4ba5 -> 1829f7e), Tobias Geerinckx-Rice, 2018/06/22
- 01/18: gnu: lxc: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/22
- 02/18: gnu: git-crypt: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 03/18: gnu: qemu: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/22
- 05/18: gnu: guile-ssh: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 06/18: gnu: corkscrew: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 08/18: gnu: corkscrew: Clean up dead code.,
Tobias Geerinckx-Rice <=
- 07/18: gnu: corkscrew: Deduplicate documentation directories., Tobias Geerinckx-Rice, 2018/06/22
- 09/18: gnu: busybox: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 04/18: gnu: libtocc: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 10/18: gnu: libgit2: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/22
- 13/18: gnu: eid-mw: Don't use unstable tarball., Tobias Geerinckx-Rice, 2018/06/22
- 14/18: gnu: eid-mw: Fix build., Tobias Geerinckx-Rice, 2018/06/22
- 11/18: gnu: Use HTTPS for drobilla.net URIs., Tobias Geerinckx-Rice, 2018/06/22
- 15/18: gnu: eid-mw: Update to 4.4.3., Tobias Geerinckx-Rice, 2018/06/22
- 18/18: gnu: perl-cgi-simple: Update to 1.15., Tobias Geerinckx-Rice, 2018/06/22
- 12/18: gnu: Use more HTTPS., Tobias Geerinckx-Rice, 2018/06/22