From f880f6ba3ba60cfed126fe70a998c64a8cc75239 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 22:57:41 +0100 Subject: [PATCH] mastodon: migrate to prefetch-yarn-deps --- pkgs/servers/mastodon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 0fa099881d96..ac4083fd9be7 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript -, fetchYarnDeps, fixup_yarn_lock +, fetchYarnDeps, prefetch-yarn-deps , brotli # Allow building a fork or custom version of Mastodon: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { hash = yarnHash; }; - nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # 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 + fixup-yarn-lock ~/yarn.lock yarn config --offline set yarn-offline-mirror $yarnOfflineCache yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress