From 87d0ac804e1cf87c2c257d18e8bb7f1ec44f7229 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 20 Dec 2019 16:38:35 -0600 Subject: npm: add Python 3 support (#14255) --- var/spack/repos/builtin/packages/npm/package.py | 35 +++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 782b2b6cfa..3d6d119c9b 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -4,21 +4,52 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import shutil from spack import * -class Npm(AutotoolsPackage): +# NOTE: not actually an Autotools package +class Npm(Package): """npm: A package manager for javascript.""" homepage = "https://github.com/npm/npm" # base http://www.npmjs.com/ - url = "https://registry.npmjs.org/npm/-/npm-3.10.5.tgz" + url = "https://registry.npmjs.org/npm/-/npm-6.13.4.tgz" + version('6.13.4', sha256='a063290bd5fa06a8753de14169b7b243750432f42d01213fbd699e6b85916de7') version('3.10.9', sha256='fb0871b1aebf4b74717a72289fade356aedca83ee54e7386e38cb51874501dd6') version('3.10.5', sha256='ff019769e186152098841c1fa6325e5a79f7903a45f13bd0046a4dc8e63f845f') depends_on('node-js', type=('build', 'run')) + # npm 6.13.4 ships with node-gyp 5.0.5, which contains several Python 3 + # compatibility issues on macOS. Manually update to node-gyp 6.0.1 for + # full Python 3 support. + resource(name='node-gyp', destination='node-gyp', + url='https://registry.npmjs.org/node-gyp/-/node-gyp-6.0.1.tgz', + sha256='bbc0e137e17a63676efc97a0e3b1fcf101498a1c2c01c3341cd9491f248711b8') + resource(name='env-paths', destination='env-paths', + url='https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz', + sha256='168b394fbca60ea81dc84b1824466df96246b9eb4d671c2541f55f408a264b4c') + + phases = ['configure', 'build', 'install'] + + def patch(self): + shutil.rmtree('node_modules/node-gyp') + install_tree('node-gyp/package', 'node_modules/node-gyp') + filter_file('"node-gyp": "^5.0.5"', '"node-gyp": "^6.0.1"', + 'package.json', string=True) + install_tree('env-paths/package', 'node_modules/env-paths') + + def configure(self, spec, prefix): + configure('--prefix={0}'.format(prefix)) + + def build(self, spec, prefix): + make() + + def install(self, spec, prefix): + make('install') + def setup_dependent_build_environment(self, env, dependent_spec): npm_config_cache_dir = "%s/npm-cache" % dependent_spec.prefix if not os.path.isdir(npm_config_cache_dir): -- cgit v1.2.3-60-g2f50