dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #269999 from Stunkymonkey/outline-migrate-prefetch-yarn-deps

Browse Source 
outline: migrate to prefetch-yarn-deps
This commit is contained in:
Pierre Bourdon 2023-11-26 14:39:44 +01:00 committed by GitHub
commit 9c9eee2f11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/web-apps/outline/default.nix
View File

@ -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 \

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

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