Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 43bdc3949d6f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75a947661e2d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 4, 2019

  1. khronos-ocl-icd-loader: init at 6c03f8b

    @davidtwco
    davidtwco committed Oct 4, 2019
    Copy the full SHA
    4820d63 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70395 from davidtwco/khronos-ocl-icd-loader-init 

    khronos-ocl-icd-loader: init at 6c03f8b
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    75a9476 View commit details
26 changes: 26 additions & 0 deletions pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }:

stdenv.mkDerivation rec {
name = "khronos-ocl-icd-loader-${version}";
version = "6c03f8b";

src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCL-ICD-Loader";
rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8";
sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a";
};

patches = stdenv.lib.lists.optional withTracing ./tracing.patch;

nativeBuildInputs = [ cmake ];
buildInputs = [ opencl-clhpp ];

meta = with stdenv.lib; {
description = "Offical Khronos OpenCL ICD Loader";
homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader;
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ davidtwco ];
};
}
13 changes: 13 additions & 0 deletions pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/loader/icd.h b/loader/icd.h
index a1b6969..cf4e272 100644
--- a/loader/icd.h
+++ b/loader/icd.h
@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform(
cl_platform_id *outPlatform);

// internal tracing macros
-#if 0
+#if 1
#include <stdio.h>
#define KHR_ICD_TRACE(...) \
do \
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9938,6 +9938,8 @@ in

kind = callPackage ../development/tools/kind { };

khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { };

kube-aws = callPackage ../development/tools/kube-aws { };

kubectx = callPackage ../development/tools/kubectx { };