From 67a058eda715f5ab0a2dbf358358d332e686a4c6 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 1 Dec 2017 00:00:00 +0000
Subject: [PATCH] opencl-headers: 2016-11-29 -> 2017-07-18, provide multiple
 versions

---
 .../libraries/opencl-headers/default.nix           | 14 ++++++++------
 pkgs/top-level/all-packages.nix                    |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 717bb5ad0ee..9ce8bb618bf 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub
+, version # "12" for "1.2", "22" for "2.2" and so on
+}:
 
 stdenv.mkDerivation rec {
-  name = "opencl-headers-2.1-2016-11-29";
+  name = "opencl-headers-${version}-2017-07-18";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-Headers";
-    rev = "abb29588550c77f8340a6c3683531407013bf26b";
-    sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7";
+    rev = "f039db6764d52388658ef15c30b2237bbda49803";
+    sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7";
   };
 
   installPhase = ''
     mkdir -p $out/include/CL
-    cp * $out/include/CL
+    cp opencl${version}/CL/* $out/include/CL
   '';
 
   meta = with stdenv.lib; {
-    description = "Khronos OpenCL headers";
+    description = "Khronos OpenCL headers version ${version}";
     homepage = https://www.khronos.org/registry/cl/;
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cf74474141..14fbc33fd79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10432,7 +10432,10 @@ with pkgs;
 
   opencascade_oce = opencascade;
 
-  opencl-headers = callPackage ../development/libraries/opencl-headers { };
+  opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
+  opencl-headers_1_2 = opencl-headersGen "12";
+  opencl-headers_2_2 = opencl-headersGen "22";
+  opencl-headers = opencl-headers_2_2;
 
   opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };