From 817a0e1ab1f55f3261cbee1ee0485129070e1c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 8 Aug 2021 19:01:16 +0200 Subject: [PATCH] pleroma: 2.3.0 -> 2.4.0 Eblurhash has been released to hex, we do not need to manually fetch it from a git repository anymore. The rest of the diffs have been generated by mix2nix. A minor bug in mix2nix forced us to manually alter the base64url dependency. The bug was already fixed upstream and should be resolved for us once mix2nix branches off a new release. See https://github.com/ydlr/mix2nix/issues/11 for more infos. Release notes: https://pleroma.social/announcements/2021/08/08/pleroma-major-release-2-4-0/ --- pkgs/servers/pleroma/default.nix | 18 ++---------- pkgs/servers/pleroma/mix.nix | 47 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 01608f1ca46..356d320d4d1 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.3.50"; + version = "2.4.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; - rev = "94687e23938b808a3fff95c92956ec337160cd0b"; - sha256 = "160ss6qhx3007lyb0f5cjzbm5dzxq9q8rfn83l8qfxgan8hliag6"; + rev = "v${version}"; + sha256 = "sha256-1zp/qVk2K3q8AtkfXab0MBAHaQnY5enVtfdu64FFPhg="; }; mixNixDeps = import ./mix.nix { @@ -36,18 +36,6 @@ beamPackages.mixRelease rec { }; beamDeps = with final; [ prometheus ]; }; - eblurhash = beamPackages.buildRebar3 rec { - name = "eblurhash"; - version = "0.0.0"; - - src = fetchFromGitHub { - owner = "zotonic"; - repo = "eblurhash"; - rev = "04a0b76eadf4de1be17726f39b6313b88708fd12"; - sha256 = "1b9r41scg9rn3skx65ssv1q5lczmg0ky6h1y39qajsvdi5w3swyx"; - }; - beamDeps = with final; [ ]; - }; captcha = beamPackages.buildMix rec { name = "captcha"; version = "0.1.0"; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index d32e20b3123..ccced19bf9f 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -346,14 +346,27 @@ let beamDeps = []; }; - ecto = buildMix rec { - name = "ecto"; - version = "3.4.6"; + eblurhash = buildRebar3 rec { + name = "eblurhash"; + version = "1.1.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "02zpyd5mm2zfkz4b839nz1x3ias5av3by1vjzkfc4x9flviaj4vg"; + sha256 = "07dmkbyafpxffh8ar6af4riqfxiqc547rias7i73gpgx16fqhsrf"; + }; + + beamDeps = []; + }; + + ecto = buildMix rec { + name = "ecto"; + version = "3.6.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0kl893yi9jxzxnpd5gafivzazn96z2q24y04lfw8dyg60kxnvbgg"; }; beamDeps = [ decimal jason telemetry ]; @@ -372,27 +385,14 @@ let beamDeps = [ ecto ecto_sql postgrex ]; }; - ecto_explain = buildMix rec { - name = "ecto_explain"; - version = "0.1.2"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "0c3366grl2r7k29a7sxwgqmq670c98sya4p96k7g9v1hmsc7f3hx"; - }; - - beamDeps = []; - }; - ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.4.5"; + version = "3.6.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1hlar4r206szv84qbxc4igg2grvmqaa4mls110y6mcvr6mm0r69i"; + sha256 = "0syv5wjdkywaxx9mmps0x9sdawqp3nnakbnf7av3ksj2yzkdgjay"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -842,12 +842,12 @@ let linkify = buildMix rec { name = "linkify"; - version = "0.5.0"; + version = "0.5.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1mzjkn0f2svn44fhazkhpaxnwn9hbnqha7z2i4fcbrxfa21rbkac"; + sha256 = "0i7r9z49sdxs7nrnh2igmwzzmq9ih4fm02a046klmnps49z8q4m3"; }; beamDeps = []; @@ -1154,12 +1154,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.11.1"; + version = "1.10.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "07w83cx4xx90x4l1kmil4lpby55lpw83jfw3y08pqn5vxx7lwli3"; + sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1517,4 +1517,3 @@ let }; }; in self -