|
78 | 78 | ) |
79 | 79 |
|
80 | 80 | ; NodeJS Loader Dependencies |
81 | | -(define-public node-lts-386 |
| 81 | + |
| 82 | +; TODO: Try with version 20 |
| 83 | +(define-public node-20 |
82 | 84 | (package/inherit node-lts |
83 | | - (name "node-lts-386") |
| 85 | + (name "node-20") |
84 | 86 | (arguments |
85 | 87 | (substitute-keyword-arguments (package-arguments node-lts) |
86 | 88 | ((#:phases phases '%standard-phases) |
87 | 89 | `(modify-phases ,phases |
88 | | - (add-before 'delete-problematic-tests 'delete-problematic-tests-386 |
89 | | - (lambda* (#:key inputs #:allow-other-keys) |
90 | | - ;; FIXME: These tests fail in 386 |
91 | | - (for-each delete-file |
92 | | - '("test/parallel/test-fs-utimes-y2K38.js" |
93 | | - "test/abort/test-zlib-invalid-internals-usage.js")))))))))) |
94 | | - |
95 | | -(define-public libnode-386 |
| 90 | + (delete 'check))))))) ; Tests in 386 architecture fail on upstream |
| 91 | + |
| 92 | +(define-public libnode-20 |
96 | 93 | (package/inherit libnode |
97 | | - (name "libnode-386") |
| 94 | + (name "libnode-20") |
98 | 95 | (arguments |
99 | 96 | (substitute-keyword-arguments (package-arguments libnode) |
100 | 97 | ((#:phases phases '%standard-phases) |
101 | 98 | `(modify-phases ,phases |
102 | | - (add-before 'delete-problematic-tests 'delete-problematic-tests-386 |
103 | | - (lambda* (#:key inputs #:allow-other-keys) |
104 | | - ;; FIXME: These tests fail in 386 |
105 | | - (for-each delete-file |
106 | | - '("test/parallel/test-fs-utimes-y2K38.js" |
107 | | - "test/abort/test-zlib-invalid-internals-usage.js")))))))))) |
| 99 | + (delete 'check))))))) ; Tests in 386 architecture fail on upstream |
108 | 100 |
|
109 | 101 | (define-public espree |
110 | 102 | (package |
@@ -453,14 +445,8 @@ for any host, on any OS. TypeScript compiles to readable, standards-based JavaSc |
453 | 445 | `( |
454 | 446 | ("python" ,python-3) ; Python Loader dependency |
455 | 447 | ("ruby" ,ruby-2.7) ; Ruby Loader dependency |
456 | | - |
457 | | - ; NodeJS Loader dependency (TODO: Fix the tests errors for 386 architecture) |
458 | | - ,@(if (target-x86?) |
459 | | - `(("node" ,node-lts-386) |
460 | | - ("libnode" ,libnode-386)) |
461 | | - `(("node" ,node-lts) |
462 | | - ("libnode" ,libnode))) |
463 | | - |
| 448 | + ("node" ,node-20) ; NodeJS Loader dependency |
| 449 | + ("libnode" ,libnode-20) ; NodeJS Loader dependency |
464 | 450 | ("libuv" ,libuv) ; NodeJS Loader dependency |
465 | 451 | ("espree" ,espree) ; NodeJS Loader dependency |
466 | 452 | ("typescript" ,typescript) ; TypeScript Loader dependency |
|
0 commit comments