public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencl-icd: remove, point to ocl-icd

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-01-20 02:48:24 +03:00
parent f673243aff
commit 10bae1a207
6 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/opencl-icd/default.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, ruby, opencl-headers }: let
version = "2.2.9";
in stdenv.mkDerivation {
name = "opencl-icd-${version}";
buildInputs = [ ruby opencl-headers ];
configureFlags = [ "--enable-official-khronos-headers" ];
src = fetchurl {
url = "https://forge.imag.fr/frs/download.php/716/ocl-icd-${version}.tar.gz";
sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc";
};
meta = {
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/python-modules/pyopencl/default.nix
View File

@ -10,7 +10,7 @@
, appdirs , appdirs
, six , six
, opencl-headers , opencl-headers
, opencl-icd , ocl-icd
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -18,7 +18,7 @@ buildPythonPackage rec {
version = "2016.2"; version = "2016.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
buildInputs = [ pytest opencl-headers opencl-icd ]; buildInputs = [ pytest opencl-headers ocl-icd ];
propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];

2
pkgs/misc/emulators/wine/base.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ]

4
pkgs/tools/security/hashcat/hashcat3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, opencl-headers, opencl-icd }: { stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''; '';
postFixup = '' postFixup = ''
wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${opencl-icd}/lib wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
''; '';
meta = { meta = {

3
pkgs/top-level/aliases.nix
View File

@ -69,6 +69,7 @@ doNotDisplayTwice rec {
links = links2; # added 2016-01-31 links = links2; # added 2016-01-31
lttngTools = lttng-tools; # added 2014-07-31 lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31
m3d-linux = m33-linux; # added 2016-08-13
manpages = man-pages; # added 2015-12-06 manpages = man-pages; # added 2015-12-06
man_db = man-db; # added 2016-05 man_db = man-db; # added 2016-05
midoriWrapper = midori; # added 2015-01 midoriWrapper = midori; # added 2015-01
@ -79,6 +80,7 @@ doNotDisplayTwice rec {
mupen64plus1_5 = mupen64plus; # added 2016-02-12 mupen64plus1_5 = mupen64plus; # added 2016-02-12
ncat = nmap; # added 2016-01-26 ncat = nmap; # added 2016-01-26
nfsUtils = nfs-utils; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06
opencl-icd = ocl-icd; # added 2017-01-20
owncloudclient = owncloud-client; # added 2016-08 owncloudclient = owncloud-client; # added 2016-08
pidgin-with-plugins = pidgin; # added 2016-06 pidgin-with-plugins = pidgin; # added 2016-06
pidginlatexSF = pidginlatex; # added 2014-11-02 pidginlatexSF = pidginlatex; # added 2014-11-02
@ -115,7 +117,6 @@ doNotDisplayTwice rec {
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09 xlibs = xorg; # added 2015-09
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
m3d-linux = m33-linux; # added 2016-08-13
inherit (ocaml-ng) # added 2016-09-14 inherit (ocaml-ng) # added 2016-09-14
ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1

2
pkgs/top-level/all-packages.nix
View File

@ -8899,8 +8899,6 @@ in
opencl-headers = callPackage ../development/libraries/opencl-headers { }; opencl-headers = callPackage ../development/libraries/opencl-headers { };
opencl-icd = callPackage ../development/libraries/opencl-icd { };
opencollada = callPackage ../development/libraries/opencollada { }; opencollada = callPackage ../development/libraries/opencollada { };
opencsg = callPackage ../development/libraries/opencsg { }; opencsg = callPackage ../development/libraries/opencsg { };