Commit Graph

362 Commits

Author SHA1 Message Date
Domen Kožar
e61f23d89f Fix a bad revert at 1e4ba025c2 2015-03-18 11:50:19 +01:00
Domen Kožar
1e4ba025c2 Reverts a bunch of commits as a try to fix GC errors.
Commits

- 694f01db2d
- 829479d1dd
- bd81885f70
- b2fdcf801c
2015-03-17 08:55:03 +01:00
Eelco Dolstra
694f01db2d intersect -> intersectLists, subtract -> subtractLists 2015-03-04 22:15:46 +01:00
Eelco Dolstra
829479d1dd substract -> subtract 2015-03-04 22:15:45 +01:00
Jaka Hudoklin
bd81885f70 nodePackages: correctly handle platforms and optional dependencies 2015-02-28 04:03:24 +01:00
Jaka Hudoklin
97ea4ab54e nodePackages: add namePrefix parameter to override package name prefix 2015-02-23 14:27:38 +01:00
Jaka Hudoklin
b2fdcf801c nodePackages: add platform support, fix a lot of bugs 2015-02-23 13:29:50 +01:00
Jaka Hudoklin
60993d7716 nodePackages: prefix packages based on interpreter name 2015-02-23 13:29:50 +01:00
Valérian Galliat
43f02f27a0 Shared libuv in io.js and Node.js 2015-02-22 12:41:33 +01:00
Valérian Galliat
c56256709b Add io.js 2015-02-21 09:06:24 +01:00
Ryan Scheel
ffc1a595e4 Update Node stable to v.0.12.0
Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s
2015-02-17 22:44:58 -08:00
Jaka Hudoklin
9060376bcd buildNodePackage: patch shebangs only in text files 2015-02-12 19:09:09 +01:00
Valérian Galliat
25ce27b45e Patch npm packages to ignore npm requirements
Some npm packages strictly require a specific npm version because npm
don't handle some version requirements the same way in 1.0 and 2.0.

However, Nix don't use npm for dependency resolution (this is always
achieved with npm 1.0 criteria by npm2nix), so these requirements turns
out to be pointless and just crashes some package installations.

This patch removes npm requirements so the packages can still be built.

This solves #5787.
2015-02-07 15:17:15 +01:00
Jaka Hudoklin
fffc0c793c nodePackages: fix back compatibility 2015-01-25 01:42:02 +01:00
Jaka Hudoklin
628c84c831 nodePackages: refactor, add support for overrides 2015-01-24 23:28:41 +01:00
Jaka Hudoklin
a00131bb32 nodePackages/buildNodePackage: put patch phase into configure phase, ignore shrinkwrap 2015-01-24 23:28:41 +01:00
Jaka Hudoklin
86744fef91 nodePackages: fix builder
- reuse unpack and patch phase
- patch shebangs of source code
- properly patch depdency versions (thanks @svanderburg)
- add patching for github version names
- add some inline docs
- fix recursive depdencies runtime handling by copying files instead of
  symlinking if package has recursive dependencies
2014-12-26 01:04:08 +01:00
Rob Vermaas
81f6af4a54 nodejs: update from 0.10.32 to 0.10.33, potentially fixes CVE-2014-7192 2014-12-17 15:48:51 +01:00
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
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
77da5efc78 merge the rest of multiple-outputs
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát
694fa543af Merge 'staging'
Conflicts:
	pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +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
Mathijs Kwik
db83d9a35b Merge branch 'master' into multiple-outputs 2013-11-01 08:29:09 +01:00
Domen Kožar
92613863fe nodejs: 0.10.12 -> 0.10.21 (security fixes) 2013-10-19 13:52:03 +02:00
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +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
Mathijs Kwik
4b6d254ed7 nodejs: explicitly put openssl in buildInputs
the linker won't find it otherwise :multiple-outputs:
2013-08-21 17:35:53 +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
Sander van der Burg
0576a0054b Implemented an unelegant workaround that allows nodejs to be used on darwin using xcode 2013-03-14 13:52:45 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Sander van der Burg
c89187cc3c Added setup hook that adds a Node package automatically to NODE_PATH, if included in the buildInputs parameter 2013-02-04 15:21:33 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Rob Vermaas
d6571f932f Fix nodejs 2013-01-07 21:30:57 +01:00
Sander van der Burg
03621d4cd8 Remove my darwin workarounds for node.js 2013-01-07 17:01:50 +01:00
Sander van der Burg
5b0ca88d97 - Added xcodeenv: experimental support to build iOS apps through Nix
- Moved mobile development tools into a separate folder
2013-01-07 16:52:42 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Shea Levy
389df7d0c3 nodejs v0.8.15 2012-12-03 10:05:39 -05:00
Mathijs Kwik
4afe7286c3 node.js: upgrade to v0.8.12 2012-10-27 13:06:53 +02:00
Shea Levy
309ec44f40 build-node-package: make fewer assumptions about the name of the node tarball 2012-09-20 14:45:31 -04:00
Shea Levy
7d5bb08534 Add cipher-block-size node package and remove the nativeDeps argument to build-node-package (buildInputs can just be specified directly) 2012-09-18 12:08:16 -04:00
Mathijs Kwik
baa6223904 node-packages: ability to build npms that have native extensions 2012-09-17 09:56:49 +02:00
Mathijs Kwik
68f6866ab6 node.js: upgrade to 0.8.9
- espipe patch no longer needed
- linkV8 headers replaced by buildNodePackage's upcoming binary support
2012-09-15 20:53:19 +02:00
Shea Levy
270c7f2209 nodejs: Bump and backport fix to support ESPIPE 2012-08-22 18:54:47 -04:00
Shea Levy
cdc0c13c00 buildNodePackage: Remove absolute path to source tarball to avoid runtime dependency 2012-08-22 15:35:00 -04:00
Shea Levy
695ca8c498 node.js: Bump 2012-08-22 09:14:05 -04:00
Shea Levy
c516517656 Add empty node-packages.nix using build-node-package.nix from npm2nix.
buildNodePackage is a function to build npm packages.

npm2nix (https://bitbucket.org/shlevy/npm2nix) can be used to generate subexpressions to go in node-packages.nix
2012-07-25 17:46:21 -04:00
Shea Levy
6a3ea47c4e node: Update to 0.8.3 2012-07-25 10:45:04 -04:00
Mathijs Kwik
2cedd7021b node.js: copy v8 headers
most npm's that want to build binary stuff (bindings) look for the v8 headers at NODE_BINARY_PATH/../include
Ideally, we get something like npm2nix someday and fix these build scripts.

Until then, this little hack does the trick.
2012-07-05 12:01:23 +02:00
Lluís Batlle
0067a945d4 Updating nodejs to 0.6.19. 2012-06-22 14:50:58 +02:00
Lluís Batlle
a4045a92d7 Making 'npm' work from commandline (fix interpreter). 2012-06-22 14:50:58 +02:00
Mathijs Kwik
459de475ee node.js : upgraded to 0.6.18
svn path=/nixpkgs/trunk/; revision=34266
2012-05-29 07:43:56 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Shea Levy
68f739cc45 nodejs/v8: Bump
svn path=/nixpkgs/trunk/; revision=33673
2012-04-08 14:32:00 +00:00
Mathijs Kwik
a92fe14103 upgraded nodejs to 0.6.11
svn path=/nixpkgs/trunk/; revision=32760
2012-03-04 12:28:45 +00:00
Shea Levy
385f242a40 node.js: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32563
2012-02-25 19:36:24 +00:00
Shea Levy
f77fa09f56 v8: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32168
2012-02-10 05:22:58 +00:00
Peter Simons
66a1330589 v8/nodejs: upgraded to 3.6.6.20 and 0.6.9
svn path=/nixpkgs/trunk/; revision=32079
2012-02-06 19:08:56 +00:00
Peter Simons
f94f871b67 node.js: use shared v8 instead of bundled one
svn path=/nixpkgs/trunk/; revision=31650
2012-01-18 20:32:26 +00:00
Eelco Dolstra
67f921896e * nodejs 0.6.7 breaks npm, so go back to 0.6.6.
svn path=/nixpkgs/trunk/; revision=31594
2012-01-16 16:56:57 +00:00
Eelco Dolstra
fd6238d2c8 * NodeJS updated to 0.6.7.
svn path=/nixpkgs/trunk/; revision=31593
2012-01-16 16:34:13 +00:00
Peter Simons
957397a749 upgraded nodejs
svn path=/nixpkgs/trunk/; revision=30836
2011-12-11 19:38:57 +00:00
Cillian de Roiste
2dd19f6d72 Updating node to version 0.5.4
svn path=/nixpkgs/trunk/; revision=28726
2011-08-21 19:42:55 +00:00
Cillian de Roiste
4cc923b4bb Fixing the download url
svn path=/nixpkgs/trunk/; revision=28015
2011-07-31 08:56:09 +00:00
Cillian de Roiste
0942a5b164 Updating node to 0.5.2
svn path=/nixpkgs/trunk/; revision=28014
2011-07-31 08:49:03 +00:00
Cillian de Roiste
28096838d0 Adding node.js, a javascript web development platform
svn path=/nixpkgs/trunk/; revision=27168
2011-05-05 22:38:04 +00:00