New node version, including NPM. NPM is no longer needed.

component/cloud9/buildout.cfg

+[buildout]
+extends =
+  ../component/dcron/buildout.cfg
+  ../component/logrotate/buildout.cfg
+  ../component/rdiff-backup/buildout.cfg
+  ../component/nodejs.cfg
+
+parts =
+  nodejs-0.4
+  npm
+  cloud9
+
+[cloud9]
+# Online IDE written in javascript/node.js
+# URL : c9.io
+# You can use it using the following command :
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
+recipe = plone.recipe.command
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command =
+  ${npm:install_module_snippet} cloud9
+  # Fix 0.5.1 bug
+  ln -s node_modules/cloud9/bin/cloud9.js node_modules/cloud9/server/cloud9/.
+cloud9_js_location = ${:destination}/node_modules/cloud9/server/cloud9/cloud9.js

component/nodejs/buildout.cfg

@@ -29,8 +29,8 @@ environment =
 
 [nodejs-0.6]
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.6/node-v0.6.6.tar.gz
-md5sum = 43836ebd6e8e9059c4584e3b5ab50009
+url = http://nodejs.org/dist/v0.6.10/node-v0.6.10.tar.gz
+md5sum = 8a74fd5d48c2c7c64abc60b2b8f3fbc7
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
@@ -40,16 +40,3 @@ environment =
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[npm]
-# Node.js Package Manager
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-commit = 3136abc5c6b3ed332c4700ece24450fada63639b
-branch = upstream
-origin = https://github.com/isaacs/npm.git
-git-bin = ${git:location}/bin/git
-command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${nodejs:location}/bin/node cli.js install npm -g -f) || (rm -fr ${:location}; exit 1)
-update-command =
-

software/kvm/software.cfg

@@ -29,7 +29,6 @@ parts =
   check-local-eggs
   check-local-eggs2
   nodejs
-  npm
   http-proxy
   proxy-by-url
   npm-modules
@@ -160,11 +159,11 @@ command =
   rm -fr ${:destination} &&
   mkdir -p ${:destination} &&
   cd ${:destination} &&
-  ${nodejs:location}/bin/node ${npm:location}/bin/npm install colors@0.6.0-1 &&
-  ${nodejs:location}/bin/node ${npm:location}/bin/npm install socket.io@0.8.7 &&
-  ${nodejs:location}/bin/node ${npm:location}/bin/npm install socket.io-client@0.8.7 &&
-  ${nodejs:location}/bin/node ${npm:location}/bin/npm install optimist@0.3.1 &&
-  ${nodejs:location}/bin/node ${npm:location}/bin/npm install pkginfo@0.2.3
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3
 
 
 [template-kvm]