From 05d9e98392d8d1e3175661407d4a4fb88983861f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 12:09:50 +0200 Subject: [PATCH 1/7] python312Packages.pyopencl: 2024.2.6 -> 2024.2.7 + reformat Diff: https://github.com/inducer/pyopencl/compare/refs/tags/v2024.2.6...v2024.2.7 Changelog: https://github.com/inducer/pyopencl/releases/tag/v2024.2.7 --- pkgs/development/python-modules/pyopencl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 0f9e4808cb972c1..91b8d10ccd94837 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -29,18 +29,19 @@ }: let - os-specific-buildInputs = if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; + os-specific-buildInputs = + if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2024.2.6"; + version = "2024.2.7"; format = "pyproject"; src = fetchFromGitHub { owner = "inducer"; repo = "pyopencl"; rev = "refs/tags/v${version}"; - hash = "sha256-nP7ZAGeRXrjqDRWlc2SDP1hk1fseGeu9Zx0lOp9Pchs="; + hash = "sha256-DfZCtTeN1a1KS2qUU6iztba4opAVC/RUCe/hnkqTbII="; }; nativeBuildInputs = [ @@ -87,5 +88,6 @@ buildPythonPackage rec { description = "Python wrapper for OpenCL"; homepage = "https://github.com/pyopencl/pyopencl"; license = licenses.mit; + changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; }; } From 4dd88122d12b9ce8cfebec5c0f1e597fbdc49269 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 12:14:00 +0200 Subject: [PATCH 2/7] python312Packages.pyopencl: remove 'with lib;' from meta --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 91b8d10ccd94837..dd1add2cb553f8c 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -84,10 +84,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyopencl" ]; - meta = with lib; { + meta = { description = "Python wrapper for OpenCL"; homepage = "https://github.com/pyopencl/pyopencl"; - license = licenses.mit; changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; + license = lib.licenses.mit; }; } From d23b44b49839b4680a6d24553e0fe6ad7ab6dc4e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 12:14:18 +0200 Subject: [PATCH 3/7] python312Packages.pyopencl: add GaetanLepage as maintainer --- pkgs/development/python-modules/pyopencl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index dd1add2cb553f8c..bce28072a91e8b8 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -89,5 +89,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyopencl/pyopencl"; changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 16626f9b556c499c689f86f7c751535a21550524 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 13:23:07 +0200 Subject: [PATCH 4/7] python312Packages.pyopencl: use latest guidelines for python derivations --- pkgs/development/python-modules/pyopencl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index bce28072a91e8b8..9d2f48aa343bdde 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -35,7 +35,7 @@ in buildPythonPackage rec { pname = "pyopencl"; version = "2024.2.7"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "inducer"; @@ -44,7 +44,7 @@ buildPythonPackage rec { hash = "sha256-DfZCtTeN1a1KS2qUU6iztba4opAVC/RUCe/hnkqTbII="; }; - nativeBuildInputs = [ + build-system = [ cmake nanobind ninja @@ -61,7 +61,7 @@ buildPythonPackage rec { pybind11 ] ++ os-specific-buildInputs; - propagatedBuildInputs = [ + dependencies = [ appdirs cffi decorator From 56223be39fedc9ff9a8fd38a42d3b3b448cba8b3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 13:27:10 +0200 Subject: [PATCH 5/7] python312Packages.pyopencl: remove unneeded dependencies --- pkgs/development/python-modules/pyopencl/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 9d2f48aa343bdde..3807b4714c5399b 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -12,20 +12,14 @@ nanobind, # dependencies - appdirs, - cffi, darwin, - decorator, - mako, numpy, ocl-icd, - oldest-supported-numpy, opencl-headers, platformdirs, pybind11, pytestCheckHook, pytools, - six, }: let @@ -49,7 +43,6 @@ buildPythonPackage rec { nanobind ninja numpy - oldest-supported-numpy pathspec scikit-build-core ]; @@ -62,14 +55,9 @@ buildPythonPackage rec { ] ++ os-specific-buildInputs; dependencies = [ - appdirs - cffi - decorator - mako numpy platformdirs pytools - six ]; nativeCheckInputs = [ pytestCheckHook ]; From 20767ff03b9885153b196a1beb7e412e18bae556 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 13:27:58 +0200 Subject: [PATCH 6/7] python312Packages.pyopencl: reorder inputs --- .../python-modules/pyopencl/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 3807b4714c5399b..85e260a800389ff 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,25 +1,29 @@ { lib, stdenv, - fetchFromGitHub, + darwin, + ocl-icd, buildPythonPackage, + fetchFromGitHub, # build-system cmake, - scikit-build-core, - pathspec, - ninja, nanobind, - - # dependencies - darwin, + ninja, numpy, - ocl-icd, + pathspec, + scikit-build-core, + + # buildInputs opencl-headers, - platformdirs, pybind11, - pytestCheckHook, + + # dependencies + platformdirs, pytools, + + # checks + pytestCheckHook, }: let From 87b7cfadb37ab76428224c831afbb2be53cee0e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 28 Aug 2024 13:32:37 +0200 Subject: [PATCH 7/7] python312Packages.pyopencl: mark as broken on aarch64-darwin --- pkgs/development/python-modules/pyopencl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 85e260a800389ff..5c16b8a5960e165 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -82,5 +82,7 @@ buildPythonPackage rec { changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # ld: symbol(s) not found for architecture arm64 + broken = stdenv.isDarwin && stdenv.isAarch64; }; }