futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system/dub: Don't explicitly return #t from phases.

Browse Source 
* guix/build/dub-build-system.scm (configure, build, check, install):
Remove trailing #t.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
( 2022-06-24 18:56:28 +01:00 committed by Tobias Geerinckx-Rice
parent d039f9dc15
commit c539a13050
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/build/dub-build-system.scm
View File

@ -67,8 +67,7 @@
(symlink (string-append path "/lib/dub/" d-basename) (symlink (string-append path "/lib/dub/" d-basename)
(string-append vendor-dir "/" d-basename)))))))) (string-append vendor-dir "/" d-basename))))))))
inputs) inputs)
(invoke "dub" "add-path" vendor-dir) (invoke "dub" "add-path" vendor-dir)))
#t))
(define (grep string file-name) (define (grep string file-name)
"Find the first occurrence of STRING in the file named FILE-NAME. "Find the first occurrence of STRING in the file named FILE-NAME.
@ -95,16 +94,14 @@
(apply invoke `("dub" "build" ,@dub-build-flags)) (apply invoke `("dub" "build" ,@dub-build-flags))
(substitute* ".dub/dub.json" (substitute* ".dub/dub.json"
(("\"lastUpgrade\": \"[^\"]*\"") (("\"lastUpgrade\": \"[^\"]*\"")
"\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))) "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))))
#t)
(define* (check #:key tests? #:allow-other-keys) (define* (check #:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "dub" "test") (invoke "dub" "test")
(substitute* ".dub/dub.json" (substitute* ".dub/dub.json"
(("\"lastUpgrade\": \"[^\"]*\"") (("\"lastUpgrade\": \"[^\"]*\"")
"\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))) "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))))
#t)
(define* (install #:key inputs outputs #:allow-other-keys) (define* (install #:key inputs outputs #:allow-other-keys)
"Install a given DUB package." "Install a given DUB package."
@ -115,8 +112,7 @@
;; TODO remove "-test-application" ;; TODO remove "-test-application"
(copy-recursively "bin" outbin) (copy-recursively "bin" outbin)
(mkdir-p outlib) (mkdir-p outlib)
(copy-recursively "." (string-append outlib)) (copy-recursively "." (string-append outlib))))
#t))
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases