b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #234747 from NinjaTrappeur/nin/pleroma-252

Browse source
This commit is contained in:
Ninjatrappeur 2023-05-30 11:28:46 +02:00 committed by GitHub
parent 55a154c449 e0688e7fd0
commit 2435bbb9a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/pleroma/default.nix
View file

@ -8,14 +8,14 @@
beamPackages.mixRelease rec {
pname = "pleroma";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4=";
sha256 = "sha256-5qxop/hJj1hIsEcK6vJnI2RnAcLf3tO43B0e0FcNZcA=";
};
mixNixDeps = import ./mix.nix {
@ -160,13 +160,6 @@ beamPackages.mixRelease rec {
cp ${cfgFile} config/config.exs
'';
};
crypt = let
version = prev.crypt.version;
in prev.crypt.override {
buildInputs = [ libxcrypt-legacy ];
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{hex-source-crypt-${version},crypt}.so";
};
});
};

13
pkgs/servers/pleroma/mix.nix
View file

@ -281,19 +281,6 @@ 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";