Unverified Commit 643b2c56 authored by Kerstin Humm's avatar Kerstin Humm
Browse files

mastodon: use nodejs 20 and ruby 3.2

parent 0f535d40

pkgs/servers/mastodon/default.nix

+2 −3
Original line number Diff line number Diff line 
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests

, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript

, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript

, fetchYarnDeps, fixup_yarn_lock

, brotli
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec { 


  mastodonGems = bundlerEnv {

    name = "${pname}-gems-${version}";

    inherit version gemset;

    ruby = ruby_3_0;

    inherit version gemset ruby;

    gemdir = src;

    # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem

    # symlinks with directories, resolving this error when running rake:

pkgs/top-level/all-packages.nix

+4 −1
Original line number Diff line number Diff line
@@ -26594,7 +26594,10 @@ with pkgs; 














  maker-panel = callPackage ../tools/misc/maker-panel { };



























  mastodon = callPackage ../servers/mastodon { };













  mastodon = callPackage ../servers/mastodon {













    nodejs-slim = nodejs-slim_20;













    ruby = ruby_3_2;













  };





























  gotosocial = callPackage ../servers/gotosocial { };