Commit graph

146 commits

Author SHA1 Message Date
Domen Kožar
4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Arseniy Seroka
20024205d3 Merge pull request #11014 from Havvy/node10
nodejs: 0.10.38 -> 0.10.40
2015-11-15 01:23:20 +03:00
William A. Kennington III
453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Ryan Scheel (Havvy)
087202abf9 nodejs: 0.10.38 -> 0.10.40 2015-11-13 23:06:03 +00:00
Domen Kožar
4d1129828a nodejs: 4.1.2 -> 4.2.2 2015-11-11 11:53:38 +01:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Jude Taylor
de497895ae nodejs-0.10: apply gyp patches to node-gyp in fixup 2015-10-16 18:37:50 -07:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Ryan Scheel (Havvy)
d9819cf7b0 nodejs: 4.1.0 -> 4.1.2 2015-10-06 00:43:01 +02:00
William A. Kennington III
2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
Jude Taylor
d4081c2f97 fix patches for both node versions 2015-10-01 16:34:42 -07:00
Jude Taylor
4520a19151 add darwin libtool to nodejs 4.1.0 2015-10-01 09:20:12 -07:00
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Jude Taylor
f4a7173e83 add darwin libtool to nodejs 4.1.0 2015-09-28 17:23:25 -07:00
Utku Demir
3733c25227 nodejs: 0.12.7 -> 4.1.0
A big version jump after io.js merge.

dontDisableStatic flag is added since the ./configure script didn't
recognize "--disable-static" flag added by default.

New dependencies are also introduced, coming from io.js
2015-09-24 15:46:47 +00:00
Jude Taylor
e7605dd08b add nodejs-4.1.0 2015-09-23 16:13:34 -07:00
Utku Demir
5868aaf395 Remove nodejs-unstable package
This package was same as the main nodejs package since the given
unstableVersion flag is noop.
2015-09-19 13:48:38 +00:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Ryan Scheel (Havvy)
de34441ead nodejs: 0.12.6 -> 0.12.7 2015-07-12 21:37:40 +02:00
Jude Taylor
5b3e50dedc use lib functions to clean up nodejs 2015-07-10 10:28:27 -07:00
Jude Taylor
f72beea75e darwin purity: nodejs-0.10 2015-07-10 10:28:27 -07:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Rehno Lindeque
590c467018 nodejs: 0.12.0 -> 0.12.6
0.12.5 and 0.12.6 were both critical security releases.
2015-07-08 20:51:03 +02:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Alexander Flatter
60c33c16a0 nodejs: Don't apply no-darwin-cflags
The no-darwin-cflags patch does not apply cleanly anymore, but
apparently it's also not necessary.
2015-07-02 11:11:51 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Jude Taylor
6f3729e3b3 darwin purity: nodejs 2015-06-21 00:56:26 -07:00
Ryan Scheel (Havvy)
b49026ee98 Added: Havvy as maintainer for iojs/nodejs. 2015-06-01 05:17:59 +02:00
Lluís Batlle i Rossell
9be8b790f8 Choosing a different nodejs for armv5tel.
nodejs 0.12 doesn't build in armv5 or without fpu, it seems.
I tested this change on armv5tel, branch staging.
2015-05-03 18:02:55 +02:00
Jaka Hudoklin
5e2b429e82 Merge pull request #7556 from offlinehacker/pkgs/node-packages/fix_platforms
nodePackages: fix platform detection
2015-04-25 16:21:51 +02:00
Jaka Hudoklin
744b06cc28 nodePackages: fix platform detection 2015-04-25 15:18:54 +02:00
Domen Kožar
a83f55af1c node: set interpreterName for 0.10 2015-04-16 12:43:04 -04:00
Eelco Dolstra
16ccc46c29 Revert "nodejs: Update to 0.12.2"
This reverts commit 088523f094.

Fixes #7243.
2015-04-07 17:54:38 +02:00
John Wiegley
e5775f533a Merge pull request #7145 from flosse/old-stable-nodejs
nixpkgs: added old stable nodejs v0.10.38
2015-04-07 10:38:47 -05:00
Eelco Dolstra
088523f094 nodejs: Update to 0.12.2 2015-04-07 14:53:45 +02:00
Eelco Dolstra
488d7a70e1 nodejs: Disable unstableVersion
It's pretty pointless to have an unstable version older than the
stable version.
2015-04-07 14:07:48 +02:00
Markus Kohlhase
d2358a6e53 nixpkgs: added old stable nodejs v0.10.38 2015-04-03 10:52:40 +00:00
Jaka Hudoklin
f953d77be2 Revert "Reverts a bunch of commits as a try to fix GC errors."
This reverts commit 1e4ba025c2.

Conflicts:
	pkgs/development/web/nodejs/build-node-package.nix
2015-03-21 17:49:37 +01:00
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