Commit graph

112 commits

Author SHA1 Message Date
Vladimír Čunát
d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +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
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
Domen Kožar
35779fd646 Merge pull request #3513 from linquize/nodejs
nodejs: Update to 0.10.30
2014-08-16 20:58:06 +02:00
Rickard Nilsson
c00ab086d5 remarkjs: Update from 0.6.4 to 0.6.5 2014-08-13 12:03:51 +02: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
Luca Bruno
0f51ae90b9 Revert "typescript: add package. Closes #2712"
This reverts commit 93a7cf74b9.
2014-05-21 15:57:34 +02:00
Jussi Maki
93a7cf74b9 typescript: add package. Closes #2712
Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
2014-05-21 15:21:48 +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
cdd1c9caa5
Merge branch 'chromium-refactor', closes #1798.
This implements some longstanding work of getting the Chromium
derivation more modular. Unfortunately, I didn't manage to decrease the
compile time, which was one of the primary goal for doing the refactor.
A main reason this didn't work out well was the fact that most bundled
libraries are so heavily patched that it's not possible within a limited
time frame to decouple it from the main derivation.

However, it should now be easier to build other derivations that build
upon Chromium, like libcef. Also, it finally adds support for the
non-free PepperAPI Flash and PDF plugins and support for fetching the
corresponding versions through the updater.
2014-04-21 09:50:50 +02:00
Rickard Nilsson
6b634673f9 Add remarkjs 0.6.4, a markdown-driven slideshow tool
Also, add required node packages (and update generated node pkgs).
2014-04-21 01:27:23 +02: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
Oliver Charles
0828be1597 xmlindent: New expression
[Bjørn Forsman <bjorn.forsman@gmail.com>:
 - introduce "name-${version}" (to not duplicate version number)
 - use mirror://sourceforge instead of specific mirror URL
 - add vertical whitespace between attributes
 - add meta description and homepage attributes
 - place the top-level 'xmlindent' attribute in alphabetial order
]
2014-02-01 19:10:01 +01: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
Nixpkgs Monitor
0b276be28b csslint: update from 0.5.0 to 0.10.0 2013-12-18 18:18:23 +02: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
Rok Garbas
a646dee027 removing existing plone packages 2013-08-12 10:10:44 +02: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
Rok Garbas
53f6bd73ad plone: updating plone.app.discussion to 2.2.7 2013-07-04 20:26:06 +02:00
Rok Garbas
e84ba407f9 plone: adding collective_recipe_filestorage package 2013-07-03 04:44:01 +02:00
Rok Garbas
7816aa4ada plone: adding collective_recipe_template package 2013-07-03 04:26:27 +02:00
Rok Garbas
52dd19be1b plone: plone_recipe_varnish updated to 1.3dev to support varnish >= 3 2013-07-03 02:47:14 +02:00