logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: bc7fcc2dba291492ee610478fd72ac41af031ae8
parent 1955b3c55744171333e9070072eafed067a45dd0
Author: lain <lain@soykaf.club>
Date:   Wed, 29 Nov 2023 15:43:09 +0000

Merge branch 'vips' into 'develop'

Docs: Remove rust references

See merge request pleroma/pleroma!3983

Diffstat:

Mchangelog.d/blurhash.change2+-
Achangelog.d/doc-fix.skip0
Mdocs/installation/alpine_linux_en.md2+-
Mdocs/installation/arch_linux_en.md1-
Mdocs/installation/debian_based_en.md2+-
Mdocs/installation/debian_based_jp.md1-
Mdocs/installation/freebsd_en.md2+-
7 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/changelog.d/blurhash.change b/changelog.d/blurhash.change @@ -1 +1 @@ -Replace eblurhash with a rinpatch_blurhash. This also removes a dependency on ImageMagick. +Replace eblurhash with rinpatch_blurhash. This also removes a dependency on ImageMagick. diff --git a/changelog.d/doc-fix.skip b/changelog.d/doc-fix.skip diff --git a/docs/installation/alpine_linux_en.md b/docs/installation/alpine_linux_en.md @@ -28,7 +28,7 @@ sudo apk upgrade * Install some tools, which are needed later: ```shell -sudo apk add git build-base cmake file-dev rust +sudo apk add git build-base cmake file-dev ``` ### Install Elixir and Erlang diff --git a/docs/installation/arch_linux_en.md b/docs/installation/arch_linux_en.md @@ -14,7 +14,6 @@ This guide will assume that you have administrative rights, either as root or a * `base-devel` * `cmake` * `file` -* `rust` #### Optional packages used in this guide diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md @@ -20,7 +20,7 @@ sudo apt full-upgrade * Install some of the above mentioned programs: ```shell -sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-dev rust +sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-dev ``` ### Install Elixir and Erlang diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md @@ -21,7 +21,6 @@ Note: This article is potentially outdated because at this time we may not have - `build-essential` - `cmake` - `libmagic-dev` -- `rust` #### このガイドで利用している追加パッケージ diff --git a/docs/installation/freebsd_en.md b/docs/installation/freebsd_en.md @@ -9,7 +9,7 @@ This document was written for FreeBSD 12.1, but should be work on future release This assumes the target system has `pkg(8)`. ``` -# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake rust vips +# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake vips ``` Copy the rc.d scripts to the right directory: