mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-18 19:17:31 +03:00
Merge pull request #219304 from NinjaTrappeur/nin/pleroma-2.5.1
pleroma: 2.5.0 -> 2.5.1
This commit is contained in:
commit
72bb4f562a
@ -170,8 +170,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
hosts = nodes: ''
|
hosts = nodes: ''
|
||||||
${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test
|
${nodes.pleroma.networking.primaryIPAddress} pleroma.nixos.test
|
||||||
${nodes.client.config.networking.primaryIPAddress} client.nixos.test
|
${nodes.client.networking.primaryIPAddress} client.nixos.test
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
name = "pleroma";
|
name = "pleroma";
|
||||||
|
@ -8,14 +8,14 @@
|
|||||||
|
|
||||||
beamPackages.mixRelease rec {
|
beamPackages.mixRelease rec {
|
||||||
pname = "pleroma";
|
pname = "pleroma";
|
||||||
version = "2.5.0";
|
version = "2.5.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "git.pleroma.social";
|
domain = "git.pleroma.social";
|
||||||
owner = "pleroma";
|
owner = "pleroma";
|
||||||
repo = "pleroma";
|
repo = "pleroma";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U=";
|
sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4=";
|
||||||
};
|
};
|
||||||
stripDebug = false;
|
stripDebug = false;
|
||||||
|
|
||||||
@ -97,24 +97,6 @@ beamPackages.mixRelease rec {
|
|||||||
majic = prev.majic.override {
|
majic = prev.majic.override {
|
||||||
buildInputs = [ file ];
|
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
|
# Some additional build inputs and build fixes
|
||||||
http_signatures = prev.http_signatures.override {
|
http_signatures = prev.http_signatures.override {
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
@ -179,6 +161,13 @@ beamPackages.mixRelease rec {
|
|||||||
cp ${cfgFile} config/config.exs
|
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";
|
||||||
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -281,6 +281,19 @@ let
|
|||||||
beamDeps = [ ecto ];
|
beamDeps = [ ecto ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
crypt = buildRebar3 rec {
|
||||||
|
name = "crypt";
|
||||||
|
version = "1.0.1";
|
||||||
|
|
||||||
|
src = fetchHex {
|
||||||
|
pkg = "${name}";
|
||||||
|
version = "${version}";
|
||||||
|
sha256 = "10ir7nsa0dkn5jr0w9x2m38jc73aym7llz2pnkwxk9f747izz3cn";
|
||||||
|
};
|
||||||
|
|
||||||
|
beamDeps = [];
|
||||||
|
};
|
||||||
|
|
||||||
custom_base = buildMix rec {
|
custom_base = buildMix rec {
|
||||||
name = "custom_base";
|
name = "custom_base";
|
||||||
version = "0.2.1";
|
version = "0.2.1";
|
||||||
@ -335,12 +348,12 @@ let
|
|||||||
|
|
||||||
earmark = buildMix rec {
|
earmark = buildMix rec {
|
||||||
name = "earmark";
|
name = "earmark";
|
||||||
version = "1.4.18";
|
version = "1.4.22";
|
||||||
|
|
||||||
src = fetchHex {
|
src = fetchHex {
|
||||||
pkg = "${name}";
|
pkg = "${name}";
|
||||||
version = "${version}";
|
version = "${version}";
|
||||||
sha256 = "0q15ypgdr94z425dxb3blp6wqzrphsg1b6wscsfd13lmldnkpb2p";
|
sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw";
|
||||||
};
|
};
|
||||||
|
|
||||||
beamDeps = [ earmark_parser ];
|
beamDeps = [ earmark_parser ];
|
||||||
@ -348,12 +361,12 @@ let
|
|||||||
|
|
||||||
earmark_parser = buildMix rec {
|
earmark_parser = buildMix rec {
|
||||||
name = "earmark_parser";
|
name = "earmark_parser";
|
||||||
version = "1.4.17";
|
version = "1.4.29";
|
||||||
|
|
||||||
src = fetchHex {
|
src = fetchHex {
|
||||||
pkg = "${name}";
|
pkg = "${name}";
|
||||||
version = "${version}";
|
version = "${version}";
|
||||||
sha256 = "08r06hp1wwfbfpalqqxwpq9lsd42pwvmhjr6bcb1r9pckyfchfpr";
|
sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9";
|
||||||
};
|
};
|
||||||
|
|
||||||
beamDeps = [];
|
beamDeps = [];
|
||||||
@ -816,12 +829,12 @@ let
|
|||||||
|
|
||||||
linkify = buildMix rec {
|
linkify = buildMix rec {
|
||||||
name = "linkify";
|
name = "linkify";
|
||||||
version = "0.5.2";
|
version = "0.5.3";
|
||||||
|
|
||||||
src = fetchHex {
|
src = fetchHex {
|
||||||
pkg = "${name}";
|
pkg = "${name}";
|
||||||
version = "${version}";
|
version = "${version}";
|
||||||
sha256 = "11mbbqm7yi6rhza5d2hd4fxkhdy3ik5n7sybj0n9bn0q09lsqwcd";
|
sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry";
|
||||||
};
|
};
|
||||||
|
|
||||||
beamDeps = [];
|
beamDeps = [];
|
||||||
|
Loading…
Reference in New Issue
Block a user