Merge pull request #330240 from SuperSandro2000/intel-graphic-compiler

This commit is contained in:
Sandro 2024-07-27 21:01:08 +02:00 committed by GitHub
commit df6bc40347
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 14 deletions

View File

@ -31,13 +31,13 @@ in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
version = "1.0.16695.4";
version = "1.0.17193.4";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
rev = "igc-${version}";
hash = "sha256-XgQ2Gk3HDKBpsfomlpRUt8WybEIoHfKlyuWJCwCnmDA=";
hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc=";
};
nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ];

View File

@ -32,9 +32,9 @@ let
rev = "v${version}";
hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";
} else if llvmMajor == "14" then {
version = "14.0.0+unstable-2024-02-14";
rev = "2221771c28dc224d5d560faf6a2cd73f8ecf713d";
hash = "sha256-J4qOgDdcsPRU1AXXXWN+qe4c47uMCrjmtM8MSrl9NjE=";
version = "14.0.0+unstable-2024-05-27";
rev = "62f5b09b11b1da42274371b1f7535f6f2ab11485";
hash = "sha256-lEOdWHyq9hEyBZPz9z1LxUAZqNub+mZFHHWMlzh3HaI=";
} else if llvmMajor == "11" then {
version = "11.0.0+unstable-2022-05-04";
rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0

View File

@ -54,26 +54,20 @@ let
};
};
version = "unstable-2023-06-12";
version = "unstable-2024-06-06";
src = applyPatches {
src = fetchFromGitHub {
owner = "intel";
repo = "opencl-clang";
# https://github.com/intel/opencl-clang/compare/ocl-open-140
rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6";
hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8=";
rev = "66a54cbef6726c4e791986779a60d7a45b09c9c9";
hash = "sha256-vM2IlF/e3b2GIXMaHYre+iQn4WKsFIU3x90Ee5KVHtI=";
};
patches = [
# Build script tries to find Clang OpenCL headers under ${llvm}
# Work around it by specifying that directory manually.
./opencl-headers-dir.patch
# fix CMake throwing errors
(fetchpatch {
url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch";
hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g=";
})
];
postPatch = ''