ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-18 19:17:31 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #219304 from NinjaTrappeur/nin/pleroma-2.5.1

Browse Source 
pleroma: 2.5.0 -> 2.5.1
This commit is contained in:
superherointj 2023-03-03 13:28:02 -03:00 committed by GitHub
commit 72bb4f562a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/pleroma.nix
View File

@ -170,8 +170,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
'';
hosts = nodes: ''
${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test
${nodes.client.config.networking.primaryIPAddress} client.nixos.test
${nodes.pleroma.networking.primaryIPAddress} pleroma.nixos.test
${nodes.client.networking.primaryIPAddress} client.nixos.test
'';
in {
name = "pleroma";

29
pkgs/servers/pleroma/default.nix
View File

@ -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";
};
});
};

25
pkgs/servers/pleroma/mix.nix
View File

@ -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 = [];