mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mastodon: use nodejs 20 and ruby 3.2

Browse Source
This commit is contained in:
Kerstin Humm 2023-09-24 15:04:38 +02:00
parent 0f535d40f9
commit 643b2c56b1
No known key found for this signature in database
GPG Key ID: 40293358C7B9326B
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/mastodon/default.nix
View File

@ -1,5 +1,5 @@
{ 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:

5
pkgs/top-level/all-packages.nix
View File

@ -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 { };