From 4d104469e9313cebef7327afbb93eb10fad3ff33 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 7 Jun 2025 02:14:29 +0800 Subject: [PATCH] adios2: replace python3 with python3Packages.python --- pkgs/by-name/ad/adios2/package.nix | 7 +++---- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index a516e34e4961..62897b5ffe31 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -7,7 +7,6 @@ ninja, gfortran, pkg-config, - python3, python3Packages, mpi, bzip2, @@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals pythonSupport [ - python3 + python3Packages.python python3Packages.pybind11 ]; @@ -130,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3.sitePackages) + (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3Packages.python.sitePackages) ]; # required for finding the generated adios2-config.cmake file @@ -143,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' - export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH '' + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b117b9bd0e66..7855a48d4539 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -93,7 +93,6 @@ self: super: with self; { adios2 = toPythonModule ( pkgs.adios2.override { - python3 = python; python3Packages = self; pythonSupport = true; }