Fix conflicts

dblsaiko

Mar 19, 2024, 7:30 PM

FYYWB54CXR3FTAQ4HLDTFS6XWBVLWRGKHVMMNKUXDEJ7UWLHXPBQC

Dependencies

• [2] SGQQ6LNZ Attach Boost and SYSTEM def to Nix target instead of plugin
• [3] UZYI7CB2 Fix compile errors on macOS in dev shell
• [4] 7YS2X7JJ Fix compilation against older Nix versions (tested with 2.13.6)
• [5] 3KEFKH5F Import existing code

Change contents

• edit in src/CMakeLists.txt at line 9
  [4.13156]→[3.0:65](∅→∅),[4.13156]→[3.0:65](∅→∅)
  − Boost::headers

  − date::date

  − nlohmann_json)
• resolve order conflict in src/CMakeLists.txt at line 9
  [2.280]

  [4.13180]
• replacement in CMakeLists.txt at line 36
  [2.188]→[2.188:212](∅→∅)
  − Boost::headers)
  [2.188]

  [4.677]
  + Boost::headers

  + date::date

  + nlohmann_json)