diff options
author | Yuka <yuka@yuka.dev> | 2022-01-12 11:03:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-12 11:03:14 +0100 |
commit | 20df3f6612f15ead16e5f8078dde0e7185b1d123 (patch) | |
tree | cfa2347840f86d2c40f4fa24ccdafb1a0675022f /pkgs/servers/pleroma | |
parent | 734af7329892b7636fa4167b1003b1cf424f3920 (diff) |
pleroma: 2.4.1 -> 2.4.2 (#154729)
https://pleroma.social/announcements/2022/01/11/pleroma-patch-release-2-4-2/
Diffstat (limited to 'pkgs/servers/pleroma')
-rw-r--r-- | pkgs/servers/pleroma/0001-move-result-into-with-guard.patch | 26 | ||||
-rw-r--r-- | pkgs/servers/pleroma/default.nix | 16 | ||||
-rw-r--r-- | pkgs/servers/pleroma/mix.nix | 8 |
3 files changed, 10 insertions, 40 deletions
diff --git a/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch b/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch deleted file mode 100644 index 07b224b1f0daa..0000000000000 --- a/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8af53101fbeb0d4855ffa2b33069e833abf2e825 Mon Sep 17 00:00:00 2001 -From: Finn Behrens <me@kloenk.dev> -Date: Tue, 7 Dec 2021 09:18:53 +0100 -Subject: [PATCH] move result into with guard - ---- - lib/pleroma/web/activity_pub/publisher.ex | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex -index 4f29a44..849b359 100644 ---- a/lib/pleroma/web/activity_pub/publisher.ex -+++ b/lib/pleroma/web/activity_pub/publisher.ex -@@ -63,8 +63,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa - date: date - }) - -- with {:ok, %{status: code}} when code in 200..299 <- -- result = -+ with {:ok, %{status: code}} = result when code in 200..299 <- - HTTP.post( - inbox, - json, --- -2.34.0 - diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index a479bc7b79bf5..ec7de2ac57cdd 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,18 +7,16 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-XYZIf8/Vznl4FvVAOy5GVfTBTCwhfUol/3vWWIDwIxQ="; + sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; }; - patches = [ ./0001-move-result-into-with-guard.patch ]; - mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = (final: prev: { @@ -120,13 +118,11 @@ beamPackages.mixRelease rec { name = "crypt"; version = "0.4.3"; - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; + src = fetchFromGitHub { + owner = "msantos"; repo = "crypt"; - rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"; - sha256 = "0fnzljxy9pwabh1nzx0vawn131d5pdfb0p98kvpkqs441jr0ii73"; + rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; + sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; }; postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so"; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index ccced19bf9fb2..31ab20c294092 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -140,12 +140,12 @@ let certifi = buildRebar3 rec { name = "certifi"; - version = "2.6.1"; + version = "2.8.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0zmvagzisnk7lj5pfipl19mjq9wn70i339hpbkfljf0vk6s9fk2j"; + sha256 = "1slp20z2fgcq9p2bbdp1gj218kjqpx5jsa95sq40nq7qqv0yziva"; }; beamDeps = []; @@ -686,12 +686,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.17.4"; + version = "1.18.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "05kbk3rpw2j3cb9pybikydxmi2nm5pidpx0jsm48av2mjr4zy5ny"; + sha256 = "0pjwbf87nqj2ki3i076whrswh2cdhklj6cbaikdj1mq40xidmz4s"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; |