pleroma: 2.4.1 -> 2.4.2 (#154729)

https://pleroma.social/announcements/2022/01/11/pleroma-patch-release-2-4-2/

authored by Yuka and committed by GitHub 20df3f66 734af732

+10 -40
-26
pkgs/servers/pleroma/0001-move-result-into-with-guard.patch
··· 1 - From 8af53101fbeb0d4855ffa2b33069e833abf2e825 Mon Sep 17 00:00:00 2001 2 - From: Finn Behrens <me@kloenk.dev> 3 - Date: Tue, 7 Dec 2021 09:18:53 +0100 4 - Subject: [PATCH] move result into with guard 5 - 6 - --- 7 - lib/pleroma/web/activity_pub/publisher.ex | 3 +-- 8 - 1 file changed, 1 insertion(+), 2 deletions(-) 9 - 10 - diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex 11 - index 4f29a44..849b359 100644 12 - --- a/lib/pleroma/web/activity_pub/publisher.ex 13 - +++ b/lib/pleroma/web/activity_pub/publisher.ex 14 - @@ -63,8 +63,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa 15 - date: date 16 - }) 17 - 18 - - with {:ok, %{status: code}} when code in 200..299 <- 19 - - result = 20 - + with {:ok, %{status: code}} = result when code in 200..299 <- 21 - HTTP.post( 22 - inbox, 23 - json, 24 - -- 25 - 2.34.0 26 -
+6 -10
pkgs/servers/pleroma/default.nix
··· 7 7 8 8 beamPackages.mixRelease rec { 9 9 pname = "pleroma"; 10 - version = "2.4.1"; 10 + version = "2.4.2"; 11 11 12 12 src = fetchFromGitLab { 13 13 domain = "git.pleroma.social"; 14 14 owner = "pleroma"; 15 15 repo = "pleroma"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-XYZIf8/Vznl4FvVAOy5GVfTBTCwhfUol/3vWWIDwIxQ="; 17 + sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; 18 18 }; 19 - 20 - patches = [ ./0001-move-result-into-with-guard.patch ]; 21 19 22 20 mixNixDeps = import ./mix.nix { 23 21 inherit beamPackages lib; ··· 120 118 name = "crypt"; 121 119 version = "0.4.3"; 122 120 123 - src = fetchFromGitLab { 124 - domain = "git.pleroma.social"; 125 - group = "pleroma"; 126 - owner = "elixir-libraries"; 121 + src = fetchFromGitHub { 122 + owner = "msantos"; 127 123 repo = "crypt"; 128 - rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"; 129 - sha256 = "0fnzljxy9pwabh1nzx0vawn131d5pdfb0p98kvpkqs441jr0ii73"; 124 + rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; 125 + sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; 130 126 }; 131 127 132 128 postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
+4 -4
pkgs/servers/pleroma/mix.nix
··· 140 140 141 141 certifi = buildRebar3 rec { 142 142 name = "certifi"; 143 - version = "2.6.1"; 143 + version = "2.8.0"; 144 144 145 145 src = fetchHex { 146 146 pkg = "${name}"; 147 147 version = "${version}"; 148 - sha256 = "0zmvagzisnk7lj5pfipl19mjq9wn70i339hpbkfljf0vk6s9fk2j"; 148 + sha256 = "1slp20z2fgcq9p2bbdp1gj218kjqpx5jsa95sq40nq7qqv0yziva"; 149 149 }; 150 150 151 151 beamDeps = []; ··· 686 686 687 687 hackney = buildRebar3 rec { 688 688 name = "hackney"; 689 - version = "1.17.4"; 689 + version = "1.18.0"; 690 690 691 691 src = fetchHex { 692 692 pkg = "${name}"; 693 693 version = "${version}"; 694 - sha256 = "05kbk3rpw2j3cb9pybikydxmi2nm5pidpx0jsm48av2mjr4zy5ny"; 694 + sha256 = "0pjwbf87nqj2ki3i076whrswh2cdhklj6cbaikdj1mq40xidmz4s"; 695 695 }; 696 696 697 697 beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ];