From 2a8eebc8064227a3bfde4eba145b3233e0e13f49 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 29 Sep 2021 23:21:54 +0100 Subject: [PATCH 1/2] ocl-icd: update homepage, switch to github releases A prerequisite step for version update --- .../development/libraries/ocl-icd/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index b84aa6a146d7..acd45c5bc6ef 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,15 +1,27 @@ -{lib, stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: +{ lib +, stdenv +, fetchFromGitHub +, ruby +, opencl-headers +, addOpenGLRunpath +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "ocl-icd"; version = "2.2.10"; - src = fetchurl { - url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz"; - sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; + src = fetchFromGitHub { + owner = "OCL-dev"; + repo = "ocl-icd"; + rev = "v${version}"; + sha256 = "1cvay1lif71v60hhgyicc25ysy9ifh3da1gp12ri5klyvx4jj3ji"; }; - nativeBuildInputs = [ ruby ]; + nativeBuildInputs = [ + autoreconfHook + ruby + ]; buildInputs = [ opencl-headers ]; @@ -19,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; - homepage = "https://forge.imag.fr/projects/ocl-icd/"; + homepage = "https://github.com/OCL-dev/ocl-icd"; license = licenses.bsd2; platforms = platforms.linux; }; From 0c0bb2d6e37e82ce777030183ab1fc971d5770c3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 1 Oct 2021 22:43:22 +0100 Subject: [PATCH 2/2] ocl-icd: 2.2.10 -> 2.3.1 --- pkgs/development/libraries/ocl-icd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index acd45c5bc6ef..75dd5ecd541f 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ocl-icd"; - version = "2.2.10"; + version = "2.3.1"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; rev = "v${version}"; - sha256 = "1cvay1lif71v60hhgyicc25ysy9ifh3da1gp12ri5klyvx4jj3ji"; + sha256 = "1km2rqc9pw6xxkqp77a22pxfsb5kgw95w9zd15l5jgvyjb6rqqad"; }; nativeBuildInputs = [