python3Packages.dm-tree: cleanup (#393216)

authored by Gaétan Lepage and committed by GitHub ee4dd4eb 6a6c6f21

+5 -23
-21
pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch
··· 1 - diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt 2 - index 4fd1b1a..2d1d9d3 100644 3 - --- a/tree/CMakeLists.txt 4 - +++ b/tree/CMakeLists.txt 5 - @@ -40,16 +40,6 @@ if (NOT (WIN32 OR MSVC)) 6 - endif() 7 - endif() 8 - 9 - -if(APPLE) 10 - - # On MacOS: 11 - - # -undefined dynamic_lookup is necessary for pybind11 linking 12 - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -w -undefined dynamic_lookup") 13 - - 14 - - # On MacOS, we need this so that CMake will use the right Python if the user 15 - - # has a virtual environment active 16 - - set (CMAKE_FIND_FRAMEWORK LAST) 17 - -endif() 18 - - 19 - # Fetch pybind to be able to use pybind11_add_module symbol. 20 - set(PYBIND_VER v2.10.1) 21 - include(FetchContent)
+4 -1
pkgs/development/python-modules/dm-tree/default.nix
··· 30 30 tag = version; 31 31 hash = "sha256-cHuaqA89r90TCPVHNP7B1cfK+WxqmfTXndJ/dRdmM24="; 32 32 }; 33 - 34 33 # Allows to forward cmake args through the conventional `cmakeFlags` 35 34 postPatch = '' 36 35 substituteInPlace setup.py \ 37 36 --replace-fail \ 38 37 "cmake_args = [" \ 39 38 'cmake_args = [ *os.environ.get("cmakeFlags", "").split(),' 39 + substituteInPlace tree/CMakeLists.txt \ 40 + --replace-fail \ 41 + "CMAKE_CXX_STANDARD 14" \ 42 + "CMAKE_CXX_STANDARD 17" 40 43 ''; 41 44 cmakeFlags = [ 42 45 (lib.cmakeBool "USE_SYSTEM_ABSEIL" true)
+1 -1
pkgs/top-level/python-packages.nix
··· 3945 3945 dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; 3946 3946 3947 3947 dm-tree = callPackage ../development/python-modules/dm-tree { 3948 - abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; }; 3948 + inherit (pkgs) abseil-cpp; 3949 3949 }; 3950 3950 3951 3951 dmenu-python = callPackage ../development/python-modules/dmenu { };