civodul pushed a commit to branch master
in repository guix.
commit 7355634db3ccf0d86f8e34c4aea37392c1a0ab0a
Author: Ludovic Courtès <[email protected]>
Date: Mon Jan 2 14:45:15 2017 +0100
gnu: Disambiguate packages with the same name.
* gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): Add
'name' field.
* gnu/packages/llvm.scm (llvm-for-extempore): Likewise.
---
gnu/packages/algebra.scm | 4 +++-
gnu/packages/llvm.scm | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 8e3327e..892b6cf 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <[email protected]>
-;;; Copyright © 2013, 2015 Ludovic Courtès <[email protected]>
+;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <[email protected]>
;;; Copyright © 2016 Nicolas Goaziou <[email protected]>
;;; Copyright © 2014 Mark H Weaver <[email protected]>
;;; Copyright © 2016 Ricardo Wurmus <[email protected]>
@@ -581,6 +581,7 @@ cosine/ sine transforms or DCT/DST).")
;; "--enable-flags" is added to the fftw and fftwf packages.
(define-public fftw-with-threads
(package (inherit fftw)
+ (name "fftw-pthreads")
(arguments
(substitute-keyword-arguments (package-arguments fftw)
((#:configure-flags flags)
@@ -588,6 +589,7 @@ cosine/ sine transforms or DCT/DST).")
(define-public fftwf-with-threads
(package (inherit fftwf)
+ (name "fftwf-pthreads")
(arguments
(substitute-keyword-arguments (package-arguments fftwf)
((#:configure-flags flags)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index c425108..04a2b39 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016 Eric Bavier <[email protected]>
;;; Copyright © 2015 Mark H Weaver <[email protected]>
-;;; Copyright © 2015 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2017 Ludovic Courtès <[email protected]>
;;; Copyright © 2016 Dennis Mungai <[email protected]>
;;; Copyright © 2016 Ricardo Wurmus <[email protected]>
;;;
@@ -283,6 +283,7 @@ code analysis tools.")
(define-public llvm-for-extempore
(package (inherit llvm-3.7)
+ (name "llvm-for-extempore")
(source
(origin
(inherit (package-source llvm-3.7))
