Merge pull request #253703 from dotlambda/rstudio-fetchYarnDeps

rstudio: use fetchYarnDeps
This commit is contained in:
Weijia Wang 2023-09-07 00:42:43 +02:00 committed by GitHub
commit fabbb7f50d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9032 deletions

View file

@ -30,6 +30,7 @@
, postgresql
, nodejs
, mkYarnModules
, fetchYarnDeps
, qmake
, server ? false # build server version
, sqlite
@ -64,11 +65,14 @@ let
sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y=";
};
panmirrorModules = mkYarnModules {
panmirrorModules = mkYarnModules rec {
inherit pname version;
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarndeps.nix;
yarnLock = "${src}/src/gwt/panmirror/src/editor/yarn.lock";
offlineCache = fetchYarnDeps {
inherit yarnLock;
hash = "sha256-v05Up6VMlYlvgUYQVYo+YfpcsMohliNfMgyjq6QymCI=";
};
};
description = "Set of integrated tools for the R language";

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff