mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: d-tools: Update to 2.100.0.
* gnu/packages/dlang.scm (d-tools): Update to 2.100.0. [arguments]: Adjust accordingly. Reinstate a custom 'check phase. Install the rdmd man page. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
parent
30afa097a5
commit
f3c5074373
1 changed files with 18 additions and 7 deletions
|
@ -3,7 +3,7 @@
|
||||||
;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl>
|
;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||||
;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
|
;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
|
||||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017, 2019, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||||
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
|
@ -53,7 +53,7 @@ (define-module (gnu packages dlang)
|
||||||
(define-public d-tools
|
(define-public d-tools
|
||||||
(package
|
(package
|
||||||
(name "d-tools")
|
(name "d-tools")
|
||||||
(version "2.077.1")
|
(version "2.100.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -62,22 +62,33 @@ (define-public d-tools
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0wqqw7h1bwpdfrr9vgqkwzh47aqkd6imac1d6nn8gjlqzdcblqdr"))))
|
(base32 "1jbn0hyskv4ykcckw0iganpyrm0bq2lggswspw21r4hgnxkmjbyw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:phases
|
(list #:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(delete 'configure)
|
(delete 'configure)
|
||||||
(delete 'check) ; There is no Makefile, so there's no 'make check'.
|
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
|
(mkdir-p "bin")
|
||||||
(setenv "CC" #$(cc-for-target))
|
(setenv "CC" #$(cc-for-target))
|
||||||
(setenv "LD" #$(ld-for-target))
|
(setenv "LD" #$(ld-for-target))
|
||||||
(invoke "ldc2" "rdmd.d")))
|
(invoke "ldc2" "rdmd.d" "--of" "bin/rdmd")
|
||||||
|
(apply invoke "ldc2" "--of=bin/dustmite"
|
||||||
|
(find-files "DustMite" ".*\\.d"))))
|
||||||
|
(replace 'check
|
||||||
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
|
(when tests?
|
||||||
|
(invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd"
|
||||||
|
"--rdmd-default-compiler" "ldmd2"))))
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(install-file "rdmd" bin)))))))
|
(bin (string-append out "/bin"))
|
||||||
|
(man (string-append out "/man")))
|
||||||
|
(for-each delete-file (find-files "bin" "\\.o$"))
|
||||||
|
(copy-recursively "bin" bin)
|
||||||
|
(copy-recursively "man" man)))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list ldc
|
(list ldc
|
||||||
(module-ref (resolve-interface
|
(module-ref (resolve-interface
|
||||||
|
|
Loading…
Reference in a new issue