mobilizon: 5.2.0 -> 5.2.2 (#479172)

This commit is contained in:
Kerstin
2026-01-14 19:49:15 +00:00
committed by GitHub
6 changed files with 281 additions and 208 deletions
+13
View File
@@ -0,0 +1,13 @@
diff --git a/lib/federation/activity_pub/types/resources.ex b/lib/federation/activity_pub/types/resources.ex
index fd1831e68..0fa00129a 100644
--- a/lib/federation/activity_pub/types/resources.ex
+++ b/lib/federation/activity_pub/types/resources.ex
@@ -4,7 +4,7 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Resources do
alias Mobilizon.Actors.Actor
alias Mobilizon.Federation.ActivityPub.Permission
alias Mobilizon.Federation.ActivityPub.Types.Entity
- alias alias Mobilizon.Federation.ActivityStream
+ alias Mobilizon.Federation.ActivityStream
alias Mobilizon.Federation.ActivityStream.Convertible
alias Mobilizon.Resources.Resource
alias Mobilizon.Service.Activity.Resource, as: ResourceActivity
+2 -2
View File
@@ -2,13 +2,13 @@
rec {
pname = "mobilizon";
version = "5.2.0";
version = "5.2.2";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "kaihuri";
repo = pname;
tag = version;
hash = "sha256-wsiu0f0M0SMjgskMJuA/wUx6IxT7bTzHrOnxX8eFq9g=";
hash = "sha256-SPkkanqEuxcZ7x0rqRk0pcB2c2rg08DcTO+SWP4cEqk=";
};
}
+5 -6
View File
@@ -19,6 +19,9 @@ in
mixRelease rec {
inherit (common) pname version src;
# A typo that is a build failure on elixir 1.18
patches = [ ./alias.patch ];
nativeBuildInputs = [
git
cmake
@@ -46,17 +49,13 @@ mixRelease rec {
repo = "cldr";
rev = "v${old.version}";
hash =
assert old.version == "2.37.5";
"sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs=";
assert old.version == "2.44.1";
"sha256-5XLPQYDW9yV0ZkWbyiB2s213GTccFjdqckBmx09n4eE=";
};
postInstall = ''
cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/
'';
});
# Upstream issue: https://github.com/bryanjos/geo_postgis/pull/87
geo_postgis = prev.geo_postgis.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.ecto ];
});
# The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently.
web_push_encryption = buildMix {
+1 -1
View File
@@ -11,7 +11,7 @@ in
buildNpmPackage {
inherit (common) pname version src;
npmDepsHash = "sha256-0eemOn96ciiqdNBZC+cFbcaEvZ5nkV9IndsXOzIgelQ=";
npmDepsHash = "sha256-zcYx7Iv+fWMSr1BeX4C9DXwugRq8z+lNhNcwoCz1Pug=";
nativeBuildInputs = [ imagemagick ];
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -2007,7 +2007,7 @@ with pkgs;
mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
mobilizon = callPackage ../servers/mobilizon {
beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_15; });
beamPackages = beam.packages.erlang_27.extend (self: super: { elixir = self.elixir_1_18; });
mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
};