mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: ldc@0.17.4: Don't use unstable tarball.
* gnu/packages/dlang.scm (ldc-bootstrap)[source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Likewise. [arguments]: Adjust ‘unpack-submodule-sources’ phase accordingly.
This commit is contained in:
parent
bde24d5e40
commit
d57748e367
1 changed files with 37 additions and 33 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 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -81,15 +81,15 @@ (define-public ldc-bootstrap
|
||||||
(package
|
(package
|
||||||
(name "ldc")
|
(name "ldc")
|
||||||
(version "0.17.4")
|
(version "0.17.4")
|
||||||
(source (origin
|
(source
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (string-append
|
(method git-fetch)
|
||||||
"https://github.com/ldc-developers/ldc/archive/v"
|
(uri (git-reference
|
||||||
version ".tar.gz"))
|
(url "https://github.com/ldc-developers/ldc.git")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(commit (string-append "v" version))))
|
||||||
(sha256
|
(file-name (git-file-name name version))
|
||||||
(base32
|
(sha256
|
||||||
"1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8"))))
|
(base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
|
||||||
(properties
|
(properties
|
||||||
|
@ -101,11 +101,15 @@ (define-public ldc-bootstrap
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'unpack-submodule-sources
|
(add-after 'unpack 'unpack-submodule-sources
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((unpack (lambda (source target)
|
(let ((unpack (lambda (input target)
|
||||||
(with-directory-excursion target
|
(let ((source (assoc-ref inputs input)))
|
||||||
(invoke "tar" "xvf"
|
;; Git checkouts are directories as long as
|
||||||
(assoc-ref inputs source)
|
;; there are no patches; tarballs otherwise.
|
||||||
"--strip-components=1")))))
|
(if (file-is-directory? source)
|
||||||
|
(copy-recursively source target)
|
||||||
|
(with-directory-excursion target
|
||||||
|
(invoke "tar" "xvf" source
|
||||||
|
"--strip-components=1")))))))
|
||||||
(unpack "phobos-src" "runtime/phobos")
|
(unpack "phobos-src" "runtime/phobos")
|
||||||
(unpack "druntime-src" "runtime/druntime")
|
(unpack "druntime-src" "runtime/druntime")
|
||||||
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
|
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
|
||||||
|
@ -147,32 +151,32 @@ (define-public ldc-bootstrap
|
||||||
("unzip" ,unzip)
|
("unzip" ,unzip)
|
||||||
("phobos-src"
|
("phobos-src"
|
||||||
,(origin
|
,(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append
|
(uri (git-reference
|
||||||
"https://github.com/ldc-developers/phobos/archive/ldc-v"
|
(url "https://github.com/ldc-developers/phobos.git")
|
||||||
version ".tar.gz"))
|
(commit (string-append "ldc-v" version))))
|
||||||
|
(file-name (git-file-name "phobos" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy"))
|
||||||
"16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz"))
|
|
||||||
(patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
|
(patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
|
||||||
("druntime-src"
|
("druntime-src"
|
||||||
,(origin
|
,(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append
|
(uri (git-reference
|
||||||
"https://github.com/ldc-developers/druntime/archive/ldc-v"
|
(url "https://github.com/ldc-developers/druntime.git")
|
||||||
version ".tar.gz"))
|
(commit (string-append "ldc-v" version))))
|
||||||
|
(file-name (git-file-name "druntime" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7"))))
|
||||||
"0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx"))))
|
|
||||||
("dmd-testsuite-src"
|
("dmd-testsuite-src"
|
||||||
,(origin
|
,(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append
|
(uri (git-reference
|
||||||
"https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
|
(url "https://github.com/ldc-developers/dmd-testsuite.git")
|
||||||
version ".tar.gz"))
|
(commit (string-append "ldc-v" version))))
|
||||||
|
(file-name (git-file-name "dmd-testsuite" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl"))))))
|
||||||
"0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4"))))))
|
|
||||||
(home-page "http://wiki.dlang.org/LDC")
|
(home-page "http://wiki.dlang.org/LDC")
|
||||||
(synopsis "LLVM-based compiler for the D programming language")
|
(synopsis "LLVM-based compiler for the D programming language")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in a new issue