[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/203: gnu: address@hidden: Don't use unstable tarball.
From: |
guix-commits |
Subject: |
64/203: gnu: address@hidden: Don't use unstable tarball. |
Date: |
Wed, 10 Apr 2019 14:57:20 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit d57748e3674b062e7ca13991c872f447c53838f0
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Mon Apr 8 23:12:45 2019 +0200
gnu: address@hidden: 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.
---
gnu/packages/dlang.scm | 70 ++++++++++++++++++++++++++------------------------
1 file changed, 37 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index c164ed8..645ab57 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015, 2018 Pjotr Prins <address@hidden>
;;; Copyright © 2017 Frederick Muriithi <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,15 +81,15 @@ and freshness without requiring additional information from
the user.")
(package
(name "ldc")
(version "0.17.4")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ldc-developers/ldc/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ldc-developers/ldc.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8"))))
(build-system cmake-build-system)
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
(properties
@@ -101,11 +101,15 @@ and freshness without requiring additional information
from the user.")
(modify-phases %standard-phases
(add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys)
- (let ((unpack (lambda (source target)
- (with-directory-excursion target
- (invoke "tar" "xvf"
- (assoc-ref inputs source)
- "--strip-components=1")))))
+ (let ((unpack (lambda (input target)
+ (let ((source (assoc-ref inputs input)))
+ ;; Git checkouts are directories as long as
+ ;; there are no patches; tarballs otherwise.
+ (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 "druntime-src" "runtime/druntime")
(unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
@@ -147,32 +151,32 @@ and freshness without requiring additional information
from the user.")
("unzip" ,unzip)
("phobos-src"
,(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ldc-developers/phobos/archive/ldc-v"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ldc-developers/phobos.git")
+ (commit (string-append "ldc-v" version))))
+ (file-name (git-file-name "phobos" version))
(sha256
- (base32
- "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz"))
+ (base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy"))
(patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
("druntime-src"
,(origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ldc-developers/druntime/archive/ldc-v"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ldc-developers/druntime.git")
+ (commit (string-append "ldc-v" version))))
+ (file-name (git-file-name "druntime" version))
(sha256
- (base32
- "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx"))))
+ (base32
"0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7"))))
("dmd-testsuite-src"
,(origin
- (method url-fetch)
- (uri (string-append
-
"https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ldc-developers/dmd-testsuite.git")
+ (commit (string-append "ldc-v" version))))
+ (file-name (git-file-name "dmd-testsuite" version))
(sha256
- (base32
- "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4"))))))
+ (base32
"05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl"))))))
(home-page "http://wiki.dlang.org/LDC")
(synopsis "LLVM-based compiler for the D programming language")
(description
- 132/203: gnu: emacs-pass: Don't use unstable tarball., (continued)
- 132/203: gnu: emacs-pass: Don't use unstable tarball., guix-commits, 2019/04/10
- 142/203: gnu: emacs-find-file-in-project: Use GIT-FILE-NAME., guix-commits, 2019/04/10
- 137/203: gnu: emacs-build-farm: Use GIT-FILE-NAME., guix-commits, 2019/04/10
- 82/203: gnu: emacs-linum-relative: Don't use unstable tarball., guix-commits, 2019/04/10
- 83/203: gnu: emacs-idle-highlight: Don't use unstable tarball., guix-commits, 2019/04/10
- 84/203: gnu: emacs-ox-twbs: Don't use unstable tarball., guix-commits, 2019/04/10
- 89/203: gnu: emacs-cdlatex: Don't use unstable tarball., guix-commits, 2019/04/10
- 93/203: gnu: emacs-pyim-basedict: Don't use unstable tarball., guix-commits, 2019/04/10
- 110/203: gnu: emacs-julia-mode: Use GIT-FILE-NAME., guix-commits, 2019/04/10
- 114/203: gnu: emacs-git-messenger: Don't use unstable tarball., guix-commits, 2019/04/10
- 64/203: gnu: address@hidden: Don't use unstable tarball.,
guix-commits <=
- 70/203: gnu: emacs-writeroom: Don't use unstable tarball., guix-commits, 2019/04/10
- 71/203: gnu: emacs-helm: Don't use unstable tarball., guix-commits, 2019/04/10
- 77/203: gnu: emacs-log4e: Don't use unstable tarball., guix-commits, 2019/04/10
- 80/203: gnu: emacs-mu4e-alert: Don't use unstable tarball., guix-commits, 2019/04/10
- 92/203: gnu: emacs-pos-tip: Don't use unstable tarball., guix-commits, 2019/04/10
- 94/203: gnu: emacs-el2org: Don't use unstable tarball., guix-commits, 2019/04/10
- 95/203: gnu: emacs-mustache: Don't use unstable tarball., guix-commits, 2019/04/10
- 97/203: gnu: emacs-org2web: Don't use unstable tarball., guix-commits, 2019/04/10
- 98/203: gnu: emacs-gnuplot: Don't use unstable tarball., guix-commits, 2019/04/10
- 99/203: gnu: emacs-evil-surround: Don't use unstable tarball., guix-commits, 2019/04/10