diff options
author | Félix Baylac Jacqué <felix@alternativebit.fr> | 2023-03-03 08:05:00 +0100 |
---|---|---|
committer | Félix Baylac Jacqué <felix@alternativebit.fr> | 2023-03-03 08:18:22 +0100 |
commit | 96131c779d678a11a403d2b2d37f5d05bbd32e83 (patch) | |
tree | cbcf992a6790b2d182cffbe04d8e538cd22c36f6 /pkgs/servers | |
parent | 78c4d33c16092e535bc4ba1284ba49e3e138483a (diff) |
pleroma: 2.5.0 -> 2.5.1
Bumping pleroma. Crypt landed in hex, we can remove the custom git override. The manually added git deps were manually double-checked. Upstream changelog: https://git.pleroma.social/pleroma/pleroma/-/releases/v2.5.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/pleroma/default.nix | 29 | ||||
-rw-r--r-- | pkgs/servers/pleroma/mix.nix | 25 |
2 files changed, 28 insertions, 26 deletions
diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 5503a6a78f33a..aac66d1e42512 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -8,14 +8,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U="; + sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4="; }; stripDebug = false; @@ -97,24 +97,6 @@ beamPackages.mixRelease rec { majic = prev.majic.override { buildInputs = [ file ]; }; - crypt = beamPackages.buildRebar3 rec { - name = "crypt"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "msantos"; - repo = "crypt"; - rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; - sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; - }; - - postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so"; - - beamDeps = with final; [ elixir_make ]; - - buildInputs = [ libxcrypt ]; - }; - # Some additional build inputs and build fixes http_signatures = prev.http_signatures.override { patchPhase = '' @@ -179,6 +161,13 @@ beamPackages.mixRelease rec { cp ${cfgFile} config/config.exs ''; }; + + crypt = let + version = prev.crypt.version; + in prev.crypt.override { + buildInputs = [ libxcrypt ]; + postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{hex-source-crypt-${version},crypt}.so"; + }; }); }; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 9bd4619bd795e..d3a07fe26696d 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -281,6 +281,19 @@ let beamDeps = [ ecto ]; }; + crypt = buildRebar3 rec { + name = "crypt"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10ir7nsa0dkn5jr0w9x2m38jc73aym7llz2pnkwxk9f747izz3cn"; + }; + + beamDeps = []; + }; + custom_base = buildMix rec { name = "custom_base"; version = "0.2.1"; @@ -335,12 +348,12 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.18"; + version = "1.4.22"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0q15ypgdr94z425dxb3blp6wqzrphsg1b6wscsfd13lmldnkpb2p"; + sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw"; }; beamDeps = [ earmark_parser ]; @@ -348,12 +361,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.17"; + version = "1.4.29"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "08r06hp1wwfbfpalqqxwpq9lsd42pwvmhjr6bcb1r9pckyfchfpr"; + sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; }; beamDeps = []; @@ -816,12 +829,12 @@ let linkify = buildMix rec { name = "linkify"; - version = "0.5.2"; + version = "0.5.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "11mbbqm7yi6rhza5d2hd4fxkhdy3ik5n7sybj0n9bn0q09lsqwcd"; + sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; }; beamDeps = []; |