From 051b1d262a049acd422e82f55152d59b958b1d70 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 21 Feb 2025 21:55:34 +0000 Subject: [PATCH] clpeak: 1.1.0 -> 1.1.4, refactor and adopt, update license to asl20 Upstream has switched licenses in 1.1.3 [1]. [1]: https://github.com/krrishnarraj/clpeak/commit/65e572451330b4673712dfec352842f3123a9258 --- pkgs/by-name/cl/clpeak/package.nix | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix index bf8285ca8969..05630a9bb0f3 100644 --- a/pkgs/by-name/cl/clpeak/package.nix +++ b/pkgs/by-name/cl/clpeak/package.nix @@ -7,26 +7,18 @@ opencl-clhpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clpeak"; - version = "1.1.0"; + version = "1.1.4"; src = fetchFromGitHub { owner = "krrishnarraj"; repo = "clpeak"; - rev = version; + tag = finalAttrs.version; fetchSubmodules = true; - sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2"; + hash = "sha256-unQLZ5EExL9lU2XuYLJjASeFzDA74+TnU0CQTWyNYiQ="; }; - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates clpeak to use the new cp2.hpp header. The patch comes - # from the following PR and was updated to apply against more - # recent versions: https://github.com/krrishnarraj/clpeak/pull/46 - ./clpeak-clhpp2.diff - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -34,11 +26,11 @@ stdenv.mkDerivation rec { opencl-clhpp ]; - meta = with lib; { + meta = { description = "Tool which profiles OpenCL devices to find their peak capacities"; homepage = "https://github.com/krrishnarraj/clpeak/"; - license = licenses.unlicense; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.xokdvium ]; mainProgram = "clpeak"; }; -} +})