Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
2ef6508c7f
Merge branch 'master.upstream' into staging.post-15.06
2015-10-02 12:41:09 -07:00
William A. Kennington III
ed71860928
Merge branch 'staging.upstream' into staging.post-15.06
2015-10-02 12:41:04 -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
fbe9201a8a
Remove io.js
...
Since they're merged with nodejs and nodejs is updated to 4.1
2015-09-24 15:46:48 +00: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
William A. Kennington III
9f3c0d9967
Merge branch 'master.upstream' into staging.post-15.06
2015-09-19 14:40:01 -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
eae9889b82
openssl: Major bump 1.0.1 -> 1.0.2
2015-09-15 12:14:12 -07:00
Luca Bruno
ad99ea6912
wml: fix build and unbreak
2015-09-03 11:10:06 +02:00
Ryan Scheel (Havvy)
088cc7f5f7
iojs: 3.0.0 -> 3.1.0
2015-08-20 13:21:53 +02:00
Ryan Scheel (Havvy)
cc12cea4b6
iojs: 2.5.0 -> 3.0.0
2015-08-05 02:59:20 +02:00
Ryan Scheel (Havvy)
6fd8428edf
iojs: 2.4.0 -> 2.5.0
2015-07-29 14:36:21 +02:00
Ryan Scheel (Havvy)
89cda4c95a
iojs (2.3.4 -> 2.4.0)
2015-07-23 19:24:05 +02: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
Ryan Scheel (Havvy)
2d77e49f6c
Update io.js (v2.3.3 -> v2.3.4)
2015-07-11 19:00:31 +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
lethalman
6354ed444f
Merge pull request #8597 from aflatter/nodejs-darwin
...
nodejs: Don't apply no-darwin-cflags
2015-07-04 13:51:39 +02:00
Ryan Scheel (Havvy)
1b9737992b
Update io.js (2.3.1 -> 2.3.3)
2015-07-04 07:42:44 +02: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
Thomas Tuegel
a8c52d0958
Merge branch 'master' into staging
2015-06-25 09:15:05 -05:00
Ryan Scheel (Havvy)
3ec096f65b
iojs: 2.2.1 -> 2.3.1, closes #8478
2015-06-24 10:02:09 +02:00
Jude Taylor
6f3729e3b3
darwin purity: nodejs
2015-06-21 00:56:26 -07:00
Ryan Scheel (Havvy)
9cb7239f12
Update iojs to v.2.2.1
2015-06-01 15:34:31 +02:00
Ryan Scheel (Havvy)
b49026ee98
Added: Havvy as maintainer for iojs/nodejs.
2015-06-01 05:17:59 +02:00
Ryan Scheel (Havvy)
c8e59a41b0
Updated: io.js from v1.6.4 to v.2.1.0
...
Closes #9707
2015-05-29 21:06:18 +02:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +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
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Domen Kožar
a83f55af1c
node: set interpreterName for 0.10
2015-04-16 12:43:04 -04:00
Ryan Scheel (Havvy)
459133ce72
Remove nightly derivations for iojs
2015-04-15 21:01:48 -07:00
Ryan Scheel (Havvy)
ae8efc22a5
Remove error hiding, comment saying where to call script from.
2015-04-09 17:11:47 +02:00
Ryan Scheel (Havvy)
2e465757f8
Update iojs to latest version.
2015-04-09 17:10:13 +02: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
Benjamin Staffin
e3eb1aa719
Update iojs using the fixed-up script
2015-03-17 15:22:35 -07:00
Benjamin Staffin
1b1f26636e
iojs: Fix update-iojs script
...
The nix-instantiate invocations only work correctly if this script is
run from the root directory of nixpkgs, or in a directory without a
default.nix file and NIX_PATH set appropriately.
2015-03-17 15:00:16 -07: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
lethalman
ff98a8c24c
Merge pull request #6513 from valeriangalliat/nodejs-iojs-libuv-shared
...
Shared libuv in io.js and Node.js
2015-02-23 11:10:05 +01:00
Valérian Galliat
63f7dc60ff
Update io.js
2015-02-22 22:36:35 +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
62b17c8bf1
io.js: shared libraries
...
@lethalman courtesy <https://github.com/NixOS/nixpkgs/pull/6234#issuecomment-75429850 >.
2015-02-22 12:00:34 +01:00
Valérian Galliat
7fcac2e8e1
Update iojs
2015-02-21 09:06:24 +01:00
Valérian Galliat
c56256709b
Add io.js
2015-02-21 09:06:24 +01:00
Luca Bruno
97f9150a56
wml: mark as broken, don't know why it broke
2015-02-20 14:07:59 +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
William A. Kennington III
238f4d1652
jdkPath: Remove in favor of jdk.home
2015-01-07 14:55:41 -08: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
Luca Bruno
31e1e8325b
Fix wml build, don't know why it worked before
2014-12-18 00:43:13 +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
8c8750c3c5
wml: new package and perl dependency Image::Size
...
Off-line HTML generation toolkit for Unix
http://thewml.org/
2014-12-17 01:36:07 +01:00
Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151
Fixed many descriptions
2014-11-11 14:36:34 +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
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Rickard Nilsson
79f99e4578
remarkjs: Update from 0.6.5 to 0.7.0
2014-10-28 14:44:37 +01: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
Pascal Wittmann
c5fd7f3b69
twitter-bootstrap: use fetchFromGitHub
2014-10-21 22:35:30 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Bjørn Forsman
f6148e10a3
grails: new package
...
Grails is an Open Source, full stack, web application framework for the
JVM. It takes advantage of the Groovy programming language and
convention over configuration to provide a productive and stream-lined
development experience.
http://grails.org/
2014-09-18 22:57:03 +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
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +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