Skip to content

Commit 12f0733

Browse files
committed
[DDW-773] updated nix files
1 parent 3ac3401 commit 12f0733

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ let
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
};

tests/flow.nix renamed to tests/tsc.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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

yarn2nix.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ let
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

0 commit comments

Comments
 (0)