From a2332e54719b069378fc2c54beae03e81aad97d4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Aug 2019 07:11:02 -0500 Subject: gn: remove some upstream packages --- gn/packages/arrayfire.scm | 46 +-------------------- gn/packages/beignet.scm | 92 ------------------------------------------ gn/packages/ocl-icd.scm | 67 ------------------------------ gn/packages/opencl-headers.scm | 63 ----------------------------- 4 files changed, 1 insertion(+), 267 deletions(-) delete mode 100644 gn/packages/beignet.scm delete mode 100644 gn/packages/ocl-icd.scm delete mode 100644 gn/packages/opencl-headers.scm diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index c230dc4..723444a 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -53,9 +53,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages version-control) #:use-module (gnu packages linux) - #:use-module (gnu packages opencl) - #:use-module (gn packages ocl-headers) - #:use-module (gn packages ocl-icd)) + #:use-module (gnu packages opencl)) (define-public arrayfire (package @@ -121,48 +119,6 @@ license:gpl3 license:gpl3+)))) -(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) - ("git" ,git) - ("libtool" ,libtool) - ("libpthread-stubs" ,libpthread-stubs) - ("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) - ("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 clBLAS (package (name "clBLAS") diff --git a/gn/packages/beignet.scm b/gn/packages/beignet.scm deleted file mode 100644 index ea099c4..0000000 --- a/gn/packages/beignet.scm +++ /dev/null @@ -1,92 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Dennis Mungai -;;; -;;; 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 . - -(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 linux) - #:use-module (gnu packages opencl) - #:use-module (gn packages ocl-headers) - #:use-module (gn packages ocl-icd)) - -(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))) diff --git a/gn/packages/ocl-icd.scm b/gn/packages/ocl-icd.scm deleted file mode 100644 index 17e85d7..0000000 --- a/gn/packages/ocl-icd.scm +++ /dev/null @@ -1,67 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Dennis Mungai -;;; -;;; 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 . - -(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 bootstrap) - #:use-module (gnu packages linux) - #:use-module (gnu packages textutils) - #:use-module (gnu packages base) - #:use-module (gnu packages compression) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages ruby) - #:use-module (gnu packages opencl) - #:use-module (gn packages ocl-headers) - #: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))) diff --git a/gn/packages/opencl-headers.scm b/gn/packages/opencl-headers.scm deleted file mode 100644 index bddd136..0000000 --- a/gn/packages/opencl-headers.scm +++ /dev/null @@ -1,63 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Dennis Mungai -;;; -;;; 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 . - -(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)))) -- cgit v1.2.3