aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-11-11 16:18:24 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-11-11 16:19:59 +0100
commit89c7894805329023754512c9b30e67ceb1753cb0 (patch)
tree505cb95f51c0e90cc09ac2bb4a912a182943feb6
parent37a350eccee7b36cba779c6a6841448b8deaed72 (diff)
downloadguix-89c7894805329023754512c9b30e67ceb1753cb0.tar
guix-89c7894805329023754512c9b30e67ceb1753cb0.tar.gz
gnu: faust-2: Update to 2.5.23.
* gnu/packages/audio.scm (faust-2): Update to 2.5.23. [native-inputs]: Replace llvm-with-rtti with llvm-3.8-with-rtti. * gnu/packages/llvm.scm (llvm-with-rtti): Rename this variable... (llvm-3.8-with-rtti): ...to this variable; inherit from llvm-3.8.
-rw-r--r--gnu/packages/audio.scm18
-rw-r--r--gnu/packages/llvm.scm23
2 files changed, 19 insertions, 22 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e5b8f9ed79..91f55a3544 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1176,19 +1176,15 @@ PS, and DAB+.")
(define-public faust-2
(package
(inherit faust)
- (version "2.1.0")
+ (version "2.5.23")
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/grame-cncm/faust.git")
- (commit (string-append "v"
- (string-map (lambda (c)
- (if (char=? c #\.) #\- c))
- version)))))
- (file-name (string-append "faust-" version "-checkout"))
+ (method url-fetch)
+ (uri (string-append "https://github.com/grame-cncm/faust/"
+ "releases/download/" version
+ "/faust-" version ".tar.gz"))
(sha256
(base32
- "06km0ygwxxwgw1lqldccqidxhmjfz8ck0wnbd95qk5sg8sbpc068"))))
+ "1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments faust)
@@ -1196,7 +1192,7 @@ PS, and DAB+.")
`(list (string-append "prefix=" (assoc-ref %outputs "out"))
"world"))))
(native-inputs
- `(("llvm" ,llvm-with-rtti)
+ `(("llvm" ,llvm-3.8-with-rtti)
("which" ,which)
("xxd" ,xxd)
("ctags" ,emacs-minimal) ; for ctags
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index d0791d00cc..a809180e29 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -90,17 +90,6 @@ languages is in development. The compiler infrastructure includes mirror sets
of programming tools as well as libraries with equivalent functionality.")
(license license:ncsa)))
-(define-public llvm-with-rtti
- (package (inherit llvm)
- (name "llvm-with-rtti")
- (arguments
- (substitute-keyword-arguments (package-arguments llvm)
- ((#:configure-flags flags)
- `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
- "-DLLVM_REQUIRES_RTTI=1")
- ,flags))))))
-
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package
@@ -290,6 +279,18 @@ code analysis tools.")
(base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))))
+;; This is for Faust 2
+(define-public llvm-3.8-with-rtti
+ (package (inherit llvm-3.8)
+ (name "llvm-with-rtti")
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm)
+ ((#:configure-flags flags)
+ `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
+ "-DLLVM_REQUIRES_RTTI=1")
+ ,flags))))))
+
(define-public clang-runtime-3.8
(clang-runtime-from-llvm
llvm-3.8