From 8a390f8aef29dbb4584a58a547104fbd366e9a0d Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jan 2022 10:45:50 +0100 Subject: [PATCH] pleroma: 2.4.1 -> 2.4.2 (cherry picked from commit e8a97b657117835d34e88bb42c259c0bb7cb8faf) --- pkgs/servers/pleroma/default.nix | 14 ++++++-------- pkgs/servers/pleroma/mix.nix | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index f8092419215d..759abd430362 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ 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="; }; mixNixDeps = import ./mix.nix { @@ -118,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 ccced19bf9fb..31ab20c29409 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 ];