update mastodon
This commit is contained in:
parent
03b7e4196a
commit
b04d93811e
10 changed files with 124 additions and 14 deletions
|
@ -16,11 +16,6 @@ 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 {};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
sha256 = "sha256-8LxM+YFOZTWEsljc9Vvq0mBnonhtMNnfqrKCDSk2iZE=";
|
||||
};
|
||||
|
||||
mastodon-gems = bundlerEnv {
|
||||
name = "${pname}-gems-${version}";
|
||||
inherit version;
|
||||
|
@ -45,6 +40,11 @@ stdenv.mkDerivation rec {
|
|||
pname = "${pname}-modules";
|
||||
inherit src version;
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
sha256 = "sha256-ON4hJrj3YIxSE5PJ3ZVLdMC37f8wpf2Olej8M/Bjcks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
|
||||
|
||||
RAILS_ENV = "production";
|
||||
|
@ -52,9 +52,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildPhase = ''
|
||||
export HOME=$PWD
|
||||
# This option is needed for openssl-3 compatibility
|
||||
# Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924
|
||||
export NODE_OPTIONS=--openssl-legacy-provider
|
||||
fixup_yarn_lock ~/yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
|
||||
patchShebangs ~/bin
|
||||
|
@ -119,6 +121,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://joinmastodon.org";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ petabyteboy happy-river erictapen izorkin ];
|
||||
maintainers = with maintainers; [ happy-river erictapen izorkin ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# This file was generated by pkgs.mastodon.updateScript.
|
||||
{ fetchgit, applyPatches }: let
|
||||
src = fetchgit {
|
||||
url = "https://github.com/glitch-soc/mastodon.git";
|
||||
rev = "2f8fb49d1314db931385089bc9004a48700161ad";
|
||||
sha256 = "0jj3p70lb16gn5cmcxnqkjy0aih3a5i38ppfjadyaxjdxhzbr3kd";
|
||||
url = "https://git.0x76.dev/v/mastodon.git";
|
||||
rev = "54101563bbadbfafd9291a867d7fbea6df3a8b7b";
|
||||
sha256 = "1yi0jczfrsrj2rgzyawcpnm4sndyinpqrdaqbv6rz3maa5a0y6qb";
|
||||
};
|
||||
in applyPatches {
|
||||
inherit src;
|
||||
|
|
|
@ -1 +1 @@
|
|||
"4.0.0rc1"
|
||||
"4.0.0rc2"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue