diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index b555d1e371cd..57f8ea1b6d67 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper +, prefetch-yarn-deps , nodejs , yarn -, yarn2nix-moretea , nixosTests }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-t1m9pKsM9E2iAg9vv/nKmQioRi6kMjFGcTXzcT3cMxs="; }; - nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; + nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; buildInputs = [ yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { export NODE_OPTIONS=--openssl-legacy-provider yarn config --offline set yarn-offline-mirror $yarnOfflineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline \ --frozen-lockfile \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc4e1d26aeb..fd48a2001fd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26789,7 +26789,6 @@ with pkgs; onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { - yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; yarn = yarn.override { inherit (super) nodejs; }; nodejs = nodejs_18; }));