diff options
| author | Izorkin <izorkin@elven.pw> | 2022-04-07 10:11:32 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-04-07 12:17:49 +0000 |
| commit | 25f7fe1dbd47d2a40956285e67f642f65af229c8 (patch) | |
| tree | a284955e92f4d7d62361fbd30e0394e26c123400 | |
| parent | Merge #165225: nixos/tests/quorum: fix by syncing from master (diff) | |
| download | nixpkgs-origin/backport-167655-to-release-21.11.tar.gz | |
mastodon: fix indexing statuses in elasticsearchorigin/backport-167655-to-release-21.11
(cherry picked from commit 6e629bf17fbee30b63f3346141b268ed369f90bc)
| -rw-r--r-- | pkgs/servers/mastodon/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index ef4c22b1c2c0..84010a090368 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock +, fetchpatch # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w="; }; + patches = [ + # Fix indexing statuses in ElasticSearch + (fetchpatch { + url = "https://github.com/mastodon/mastodon/commit/ef196c913c77338be5ebb1e02af2f6225f857080.patch"; + sha256 = "sha256-uw8m6j4BzMQtev0LNLeIHW0xOJEmj3JikT/6gVfmvzs="; + }) + ]; + mastodon-gems = bundlerEnv { name = "${pname}-gems-${version}"; inherit version; |