Unverified Commit 3cd3909b authored by 北雁 Cryolitia's avatar 北雁 Cryolitia
Browse files

maa-assistant-arknights: 5.2.3 -> 5.3.1 

upstream break change: https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/9168
parent 150a859d

pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix

+4 −4
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { 
  version = "0-unstable-2023-10-09";



  src = fetchFromGitHub {

    owner = "Cryolitia";

    owner = "MaaAssistantArknights";

    repo = "FastDeploy";

    # follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4

    rev = "2e68908141f6950bc5d22ba84f514e893cc238ea";

    hash = "sha256-BWO4lKZhwNG6mbkC70hPgMNjabTnEV5XMo0bLV/gvQs=";

    # follows but not fully follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4

    rev = "0db6000aaac250824266ac37451f43ce272d80a3";

    hash = "sha256-5TItnPDc5WShpZAgBYeqgI9KKkk3qw/M8HPMlq/H4BM=";

  };



  outputs = [ "out" "cmake" ];

pkgs/by-name/ma/maa-assistant-arknights/package.nix

+0 −21
Original line number Diff line number Diff line
@@ -29,27 +29,6 @@ stdenv.mkDerivation (finalAttr: { 
    hash = if isBeta then sources.beta.hash else sources.stable.hash;

  };



  # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=maa-assistant-arknights

  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail 'RUNTIME DESTINATION .' ' ' \

      --replace-fail 'LIBRARY DESTINATION .' ' ' \

      --replace-fail 'PUBLIC_HEADER DESTINATION .' ' '



    substituteInPlace CMakeLists.txt \

      --replace-fail 'find_package(asio ' '# find_package(asio ' \

      --replace-fail 'asio::asio' ' '



    shopt -s globstar nullglob



    substituteInPlace src/MaaCore/**/{*.h,*.cpp,*.hpp,*.cc} \

      --replace 'onnxruntime/core/session/' ""

    substituteInPlace CMakeLists.txt \

      --replace-fail 'ONNXRuntime' 'onnxruntime'



    cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/

  '';



  nativeBuildInputs = [

    asio

    cmake

pkgs/by-name/ma/maa-assistant-arknights/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "stable": {

    "version": "5.2.3",

    "hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="

    "version": "5.3.1",

    "hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="

  },

  "beta": {

    "version": "5.2.3",

    "hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="

    "version": "5.3.1",

    "hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="

  }

}