File tree Expand file tree Collapse file tree 3 files changed +4
-11
lines changed Expand file tree Collapse file tree 3 files changed +4
-11
lines changed Original file line number Diff line number Diff line change 319319 electron = pkgs . callPackage ./installers/nix/electron.nix { } ;
320320
321321 tests = {
322- runFlow = self . callPackage ./tests/flow .nix { } ;
322+ runTsc = self . callPackage ./tests/tsc .nix { } ;
323323 runLint = self . callPackage ./tests/lint.nix { } ;
324324 runShellcheck = self . callPackage ./tests/shellcheck.nix { src = ./. ; } ;
325325 } ;
Original file line number Diff line number Diff line change 11{ runCommand , rawapp , source } :
2- runCommand "daedalus-flow -ci" { preferLocalBuild = true ; } ''
3- # flow command fails to ignore the files if node_modules is symlink
2+ runCommand "daedalus-tsc -ci" { preferLocalBuild = true ; } ''
3+ # tsc command fails to ignore the files if node_modules is symlink
44 # so we have to copy the whole directory to run the test
55 cp -a ${ source } /. .
66 chmod -R u+w ./
77 rm -rf node_modules || true
88 cp -a ${ rawapp . node_modules } node_modules
9- node_modules/.bin/flow --quiet
9+ node_modules/.bin/tsc --noEmit
1010 if [ $? == 0 ] || [ $? == 2 ]
1111 then
1212 echo $? > $out
Original file line number Diff line number Diff line change 5858 baseName == "package.json" ||
5959 baseName == "gulpfile.js" ||
6060 ( lib . hasPrefix "/source" sansPrefix ) ||
61- ( lib . hasPrefix "/flow" sansPrefix ) ||
6261 baseName == ".babelrc" ||
6362 sansPrefix == "/scripts" ||
6463 sansPrefix == "/scripts/package.js" ||
@@ -210,12 +209,6 @@ yarn2nix.mkYarnPackage {
210209 rm build/config.gypi
211210 '' ;
212211 } ;
213- flow-bin = {
214- postInstall = ''
215- flow_ver=${ origPackage . devDependencies . "flow-bin" }
216- patchelf --set-interpreter ${ stdenv . cc . libc } /lib/ld-linux-x86-64.so.2 flow-linux64-v$flow_ver/flow
217- '' ;
218- } ;
219212 electron-rebuild = {
220213 postInstall = ''
221214 if [ -d node_modules ]; then
You can’t perform that action at this time.
0 commit comments