Mereg

14 files changed, 1556 insertions, 113 deletions

diff --git a/gn/packages/afnumpy.scm b/gn/packages/afnumpy.scm
new file mode 100644
index 0000000..55c05ad
--- /dev/null
+++ b/gn/packages/afnumpy.scm
@@ -0,0 +1,84 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages afnumpy)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages attr)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages statistics)
+  #:use-module (gnu packages texlive)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages zip)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system trivial))
+
+(define-public afnumpy
+(let ((commit "c5594c1"))
+(package
+    (name "afnumpy")
+    (version (string-append "rel1-" commit))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/FilipeMaia/afnumpy.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0n30xn8cz0ww7czb3m6dz5sh87khan7ag3vb192narmxj37l8qy7"))))
+    (build-system python-build-system)
+    ;; (native-inputs
+    ;; `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     `(#:python ,python-2
+       #:tests? #f)) 
+    (home-page "https://github.com/FilipeMaia/afnumpy")
+    (synopsis "Numerical library array processing of numbers, strings, records and objects")
+    (description
+     "A GPGPU-accelerated drop-in of python's numpy")
+    (license license:gpl2)))) 
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 5869a88..21c1895 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -18,12 +18,16 @@
 
 (define-module (gn packages arrayfire)
   #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-  #:use-module (guix licenses)
+  #:use-module (gnu packages)
+  #:use-module (guix utils)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages cmake)
@@ -31,155 +35,189 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages image)
   #:use-module (gnu packages video)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages textutils)
   ;; #:use-module (gnu packages fftw)
   ;; #:use-module (gnu packages fftw-openmpi) - in algebra
   ;; #:use-module (gnu packages fftwf)
   #:use-module (gnu packages gl)
-  #:use-module (gnu packages glew)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages mesa)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages wget)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
-  (package
+(package
     (name "arrayfire")
-    (version "v3.3.alpha")
+    (version "3.3.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version 
-                                  ".tar.gz"))
+              (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version 
+                                  ".tar.bz2"))
+              (file-name (string-append name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
-    (build-system cmake-build-system)
-    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
-    (native-inputs
-      `(("autoconf" ,autoconf)
+                "045adww6dqmyz6kkfmq7xawi5v9a894yp5j9pzn6j568gi48pyqc"))))
+    (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
-        ("cmake" ,cmake)
-        ("doxygen" ,doxygen)
         ("gawk" ,gawk)
-        ("gettext" ,gnu-gettext)
-        ("icedtea7" ,icedtea7) 
+        ("git" ,git)
+        ("glew" ,glew)
         ("libtool" ,libtool)
-        ("pkg-config" ,pkg-config)
-        ("swig" ,swig)
-        ("which" ,which)
-        ("yasm" ,yasm)))
-    (inputs
-     `(("boost" ,boost)
-       ("bzip2" ,bzip2)
+        ("pkg-config" ,pkg-config)))
+    (inputs `(("boost" ,boost)
        ("glfw" ,glfw)
        ("curl" ,curl)
+       ("atlas" ,atlas)
        ("dbus" ,dbus)
+       ("opencl-headers" ,opencl-headers)
+       ("ocl-icd" ,ocl-icd)
        ("enca" ,enca)
        ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
+       ("glib" ,glib)
+       ("lapack" ,lapack)
+       ("scalapack" ,scalapack)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
        ("libyajl" ,libyajl)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
-       ("mysql" ,mysql)
-       ("openssl" ,openssl)
-       ("pcre" ,pcre)
        ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
        ("freeimage" ,freeimage)
+       ("freeglut" ,freeglut)
        ("fftw" ,fftw)
        ("fftwf" ,fftwf)
        ("fftw-openmpi" ,fftw-openmpi)
-       ("atlas" ,atlas)
-       ("gfortran", gfortran)
        ("glew" ,glew)
        ("glu" ,glu)
-       ("libx11" ,libx11)
-       ("libxi" ,libxi)
-       ("libxrandr" ,libxrandr)
-       ("libxxf86vm" ,libxxf86vm)
-       ("inputproto" ,inputproto)
-       ("glproto" ,glproto)
-       ("zlib" ,zlib)))
+       ("openblas" ,openblas)
+       ("wget" ,wget)
+       ("cmake" ,cmake)))
+    (build-system cmake-build-system)
+    (arguments 
+     `(#:configure-flags '("-DBUILD_OPENCL=OFF" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") 
+       #:tests? #f))     
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.")
     (home-page "http://arrayfire.com/")
-    (license gpl3+)))
+    (license (list license:gpl2 
+                   license:gpl2+ 
+                   license:gpl3 
+                   license:gpl3+))))
 
 (define-public glfw
   (package
     (name "glfw")
-    (version "3.0.4")
+    (version "3.1.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/glfw/glfw/archive/"
-                                 version ".zip"))
-             (file-name (string-append name "-" version ".zip"))
+                                 version ".tar.gz"))
              (sha256
               (base32
-               "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
-    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-    (native-inputs
-      `(("autoconf" ,autoconf)
+               "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
+    (build-system cmake-build-system)
+    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") 
+                 #:tests? #f))
+    (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
         ("cmake" ,cmake)
+        ("git" ,git)
         ("libtool" ,libtool)
+        ("libpthread-stubs" ,libpthread-stubs)
         ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("bzip2" ,bzip2)
-       ("curl" ,curl)
+    (inputs `(("curl" ,curl)
        ("dbus" ,dbus)
        ("enca" ,enca)
        ("eudev" ,eudev)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("fribidi" ,fribidi)
        ("glew" ,glew)
-       ("gnutls" ,gnutls)
-       ("gperf" ,gperf)
        ("libcap" ,libcap)
-       ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
-       ("libssh" ,libssh)
        ("libtiff" ,libtiff)
-       ("libxml2" ,libxml2)
-       ("libxmu" ,libxmu)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
-       ("lzo" ,lzo)
        ("mesa-utils" ,mesa-utils)
-       ("mysql" ,mysql)
-       ("openssl" ,openssl)
-       ("python" ,python-2)
-       ("tinyxml" ,tinyxml)
-       ("unzip" ,unzip)
-       ("zip" ,zip)
-       ("zlib" ,zlib)))
+       ("randrproto" ,randrproto)
+       ("libxrandr" ,libxrandr)
+       ("xineramaproto" ,xineramaproto)
+       ("libxinerama" ,libxinerama)
+       ("libxcursor" ,libxcursor)
+       ("python" ,python-2)))       
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
-    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events. It is easy to integrate into existing applications and does not lay claim to the main loop.
-GLFW is written in C and has native support for Windows, OS X and many Unix-like systems using the X Window System, such as Linux and FreeBSD.
-GLFW is licensed under the zlib/libpng license.")
-    (license license:gpl2+)))
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (license (list license:gpl2))))
+    
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license (list license:gpl2 license:ruby))))
+    
+(define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license (list license:gpl2)))))
+
diff --git a/gn/packages/beignet.scm b/gn/packages/beignet.scm
new file mode 100644
index 0000000..a9e7a75
--- /dev/null
+++ b/gn/packages/beignet.scm
@@ -0,0 +1,158 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages beignet)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages libedit)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages zip)  
+  #:use-module (gnu packages linux))
+
+(define-public beignet
+  (package
+   (name "beignet")
+   (version "1.1.1")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://01.org/sites/default/files/beignet-"
+                                 version "-source.tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "068i5srqpncfw0kklxdyzxcm5w56pi91jp7pkv6cglzvnjgcdx4v"))))
+    (inputs `(("autoconf" ,autoconf)
+             ("llvm" ,llvm-3.5)
+             ("libpthread-stubs", libpthread-stubs)
+             ("clang" ,clang-3.5)
+             ("libdrm" ,libdrm)
+             ("libtool" ,libtool)
+             ("libsm" ,libsm)
+             ("libxfixes" ,libxfixes)
+             ("libxext" ,libxext)
+             ("libedit" ,libedit)
+             ("xextproto" ,xextproto)
+             ("python" ,python-2)
+             ("opencl-headers" ,opencl-headers)
+             ("glu" ,glu)
+             ("zlib" ,zlib)
+             ("pkg-config" ,pkg-config)
+             ("freeglut" ,freeglut)
+             ("mesa-utils" ,mesa-utils)
+             ("ncurses" ,ncurses)
+             ("ocl-icd" ,ocl-icd)))                                              
+    (build-system cmake-build-system)
+    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DCOMPILER=CLANG") #:tests? #f))   
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "Intel's OpenCL framework")
+    (description "Intel's OpenCL framework that works with Intel IvyBridge GPUs and above")
+    (license license:gpl2)))
+        
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license license:gpl2)))
+    
+(define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license license:gpl2))))
+    
+    
diff --git a/gn/packages/clBLAS.scm b/gn/packages/clBLAS.scm
new file mode 100644
index 0000000..561ee2b
--- /dev/null
+++ b/gn/packages/clBLAS.scm
@@ -0,0 +1,186 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages clBLAS)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages zip)  
+  #:use-module (gnu packages linux))
+
+(define-public clBLAS
+  (package
+    (name "clBLAS")
+    (version "v2.10")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/clMathLibraries/clBLAS/archive/"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j"))))
+    (build-system cmake-build-system)    
+    (arguments `(#:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f))
+    (native-inputs `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("cmake" ,cmake)
+        ("gfortran" ,gfortran)
+        ("libtool" ,libtool)
+        ("pkg-config" ,pkg-config)))
+    (inputs `(("curl" ,curl)
+       ("dbus" ,dbus)
+       ("enca" ,enca)
+       ("eudev" ,eudev)
+       ("fftw-openmpi" ,fftw-openmpi)
+       ("glew" ,glew)
+       ("googletest" ,googletest)
+       ("libcap" ,libcap)
+       ("libjpeg" ,libjpeg)
+       ("libltdl" ,libltdl)
+       ("libtiff" ,libtiff)
+       ("mesa-utils" ,mesa-utils)
+       ("openmpi" ,openmpi)
+       ("ocl-icd" ,ocl-icd)
+       ("openblas" ,openblas)
+       ("opencl-headers" ,opencl-headers)
+       ("randrproto" ,randrproto)
+       ("libxrandr" ,libxrandr)
+       ("xineramaproto" ,xineramaproto)
+       ("libxinerama" ,libxinerama)
+       ("libxcursor" ,libxcursor)
+       ("python" ,python-2)))       
+    (home-page "http://www.glfw.org/")
+    (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (license (list license:gpl2))))
+    
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license (list license:gpl2 license:ruby))))
+    
+(define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license (list license:gpl2)))))
+    
+(define-public googletest
+  (package
+    (name "googletest")
+    (version "1.7.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/google/googletest/archive/release-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp"))))
+    (build-system cmake-build-system)
+    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=RelWithDebInfo") #:tests? #f))    
+    (inputs `(("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("libtool" ,libtool)
+       ("cmake" ,cmake)
+       ("python" ,python-2)
+       ("pkg-config" ,pkg-config)))       
+    (home-page "https://github.com/google/googletest")
+    (synopsis "Google's C++ test framework")
+    (description "Google's C++ test framework")
+    (license (list license:gpl2))))
diff --git a/gn/packages/clFFT.scm b/gn/packages/clFFT.scm
new file mode 100644
index 0000000..3e72357
--- /dev/null
+++ b/gn/packages/clFFT.scm
@@ -0,0 +1,158 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages clFFT)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages zip)  
+  #:use-module (gnu packages linux))
+
+(define-public clFFT
+  (package
+    (name "clFFT")
+    (version "v2.10.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/clMathLibraries/clFFT/archive/"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "19hrk1lf06kch8x9dpbdj0waycn2mldrmj2y4vzi7zn2gdfw6g73"))))
+    (build-system cmake-build-system)    
+    (arguments `(#:configure-flags '("../clFFT-2.10.1/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f))
+    (native-inputs `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("cmake" ,cmake)
+        ("libtool" ,libtool)
+        ("pkg-config" ,pkg-config)))
+    (inputs `(("curl" ,curl)
+       ("dbus" ,dbus)
+       ("enca" ,enca)
+       ("eudev" ,eudev)
+       ("fftw-openmpi" ,fftw-openmpi)
+       ("glew" ,glew)
+       ("libcap" ,libcap)
+       ("libjpeg" ,libjpeg)
+       ("libltdl" ,libltdl)
+       ("libtiff" ,libtiff)
+       ("mesa-utils" ,mesa-utils)
+       ("openmpi" ,openmpi)
+       ("ocl-icd" ,ocl-icd)
+       ("opencl-headers" ,opencl-headers)
+       ("randrproto" ,randrproto)
+       ("libxrandr" ,libxrandr)
+       ("xineramaproto" ,xineramaproto)
+       ("libxinerama" ,libxinerama)
+       ("libxcursor" ,libxcursor)
+       ("python" ,python-2)))       
+    (home-page "http://www.glfw.org/")
+    (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (license (list license:gpl2))))
+    
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license (list license:gpl2 license:ruby))))
+    
+(define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license (list license:gpl2)))))
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 033bf94..aec305b 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -141,20 +141,20 @@
     (license license:agpl3+))))
 
 (define-public genenetwork2
-  (let ((commit "9e9475053"))
+  (let ((commit "8c9de7e5a2016f1e5b7397be1a8e84396e3a25c5"))
   (package
     (name "genenetwork2")
-    (version (string-append "2.0-" commit ))
+    (version (string-append "2.0-" (string-take commit 7) ))
     (source (origin
              (method git-fetch)
              (uri (git-reference
                    ;; (url "https://github.com/genenetwork/genenetwork2.git")
                    (url "https://github.com/pjotrp/genenetwork2.git")
                    (commit commit)))
-             (file-name (string-append name "-" commit)) 
+             (file-name (string-append name "-" (string-take commit 7))) 
              (sha256
               (base32
-               "09hvy9mf4dnmkb8qg49viffzrxk53m2kr4r955m84dxaa5pdrjhd"))))
+               "1kgigzs4rs6zgbqbnm40rcljzz9prlwv7n2n9an57jk58bjgf6v8"))))
     (propagated-inputs `(  ;; propagated for development purposes
               ("python" ,python-2) ;; probably superfluous
               ("r" ,r)
diff --git a/gn/packages/glfw.scm b/gn/packages/glfw.scm
new file mode 100644
index 0000000..30342f0
--- /dev/null
+++ b/gn/packages/glfw.scm
@@ -0,0 +1,83 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages glfw)
+  #:use-module ((guix licenses))
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)  
+  #:use-module (gnu packages linux))
+
+(define-public glfw
+  (package
+    (name "glfw")
+    (version "3.1.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/glfw/glfw/archive/"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
+    (build-system cmake-build-system)    
+    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f))
+    (native-inputs `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("cmake" ,cmake)
+        ("libtool" ,libtool)
+        ("pkg-config" ,pkg-config)))
+    (inputs `(("curl" ,curl)
+       ("dbus" ,dbus)
+       ("enca" ,enca)
+       ("eudev" ,eudev)
+       ("glew" ,glew)
+       ("libcap" ,libcap)
+       ("libjpeg" ,libjpeg)
+       ("libltdl" ,libltdl)
+       ("libtiff" ,libtiff)
+       ("mesa-utils" ,mesa-utils)
+       ("randrproto" ,randrproto)
+       ("libxrandr" ,libxrandr)
+       ("xineramaproto" ,xineramaproto)
+       ("libxinerama" ,libxinerama)
+       ("libxcursor" ,libxcursor)
+       ("mysql" ,mysql)
+       ("python" ,python-2)))       
+    (home-page "http://www.glfw.org/")
+    (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
+    (license (list gpl2))))
diff --git a/gn/packages/hyphy.scm b/gn/packages/hyphy.scm
new file mode 100644
index 0000000..fea73a4
--- /dev/null
+++ b/gn/packages/hyphy.scm
@@ -0,0 +1,84 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages hyphy)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)  
+  #:use-module (gnu packages linux))
+
+(define-public hyphy
+  (package
+    (name "hyphy")
+    (version "2.2.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/veg/hyphy/archive/" version 
+                                  ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00i3609nywb1xfq50p3kvfbvahql241ciq23jrf67z0yp4y5l5a9"))))
+    (inputs
+     `(("python" ,python-2)
+       ("fftw-openmpi" ,fftw-openmpi)))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                 (add-after 'unpack `bootstrap 
+                  (lambda _
+                   (zero? (system* "make" "MPI"))))))) 
+    (arguments 
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
+       #:tests? #f))     
+    (synopsis "hyphy: an open-source software package for the analysis
+of genetic sequences using techniques in phylogenetics, molecular
+evolution, and machine learning.")
+    (description "HyPhy is an open-source software package for the
+analysis of genetic sequences using techniques in phylogenetics,
+molecular evolution, and machine learning.  It features a complete
+graphical user interface (GUI) and a rich scripting language for
+limitless customization of analyses. Additionally, HyPhy features
+support for parallel computing environments (via message passing
+interface (MPI)) and it can be compiled as a shared library and called
+from other programming environments such as Python and R. ")
+    (home-page "http://hyphy.org")
+    (license license:expat)))
+
+
+
diff --git a/gn/packages/llvm.scm b/gn/packages/llvm.scm
new file mode 100644
index 0000000..83ea5d1
--- /dev/null
+++ b/gn/packages/llvm.scm
@@ -0,0 +1,65 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages llvm)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages bootstrap)           ;glibc-dynamic-linker
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml))
+
+
+(define-public llvm
+(package
+    (name "llvm")
+    (version "3.7.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://llvm.org/releases/"
+                          version "/llvm-" version ".src.tar.xz"))
+      (sha256
+       (base32
+        "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("python" ,python-wrapper)
+       ("perl"   ,perl)))
+    (arguments
+     `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
+                           "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE")))
+    (home-page "http://www.llvm.org")
+    (synopsis "Optimizing compiler infrastructure")
+    (description
+     "LLVM is a compiler infrastructure designed for compile-time, link-time,
+runtime, and idle-time optimization of programs from arbitrary programming
+languages.  It currently supports compilation of C and C++ programs, using
+front-ends derived from GCC 4.0.1.  A new front-end for the C family of
+languages is in development.  The compiler infrastructure includes mirror sets
+of programming tools as well as libraries with equivalent functionality.")
+    (license license:ncsa)))
diff --git a/gn/packages/ocl-icd.scm b/gn/packages/ocl-icd.scm
new file mode 100644
index 0000000..b33fe9d
--- /dev/null
+++ b/gn/packages/ocl-icd.scm
@@ -0,0 +1,99 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages ocl-icd)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages zip)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (guix git-download))
+
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license license:gpl2)))
+    
+    (define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license license:gpl2))))
diff --git a/gn/packages/opencl-headers.scm b/gn/packages/opencl-headers.scm
new file mode 100644
index 0000000..bddd136
--- /dev/null
+++ b/gn/packages/opencl-headers.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages opencl-headers)
+  #:use-module ((guix licenses))
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)  
+  #:use-module (gnu packages linux))
+
+(define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license gpl2))))
diff --git a/gn/packages/opencl-icd-loader.scm b/gn/packages/opencl-icd-loader.scm
new file mode 100644
index 0000000..a8fbc7b
--- /dev/null
+++ b/gn/packages/opencl-icd-loader.scm
@@ -0,0 +1,95 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages opencl-icd-loader)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix git-download)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages version-control)  
+  #:use-module (gnu packages linux))
+
+(define-public opencl-icd-loader
+(let ((commit "bf894eb"))
+  (package
+    (name "opencl-icd-loader")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-ICD-Loader.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "1sbxdd9vgl3m8j39kwvvk5cflyj7480pq0s307zg1ssidvj98v3g"))))
+(native-inputs `(("autoconf" ,autoconf)
+                ("automake" ,automake)
+                ("libtool" ,libtool)
+                ("cmake" ,cmake)
+                ("pkg-config" ,pkg-config)))
+(inputs        `(("python" ,python-2)
+               ("boost" ,boost)
+               ("dbus" ,dbus)
+               ("clang" ,clang)
+               ("clang-runtime" ,clang-runtime)
+               ("enca" ,enca)
+               ("eudev" ,eudev)
+               ("fftw-openmpi" ,fftw-openmpi)
+               ("glew" ,glew)
+               ("hwloc" ,hwloc)
+               ("libcap" ,libcap)
+               ("libjpeg" ,libjpeg)
+               ("libltdl" ,libltdl)
+               ("libtiff" ,libtiff)
+               ("llvm" ,llvm)
+               ("mesa-utils" ,mesa-utils)
+               ("openmpi" ,openmpi)
+               ("perl" ,perl)
+               ("randrproto" ,randrproto)
+               ("libxrandr" ,libxrandr)
+               ("xineramaproto" ,xineramaproto)
+               ("libxinerama" ,libxinerama)
+               ("libxcursor" ,libxcursor)
+               ("fftw-openmpi" ,fftw-openmpi)))
+    (build-system cmake-build-system)                
+    (synopsis "The Khronos OpenCL ICDs (Installable Client Driver)")
+    (description "This package provides the Khronos OpenCL ICDs")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license license:gpl2))))
diff --git a/gn/packages/OpenFYBA b/gn/packages/openfyba.scm
index 5d64381..2b20d09 100644
--- a/gn/packages/OpenFYBA
+++ b/gn/packages/openfyba.scm
@@ -16,44 +16,46 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages OpenFYBA)
-  #:use-module ((guix licenses) #:prefix license:)
+(define-module (gn packages openfyba)
+  #:use-module ((guix licenses))
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages tls)
+  ;;#:use-module (gnu packages tls)
   #:use-module (gnu packages zip)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages bootstrap)
   #:use-module (guix git-download))
 
-(define-public OpenFYBA
+(define-public openfyba
   (package
-   (name "OpenFYBA")
-   (version "4.4.1")
+   (name "openfyba")
+   (version "4.1.1")
    (source (origin
              (method url-fetch)
-             (uri (string-append "https://github.com/kartverket/fyba/archive"
+             (uri (string-append "https://github.com/kartverket/fyba/archive/"
                                  version ".tar.gz"))
              (file-name (string-append name "-" version ".tar.gz"))
              (sha256
               (base32
                "0ya1agi78d386skq353dk400fl11q6whfqmv31qrkn4g5vamixlr"))))
-    (inputs `(("openssl" ,openssl)                                          
-    (build-system gnu-build-system)    
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("libtool" ,libtool)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
     (home-page "http://labs.kartverket.no/sos/")
     (synopsis "source code release of the FYBA library")
-    (description
-     "OpenFYBA is the source code release of the FYBA library, distributed by the 
-National Mapping Authority of Norway (Statens kartverk) to read and write 
-files in the National geodata standard format SOSI. 
-The original library has a long history, and was originally developed for 
-systems as diverse as DOS, OS/2-16, OS/2-32, Win16, Win32, and various UNIX 
-variants (POSIX, HPUX, Silicon graphics). In Norwegian. It shows in the 
-source code. OpenFYBA has been tested to run at least on Windows and Linux 
-environments. ")
-    (license license:gpl2+)))
-
+    (description "OpenFYBA is the source code release of the FYBA library.")
+    (license (list gpl2))))
diff --git a/gn/packages/pocl.scm b/gn/packages/pocl.scm
new file mode 100644
index 0000000..39f16c0
--- /dev/null
+++ b/gn/packages/pocl.scm
@@ -0,0 +1,328 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gn packages pocl)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix git-download)
+  #:use-module (guix download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (srfi srfi-1)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages zip)  
+  #:use-module (gnu packages linux))
+
+(define-public pocl
+(let ((commit "7aefc52"))
+  (package
+    (name "pocl")
+    (version (string-append "v09rc-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/pocl/pocl.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "03wbcxkx1w5kx0crangsnah0xq218bhb99vglmn00wcjhhw80qim"))))
+(native-inputs `(("autoconf" ,autoconf)
+                ("automake" ,automake)
+                ("libtool" ,libtool)
+                ("cmake" ,cmake)
+                ("pkg-config" ,pkg-config)))
+(inputs        `(("python" ,python-2)
+               ("boost" ,boost)
+               ("dbus" ,dbus)
+               ("clang" ,clang-3.7.1)
+               ("clang-runtime" ,clang-runtime-3.7.1)
+               ("enca" ,enca)
+               ("eudev" ,eudev)
+               ("fftw-openmpi" ,fftw-openmpi)
+               ("glew" ,glew)
+               ("hwloc" ,hwloc)
+               ("libcap" ,libcap)
+               ("libjpeg" ,libjpeg)
+               ("libltdl" ,libltdl)
+               ("libtiff" ,libtiff)
+               ("llvm" ,llvm-3.7.1)
+               ("ocl-icd" ,ocl-icd)
+               ("opencl-headers" ,opencl-headers)
+               ("mesa-utils" ,mesa-utils)
+               ("openmpi" ,openmpi)
+               ("perl" ,perl)
+               ("randrproto" ,randrproto)
+               ("libxrandr" ,libxrandr)
+               ("xineramaproto" ,xineramaproto)
+               ("libxinerama" ,libxinerama)
+               ("libxcursor" ,libxcursor)
+               ("fftw-openmpi" ,fftw-openmpi)))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--enable-icd")
+     #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-before
+          'configure 'rewrite-usr-bin
+          (lambda _
+                   (zero? (system* "./autogen.sh")))))))                
+    (synopsis "pocl: Portable Computing Language (pocl) aims to become a MIT-licensed
+     open source implementation of the OpenCL standard which can be easily adapted for
+     new targets and devices, both for homogeneous CPU and heterogenous GPUs/accelerators.")
+    (description "Portable Computing Language (pocl) aims to become a MIT-licensed
+     open source implementation of the OpenCL standard which can be easily adapted for
+     new targets and devices, both for homogeneous CPU and heterogenous GPUs/accelerators.")
+    (home-page "http://portablecl.org/")
+    (license license:gpl2))))
+        
+(define-public ocl-icd
+  (package
+   (name "ocl-icd")
+   (version "2.2.9")
+   (source (origin
+             (method url-fetch)
+             (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-"
+                                 version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
+             (sha256
+              (base32
+               "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
+    (inputs `(("zip" ,zip)
+             ("autoconf" ,autoconf)
+             ("automake" ,automake)
+             ("ruby" ,ruby)
+             ("libtool" ,libtool)
+             ("opencl-headers" ,opencl-headers)
+             ("libgcrypt" ,libgcrypt)))                                              
+    (build-system gnu-build-system)
+     (arguments
+     '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack `bootstrap
+                      (lambda _
+                        (zero? (system* "autoreconf" "-vfi")))))))    
+    (home-page "https://forge.imag.fr/projects/ocl-icd/")
+    (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
+    (description "OpenCL implementations are provided as ICD (Installable Client Driver).
+    An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
+    This free ICD Loader can load any (free or non free) ICD")
+    (license license:gpl2)))
+    
+ (define-public opencl-headers
+(let ((commit "c1770dc"))
+  (package
+    (name "opencl-headers")
+    (version (string-append "2.1-" commit ))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+              (url "https://github.com/KhronosGroup/OpenCL-Headers.git")
+              (commit commit)))
+              (file-name (string-append name "-" commit))
+              (sha256
+               (base32
+                "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"))))
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (copy-recursively "." (string-append
+                                                 (assoc-ref outputs "out")
+                                                 "/include/CL")))))))
+    (synopsis "The Khronos OpenCL headers")
+    (description "This package provides the Khronos OpenCL headers")
+    (home-page "https://www.khronos.org/registry/cl/")
+    (license license:gpl2))))
+    
+(define (clang-runtime-from-llvm llvm hash)
+  (package
+    (name "clang-runtime")
+    (version (package-version llvm-3.7.1))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://llvm.org/releases/"
+                           version "/compiler-rt-" version ".src.tar.xz"))
+       (sha256 
+        (base32 
+        "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"))))
+    (build-system cmake-build-system)
+    (native-inputs (package-native-inputs llvm))
+    (inputs
+     `(("llvm" ,llvm)))
+    (arguments
+     `(;; Don't use '-g' during the build to save space.
+       #:build-type "Release"))
+
+    (home-page "http://compiler-rt.llvm.org")
+    (synopsis "Runtime library for Clang/LLVM")
+    (description
+     "The \"clang-runtime\" library provides the implementations of run-time
+functions for C and C++ programs.  It also provides header files that allow C
+and C++ source code to interface with the \"sanitization\" passes of the clang
+compiler.  In LLVM this library is called \"compiler-rt\".")
+    (license license:ncsa)
+
+    ;; <http://compiler-rt.llvm.org/> doesn't list MIPS as supported.
+    (supported-systems (delete "mips64el-linux" %supported-systems))))
+
+(define (clang-from-llvm llvm clang-runtime hash)
+  (package
+    (name "clang")
+    (version (package-version llvm-3.7.1))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://llvm.org/releases/"
+                           version "/cfe-" version ".src.tar.xz"))
+       (sha256 
+        (base32 
+         "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"))
+       (patches (list (search-patch "clang-libc-search-path.patch")))))
+    ;; Using cmake allows us to treat llvm as an external library.  There
+    ;; doesn't seem to be any way to do this with clang's autotools-based
+    ;; build system.
+    (build-system cmake-build-system)
+    (native-inputs (package-native-inputs llvm))
+    (inputs
+     `(("libxml2" ,libxml2)
+       ("libstdc++-4.9", libstdc++-4.9)
+       ("python" ,python-2)
+       ("gcc-lib" ,gcc "lib")
+       ,@(package-inputs llvm)))
+    (propagated-inputs
+     `(("llvm" ,llvm)
+       ("clang-runtime" ,clang-runtime)))
+    (arguments
+     `(#:configure-flags
+       (list "-DCLANG_INCLUDE_TESTS=True"
+
+             ;; Find libgcc_s, crtbegin.o, and crtend.o.
+             (string-append "-DGCC_INSTALL_PREFIX="
+                            (assoc-ref %build-inputs "gcc-lib"))
+
+             ;; Use a sane default include directory.
+             (string-append "-DC_INCLUDE_DIRS="
+                            (assoc-ref %build-inputs "libc")
+                            "/include"))
+
+       ;; Don't use '-g' during the build to save space.
+       #:build-type "Release"
+
+       #:phases (modify-phases %standard-phases
+                  (add-after
+                   'unpack 'set-glibc-file-names
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((libc (assoc-ref inputs "libc"))
+                           (compiler-rt (assoc-ref inputs "clang-runtime")))
+                       (substitute* "lib/Driver/Tools.cpp"
+                         ;; Patch the 'getLinuxDynamicLinker' function to that
+                         ;; it uses the right dynamic linker file name.
+                         (("/lib64/ld-linux-x86-64.so.2")
+                          (string-append libc
+                                         ,(glibc-dynamic-linker)))
+
+                         ;; Link to libclang_rt files from clang-runtime.
+                         (("TC\\.getDriver\\(\\)\\.ResourceDir")
+                          (string-append "\"" compiler-rt "\"")))
+
+                       ;; Same for libc's libdir, to allow crt1.o & co. to be
+                       ;; found.
+                       (substitute* "lib/Driver/ToolChains.cpp"
+                         (("@GLIBC_LIBDIR@")
+                          (string-append libc "/lib")))))))))
+
+    ;; Clang supports the same environment variables as GCC.
+    (native-search-paths
+     (list (search-path-specification
+            (variable "CPATH")
+            (files '("include")))
+           (search-path-specification
+            (variable "LIBRARY_PATH")
+            (files '("lib" "lib64")))))
+
+    (home-page "http://clang.llvm.org")
+    (synopsis "C language family frontend for LLVM")
+    (description
+     "Clang is a compiler front end for the C, C++, Objective-C and
+Objective-C++ programming languages.  It uses LLVM as its back end.  The Clang
+project includes the Clang front end, the Clang static analyzer, and several
+code analysis tools.")
+    (license license:ncsa)))
+         
+(define-public llvm-3.7.1
+  (package (inherit llvm)
+    (version "3.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://llvm.org/releases/"
+                           version "/llvm-" version ".src.tar.xz"))
+       (sha256
+        (base32
+         "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"))))))
+
+(define-public clang-runtime-3.7.1
+  (clang-runtime-from-llvm
+   llvm-3.7.1
+   "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4"))
+
+(define-public clang-3.7.1
+  (clang-from-llvm llvm clang-runtime
+                   "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"))
+
+
+
+    
+