BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mastodon: 3.4.6 -> 3.5.0

Browse source 
Co-authored-by: Izorkin <izorkin@elven.pw>
This commit is contained in:
Kerstin Humm 2022-03-21 00:35:17 +01:00 committed by Kerstin
parent 8d45556f05
commit 513f7beb55
4 changed files with 522 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/servers/mastodon/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, fetchpatch, bundlerEnv, nixosTests
{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock
@ -16,17 +16,9 @@ stdenv.mkDerivation rec {
# Putting the callPackage up in the arguments list also does not work.
src = if srcOverride != null then srcOverride else callPackage ./source.nix {};
patches = [
(fetchpatch {
name = "CVE-2022-0432.patch";
url = "https://github.com/mastodon/mastodon/commit/4d6d4b43c6186a13e67b92eaf70fe1b70ea24a09.patch";
sha256 = "sha256-C18X2ErBqP/dIEt8NrA7hdiqxUg5977clouuu7Lv4/E=";
})
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-Z+nFMJcC2f+nDUxa2vPYnNezMLBGXfLdh+xMXPHqYyw=";
sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w=";
};
mastodon-gems = bundlerEnv {
@ -53,7 +45,7 @@ stdenv.mkDerivation rec {
pname = "${pname}-modules";
inherit src version;
nativeBuildInputs = [ fixup_yarn_lock mastodon-gems nodejs-slim yarn ];
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
RAILS_ENV = "production";
NODE_ENV = "production";
@ -63,8 +55,13 @@ stdenv.mkDerivation rec {
fixup_yarn_lock ~/yarn.lock
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
patchShebangs ~/bin
patchShebangs ~/node_modules
# skip running yarn install
rm -rf ~/bin/yarn
OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder \
rails assets:precompile
yarn cache clean --offline

908
pkgs/servers/mastodon/gemset.nix
View file

File diff suppressed because it is too large Load diff

6
pkgs/servers/mastodon/source.nix
View file

@ -2,10 +2,10 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/tootsuite/mastodon.git";
rev = "v3.4.6";
sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs";
rev = "v3.5.0";
sha256 = "1181zqz7928b6mnp4p502gy2rrwxyv5ysgfydx0n04y8wiq00g48";
};
in applyPatches {
inherit src;
patches = [ ];
patches = [];
}

2
pkgs/servers/mastodon/version.nix
View file

@ -1 +1 @@
"3.4.6"
"3.5.0"