From 7f1fafe239a1e81155d41074549eadaa8c81068c Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jul 2024 17:05:37 +0900 Subject: [PATCH 1/3] python312Packages.rdkit: 2023.09.5 -> 2024.03.6 Diff: https://github.com/rdkit/rdkit/compare/Release_2023_09_5...Release_2024_03_6 --- pkgs/development/python-modules/rdkit/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 248f212f0abe..fa9b35f3f5fd 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -30,8 +30,8 @@ let yaehmop = fetchFromGitHub { owner = "greglandrum"; repo = "yaehmop"; - rev = "v2023.03.1"; - hash = "sha256-K9//cDN69U4sLETfIZq9NUaBE3RXOReH53qfiCzutqM="; + rev = "v2024.03.1"; + hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; }; freesasa = fetchFromGitHub { owner = "mittinatten"; @@ -40,10 +40,11 @@ let hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ="; }; }; + boost' = boost.override { enableNumpy = true; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.5"; + version = "2024.03.6"; pyproject = false; src = @@ -54,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs="; + hash = "sha256-C9W4hYRO0CRqp3g1sDbVvBWef0ZFxNg5Y9abHI+ixn0="; }; unpackPhase = '' @@ -81,7 +82,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost' cairo catch2_3 ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; From 6d0b35a2e43d66b558813a03fd1a4136cd0e6831 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 4 Jul 2024 18:20:15 +0900 Subject: [PATCH 2/3] python312Packages.rdkit: refactor --- .../python-modules/rdkit/default.nix | 69 ++++++++----------- 1 file changed, 28 insertions(+), 41 deletions(-) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index fa9b35f3f5fd..9306085adc51 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -52,8 +52,8 @@ buildPythonPackage rec { versionTag = lib.replaceStrings [ "." ] [ "_" ] version; in fetchFromGitHub { - owner = pname; - repo = pname; + owner = "rdkit"; + repo = "rdkit"; rev = "Release_${versionTag}"; hash = "sha256-C9W4hYRO0CRqp3g1sDbVvBWef0ZFxNg5Y9abHI+ixn0="; }; @@ -85,9 +85,13 @@ buildPythonPackage rec { boost' cairo catch2_3 + coordgenlibs + eigen + inchi + maeparser ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; - propagatedBuildInputs = [ + dependencies = [ numpy pandas pillow @@ -95,45 +99,28 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; # required by yaehmop - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; - - preConfigure = '' - # Since we can't expand with bash in cmakeFlags - appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" - appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" - appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" - appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" - ''; - cmakeFlags = [ - "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" - "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" - "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" - "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - "-DRDK_INSTALL_INTREE=OFF" - "-DRDK_INSTALL_STATIC_LIBS=OFF" - "-DRDK_BUILD_INCHI_SUPPORT=ON" - "-DRDK_BUILD_AVALON_SUPPORT=ON" - "-DRDK_BUILD_FREESASA_SUPPORT=ON" - "-DRDK_BUILD_YAEHMOP_SUPPORT=ON" - "-DRDK_BUILD_MAEPARSER_SUPPORT=ON" - "-DMAEPARSER_DIR=${maeparser}" - "-DRDK_BUILD_COORDGEN_SUPPORT=ON" - "-DCOORDGEN_DIR=${coordgenlibs}" - "-DRDK_USE_URF=OFF" - "-DRDK_USE_FLEXBISON=OFF" - "-DRDK_BUILD_CAIRO_SUPPORT=ON" - "-DRDK_BUILD_THREADSAFE_SSS=ON" - "-DRDK_TEST_MULTITHREADED=ON" - "-DRDK_BUILD_CPP_TESTS=ON" - "-DRDK_TEST_MULTITHREADED=ON" - "-DPYTHON_EXECUTABLE=${python}/bin/python" - "-DBOOST_ROOT=${boost}" - "-DBoost_NO_SYSTEM_PATHS=ON" - "-DBoost_NO_BOOST_CMAKE=TRUE" - "-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise + (lib.cmakeBool "Boost_NO_BOOST_CMAKE" true) + (lib.cmakeBool "Boost_NO_SYSTEM_PATHS" true) + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) # fails to find libs in pythonImportsCheckPhase otherwise + (lib.cmakeBool "RDK_BUILD_AVALON_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_CAIRO_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_COORDGEN_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_CPP_TESTS" true) + (lib.cmakeBool "RDK_BUILD_FREESASA_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_INCHI_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_MAEPARSER_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_THREADSAFE_SSS" true) + (lib.cmakeBool "RDK_BUILD_YAEHMOP_SUPPORT" true) + (lib.cmakeBool "RDK_INSTALL_INTREE" false) + (lib.cmakeBool "RDK_INSTALL_STATIC_LIBS" false) + (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) + (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) + (lib.cmakeBool "RDK_USE_FLEXBISON" false) + (lib.cmakeBool "RDK_USE_URF" false) + (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") + (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa") + (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi") ]; checkPhase = '' From 47104b5212a50d73f91a7c7908530f25cdd228bb Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 19 Oct 2024 14:03:41 +0900 Subject: [PATCH 3/3] python312Packages.rdkit: 2024.03.6 -> 2024.09.1 Diff: https://github.com/rdkit/rdkit/compare/Release_2024_03_6...Release_2024_09_1 Changelog: https://github.com/rdkit/rdkit/releases/tag/Release_2024_09_1 --- pkgs/development/python-modules/rdkit/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 9306085adc51..ec98f19c271f 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -39,12 +39,18 @@ let rev = "2.0.3"; hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ="; }; + pubchem-align3d = fetchFromGitHub { + owner = "ncbi"; + repo = "pubchem-align3d"; + rev = "daefab3dd0c90ca56da9d3d5e375fe4d651e6be3"; + hash = "sha256-tQB4wqza9rlSoy4Uj9bA99ddawjxGyN9G7DYbcv/Qdo="; + }; }; boost' = boost.override { enableNumpy = true; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2024.03.6"; + version = "2024.09.1"; pyproject = false; src = @@ -55,7 +61,7 @@ buildPythonPackage rec { owner = "rdkit"; repo = "rdkit"; rev = "Release_${versionTag}"; - hash = "sha256-C9W4hYRO0CRqp3g1sDbVvBWef0ZFxNg5Y9abHI+ixn0="; + hash = "sha256-UsyPlAJ8FISblF8szEmRqWansunIhW/gbEBZx13YM+A="; }; unpackPhase = '' @@ -75,6 +81,7 @@ buildPythonPackage rec { chmod +w External/FreeSASA/freesasa/src cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src + ln -s ${external.pubchem-align3d} External/pubchem_shape/pubchem-align3d ln -s ${rapidjson} External/rapidjson-1.1.0 ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; @@ -121,6 +128,7 @@ buildPythonPackage rec { (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa") (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi") + (lib.cmakeFeature "PUBCHEMSHAPE_DIR" "External/pubchem_shape/pubchem-align3d") ]; checkPhase = ''