From 7bc544f600909f73a0de4a958664f2a7c6950d0b Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Mon, 9 Dec 2019 15:28:57 +0100 Subject: [PATCH] oclgrind: use newest LLVM --- pkgs/development/tools/analysis/oclgrind/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 92020d7897f..f5e649d0354 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c06eb1aed..bc0b57332eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };