From af59eb84ca37a24359ef7de12f69fc19f961039f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 9 Jul 2024 13:39:34 -0500 Subject: [PATCH 1/2] rocmPackages.llvm: add setuptools distutils removed in python 3.12, need to add setuptools. --- pkgs/development/rocm-modules/6/llvm/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index caa2ebe42823a..1bbf164475496 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation (finalAttrs: { cmake ninja git - python3Packages.python + (python3Packages.python.withPackages (p: [ p.setuptools ])) ] ++ lib.optionals (buildDocs || buildMan) [ doxygen sphinx From 09bcfcaa940d128eb05d12906b47026f7702a56d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 9 Jul 2024 20:43:10 -0500 Subject: [PATCH 2/2] rocmPackages.llvm.libcxx: exclude a few failing tests --- .../6/llvm/stage-2/1000-libcxx-failing-tests.list | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list index e005d6c928c26..d5e1f675079fa 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list @@ -169,3 +169,7 @@ ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp +../libcxx/test/std/language.support/support.dynamic/hardware_inference_size.compile.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp +../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp