Commit graph

87 commits

Author SHA1 Message Date
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Michael Raskin
0fb2c3e85a Add unstable NodeJS — Fixes #4264 (mostly merges the PR from Bodil Stokke) 2014-11-09 18:18:56 +03:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Sander van der Burg
cddc7382ef nodejs: disable usage of http-parser library on darwin, because it breaks the build 2014-10-22 17:51:24 +02:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Sander van der Burg
a2865eb8e0 nodejs: Bump to version 0.10.32 2014-09-17 16:48:37 +02:00
Vladimír Čunát
d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Jaka Hudoklin
7ff4ffd998 nodePackages: add support for recursive dependencies
This is a drop-in replacement that handles nodejs recursive dependencies by
propagating already visited nodejs packages and creating shims for recursive
ones. This implementation handles both, new and old npm2nix output format.
2014-09-09 22:46:11 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Michael Raskin
eaac469f11 Merge pull request #3337 from tailhook/node_permission_error
Add `--no-same-permission` to `tar` command in node package builder
2014-08-23 12:38:35 +04:00
Linquize
9d678f78bd nodejs: Update to 0.10.30 2014-08-10 12:45:38 +08:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Jaka Hudoklin
b9b5e84081 Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook
buildNodePackage: add shell hook for development
2014-07-26 08:53:52 +02:00
Paul Colomiets
7b1a863f1e Add --no-same-permission to tar command in node package builder
This is because of an error while using `nix` under Archlinux:
```
building path(s) `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources'
building /nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources
suspicious ownership or permission on `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources'; rejecting this build output
cannot build derivation `/nix/store/01qsszx9y2kyx1x72zr5magy2la98720-uglify-js-2.4.15.drv': 1 dependencies couldn't be built
```

The permissions on all file are like the following:
```
drwxrwxr-x 1 root root    358 Jun  9 17:04 .
drwxr-xr-x 1 root root 421110 Jul 21 15:49 ..
-rw-rw-r-- 1 root root     22 Jun  9 17:04 .gitattributes
```
After the fix, permissions are OK, and no suspicious error any more.

Error is encountered for any node package built. I'm not sure why it
fails on Arch but work on nixos, but I believe the flag is safe to add
anyway.
2014-07-21 18:54:21 +03:00
Linquize
446d3253d5 nodejs: Update to 0.10.29 2014-06-29 11:47:07 +08:00
Jaka Hudoklin
05ce47f8ec buildNodePackage: add shell hook for development 2014-06-18 13:14:15 +02:00
Lennart Kats
3e3e9daafe Update Node.js to 0.10.28 2014-05-09 15:45:21 +02:00
Rob Vermaas
b116679b24 Force --no-same-owner for unpacking node sources. 2014-05-06 14:57:58 +02:00
Jaka Hudoklin
cbfbd01cd7 nodejs: fix on i686-linux
Fixes this:

  creating  ./config.gypi
  creating  ./config.mk
  building
  make flags: SHELL=/nix/store/fp0nwhj932kscakw1gbnlmmk8pdfv9sq-bash-4.2-p45/bin/bash
  building out/Makefile
  /nix/store/vh2zy8l2797yl3mri35y8jnhc81w9hm1-python-2.7.6/bin/python tools/gyp_node.py -f make
  /bin/sh: which: command not found
  gyp: Call to '(echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true' returned exit status 0.
  make: *** [out/Makefile] Error 1

[Bjørn: add build error to commit message.]
2014-04-29 22:29:24 +02:00
Mathijs Kwik
925c75c68d node.js - use bundled v8 :14.04-bugfix:
node needs v8 3.14, which is no longer maintained.
They bundle an in-tree version which does receive backports.
2014-04-24 08:05:44 +02:00
Shea Levy
3b93b7bfe6 nodejs: Fix configuration 2014-04-21 09:05:34 -04:00
aszlig
4c8ec5e12e
v8: Bring back old version 3.14.
The current version of v8 breaks builds of nodejs, mongodb and
rethinkdb. So let's bring back the old package with annoying _3_14
version suffix so hopefully the corresponding maintainers will get rid
of that dependency :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-19 03:58:44 +02:00
Evgeny Egorochkin
3b6d3eebc5 nodejs: update from 0.10.25 to 0.10.26 2014-02-27 18:53:48 +02:00
Sander van der Burg
81408168f2 nodejs: fix the patch to make it build on darwin 2014-02-04 18:03:21 +01:00
Shea Levy
bc6aa21b05 nodejs: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:40:04 -05:00
Shea Levy
3c9ed5b51a http-parser: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:37:20 -05:00
Sander van der Burg
db3220a59a Fixed xcode patch to make nodejs work on darwin again 2014-01-13 13:48:04 +01:00
Nixpkgs Monitor
3ba75f925d nodejs: update from 0.10.22 to 0.10.24 2014-01-08 18:44:11 +01:00
Sander van der Burg
3b766653c6 Ported to old no-xcode patch to the current nodejs, so that it can be built on Darwin again 2013-12-17 11:13:55 +01:00
Shea Levy
d34e1ac42c fix build-node-package
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-26 10:18:42 -05:00
Shea Levy
2186207b82 node: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-25 00:08:09 -05:00
Shea Levy
9817bada91 Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 18:02:21 -05:00
Domen Kožar
92613863fe nodejs: 0.10.12 -> 0.10.21 (security fixes) 2013-10-19 13:52:03 +02:00
Shea Levy
b8872549b7 Fix peerDependency handling in buildNodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-30 09:02:44 -04:00
Rob Vermaas
115e78216e Update nodejs to 0.10.12 2013-08-21 21:45:28 +02:00
Shea Levy
7188cc39fa Add karma nodePackage
Required updating to npm2nix 5.1.0 for peerDependency cycle management

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-20 18:56:20 -04:00
Shea Levy
67eb2c8ad3 Handle peerDependencies in nodePackages
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-08-18 19:28:51 -04:00
Sander van der Burg
c1fcb0c2e6 Make the setup-hook work again now that nodejs modules reside in lib/node_modules 2013-07-30 13:00:05 +02:00
Shea Levy
5c66a46bc6 buildNodePackage: Fix $out/bin symlink
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-28 11:46:40 -04:00
Shea Levy
93cdc526c3 buildNodePackages: Move /node_modules to /lib/node_modules to make nix profiles usable as an npm prefix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-27 13:23:35 -04:00
Shea Levy
b73021a475 buildNodePackage: Handle all node/coffee shebang possibilities
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-18 15:45:02 -04:00
Shea Levy
483755e9ab buildNodePacakge: Create man page symlinks when needed
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-14 14:07:39 -04:00
Shea Levy
021c40c72d buildNodePackage: Handle bundledDependencies by nuking them
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 22:25:18 -04:00
Mathijs Kwik
b5ba5959cf fix node packages with binary (native) extensions 2013-06-06 22:38:24 +02:00
Zef Hemel
69cf3dede6 Bump to 0.10.10 2013-06-05 20:39:07 +02:00
Shea Levy
8247806090 buildNodePackage: Move dependency symlinks out of the top-level node_modules directory
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-05 12:25:41 -04:00
Shea Levy
d749196f68 buildNodePackage: Utilize the node setup hook
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-29 11:53:36 -04:00
Shea Levy
5ddae35596 Get node.js building on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-28 18:38:22 -04:00
Shea Levy
b0e6c66ad7 nodejs: Update to v0.10.8
I removed darwin-specific bits, as I can't test them right now. If
it's broken, let me know and I'll fix on darwin.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-27 02:08:24 -04:00
Rok Garbas
df76d7f6a9 nodejs: update to 0.8.23 2013-04-16 18:19:16 +02:00