diff options
| author | Kerstin Humm <kerstin@erictapen.name> | 2023-09-24 15:04:38 +0200 |
|---|---|---|
| committer | Kerstin Humm <kerstin@erictapen.name> | 2023-11-14 21:13:45 +0100 |
| commit | 643b2c56b12a01caabdda9497e211d341e8612a4 (patch) | |
| tree | 77227d7f72a1b678d77b2bbd61cbb514eebb0d5f | |
| parent | 0f535d40f93eec1c962b8b345e8a3717fde3b811 (diff) | |
| download | nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar.gz nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar.bz2 nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar.lz nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar.xz nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.tar.zst nixpkgs-643b2c56b12a01caabdda9497e211d341e8612a4.zip | |
mastodon: use nodejs 20 and ruby 3.2
| -rw-r--r-- | pkgs/servers/mastodon/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 31a092359cf..7b20fe7038f 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -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: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0e53206b9e..d7a099d17a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |