Merge pull request #75365 from athas/oclgrind-llvm

oclgrind: use newest LLVM
This commit is contained in:
Sarah Brofeldt 2019-12-09 16:40:39 +01:00 committed by GitHub
commit ab1fe825f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "oclgrind";
version = "19.10"; # see comment in all-packages.nix
version = "19.10";
src = fetchFromGitHub {
owner = "jrprice";

View file

@ -24919,9 +24919,7 @@ in
sndio = callPackage ../misc/sndio { };
# Oclgrind 18.3 does not work with newer LLVMs (but HEAD does, so
# fix this after next release).
oclgrind = callPackage ../development/tools/analysis/oclgrind { llvmPackages = llvmPackages_6; };
oclgrind = callPackage ../development/tools/analysis/oclgrind { };
opkg = callPackage ../tools/package-management/opkg { };