X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=4c5a776e07d27abf221f14b9ec3fc288ed176a83;hb=1e6b280280cb61aaeef7c639bdb9728b87572e7f;hp=558e71262fe67fa1a1ccd868399998ae83055055;hpb=ff89d4526a4783fc5283e1d4814f55c2a87d94b1;p=akkoma diff --git a/mix.exs b/mix.exs index 558e71262..4c5a776e0 100644 --- a/mix.exs +++ b/mix.exs @@ -59,8 +59,8 @@ defmodule Pleroma.Mixfile do def copy_nginx_config(%{path: target_path} = release) do File.cp!( - "./installation/pleroma.nginx", - Path.join([target_path, "installation", "pleroma.nginx"]) + "./installation/nginx/akkoma.nginx", + Path.join([target_path, "installation", "akkoma.nginx"]) ) release @@ -194,16 +194,16 @@ defmodule Pleroma.Mixfile do ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, {:restarter, path: "./restarter"}, {:majic, "~> 1.0"}, - {:eblurhash, "~> 1.1.0"}, + {:eblurhash, "~> 1.2.2"}, {:open_api_spex, "~> 3.10"}, - {:elastix, ">= 0.0.0"}, {:search_parser, git: "https://github.com/FloatingGhost/pleroma-contrib-search-parser.git", ref: "08971a81e68686f9ac465cfb6661d51c5e4e1e7f"}, {:nimble_parsec, "~> 1.0", override: true}, {:phoenix_live_dashboard, "~> 0.6.2"}, {:ecto_psql_extras, "~> 0.6"}, - {:elasticsearch, "~> 1.0.0"}, + {:elasticsearch, + git: "https://akkoma.dev/AkkomaGang/elasticsearch-elixir.git", ref: "main"}, # indirect dependency version override {:plug, "~> 1.10.4", override: true}, @@ -215,7 +215,6 @@ defmodule Pleroma.Mixfile do {:mock, "~> 0.3.5", only: :test}, # temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed {:excoveralls, "0.12.3", only: :test}, - {:hackney, "~> 1.18.0", override: true}, {:mox, "~> 1.0", only: :test}, {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test} ] ++ oauth_deps() @@ -349,6 +348,9 @@ defmodule Pleroma.Mixfile do # Pleroma: A lightweight social networking server # Copyright © 2017-#{year} Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only +# Akkoma: The cooler pleroma +# Copyright © 2022-#{year} Akkoma Authors +# SPDX-License-Identifier: AGPL-3.0-only ] |> String.replace("\n", "\\n")