mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
mobilizon: 5.1.2 -> 5.1.4
Changelog: https://framagit.org/kaihuri/mobilizon/-/releases/5.1.4
This commit is contained in:
parent
72e9f57328
commit
2e501491d6
5 changed files with 4 additions and 49 deletions
|
@ -1,13 +0,0 @@
|
|||
diff --git a/mix.exs b/mix.exs
|
||||
index 8338abf8..883e6987 100644
|
||||
--- a/mix.exs
|
||||
+++ b/mix.exs
|
||||
@@ -1,7 +1,7 @@
|
||||
defmodule Mobilizon.Mixfile do
|
||||
use Mix.Project
|
||||
|
||||
- @version "5.1.0"
|
||||
+ @version "5.1.2"
|
||||
|
||||
def project do
|
||||
[
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex
|
||||
index 8a78ef27..788ccc30 100644
|
||||
--- a/lib/web/proxy/reverse_proxy.ex
|
||||
+++ b/lib/web/proxy/reverse_proxy.ex
|
||||
@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do
|
||||
@spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) ::
|
||||
Plug.Conn.t()
|
||||
defp response(conn, client, url, status, headers, opts) do
|
||||
+ headers = build_resp_headers(headers, opts)
|
||||
+ # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding
|
||||
+ headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end)
|
||||
+
|
||||
result =
|
||||
conn
|
||||
- |> put_resp_headers(build_resp_headers(headers, opts))
|
||||
+ |> put_resp_headers(headers)
|
||||
|> send_chunked(status)
|
||||
|> chunk_reply(client, opts)
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
rec {
|
||||
|
||||
pname = "mobilizon";
|
||||
version = "5.1.2";
|
||||
version = "5.1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "framasoft";
|
||||
owner = "kaihuri";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM=";
|
||||
sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20,19 +20,6 @@ in
|
|||
mixRelease rec {
|
||||
inherit (common) pname version src;
|
||||
|
||||
patches = [
|
||||
# Version 5.1.2 failed to bump their internal package version,
|
||||
# which causes issues with static file serving in the NixOS module.
|
||||
./0001-fix-version.patch
|
||||
# Mobilizon uses chunked Transfer-Encoding for the media proxy but also
|
||||
# sets the Content-Length header. This is a HTTP/1.1 protocol violation
|
||||
# and results in nginx >=1.24 rejecting the response with this error:
|
||||
# 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same
|
||||
# time while reading response header from upstream'
|
||||
# Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604
|
||||
./0002-fix-media-proxy.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
cmake
|
||||
|
|
|
@ -11,7 +11,7 @@ in
|
|||
buildNpmPackage {
|
||||
inherit (common) pname version src;
|
||||
|
||||
npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0=";
|
||||
npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc=";
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue