Commit Graph

171 Commits

Author SHA1 Message Date
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
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 088523f094b379c79eef22f6616e057ea31be3bf.

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 1e4ba025c260fa6852765e9f5c59e985f10c6a43.

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 1e4ba025c260fa6852765e9f5c59e985f10c6a43 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

- 694f01db2d2e1cde06ee243a5909d196e84f0a18
- 829479d1dda5dbb579885e16dc655716127457ed
- bd81885f706dae5cdeb8c03845fa43d8b74fa57c
- b2fdcf801ce08bf0c44e63bafe8ae2c720704da7
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