3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

495 commits

Author SHA1 Message Date
Tuomas Tynkkynen b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Tobias Pflug 39cf213e2b nodejs-6_x: 6.2.2 -> 6.3.1 2016-07-22 10:00:26 +02:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Christine Koppelt 1c39145bc2 nodejs-5_x: 5.11.1 -> 5.12.0 (#16657) 2016-07-19 11:34:39 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Sander van der Burg c3ffae4777 nodejs: implement a darwin-specific fix that properly refers to tr1/type_traits 2016-07-14 12:57:17 +00:00
schneefux 4c17bed84c minify: init at v2.0.0 2016-07-10 12:06:01 +02:00
Christine Koppelt a23c20eff8 nodejs-4_x: 4.4.4 -> 4.4.6 2016-06-25 19:00:17 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Christine Koppelt 1d6cb3a119 nodejs-6_x: 6.2.0 -> 6.2.2 2016-06-18 19:32:58 +02:00
Nikolay Amiantov 3f241c172c remarkjs: mark as broken 2016-06-11 03:28:50 +03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Alexander Ried 1159b1561a nodejs-6_x: use xz instead of gz 2016-05-18 18:36:54 +02:00
Alexander Ried c97b407899 nodejs-5_x: 5.11.0 -> 5.11.1 2016-05-18 18:36:54 +02:00
Alexander Ried c086ab7096 nodejs-4_x: 4.3.1 -> 4.4.4 2016-05-18 18:36:53 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Mathias Schreck 22b0cb9a72 nodejs: 6.1.0 -> 6.2.0 2016-05-18 10:31:21 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Mathias Schreck dce7e66f51 nodejs: 6.0.0 -> 6.1.0 2016-05-06 12:45:21 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tobias Pflug 822abc49ad nodejs-6_x : init at 6.0.0 2016-05-02 08:58:50 +02:00
Nikolay Amiantov 36d50d2e6c nodejs-0_10: fix build 2016-04-30 05:02:09 +03:00
Vladimír Čunát 1c9234fd6c foswiki, egypt, wml: fix build 2016-04-25 16:22:52 +02:00
Mathias Schreck 594416b210 nodejs: 5.10.1 -> 5.11.0 2016-04-22 12:31:09 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Robin Gloster 7a347f6082 wml: disable format hardening 2016-04-06 09:15:19 +00:00
Mathias Schreck 3d412dd84e nodejs: 5.10.0 -> 5.10.1 2016-04-06 09:45:35 +02:00
Mathias Schreck 8d756babee nodejs: 5.9.0 -> 5.10.0 2016-04-01 12:35:51 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Sander van der Burg 83ba008914 Merge pull request #13974 from gilligan/node-5.9.0
nodejs: 5.8.0 -> 5.9.0
2016-03-18 09:52:17 +00:00
Ryan Scheel d1e471dbaf Remove dead link
The link being pointed to belongs to a domain that no longer exists. Just a bunch of spam there now.
2016-03-18 02:31:57 -07:00
Mathias Schreck cd38a38316 nodejs: 5.8.0 -> 5.9.0 2016-03-16 23:22:22 +01:00
Mathias Schreck 7533784f28 nodejs: 5.7.1 -> 5.8.0 2016-03-12 23:06:09 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Mathias Schreck c7759dd8a0 nodejs: 5.7.0 -> 5.7.1 2016-03-04 10:32:17 +01:00
Sander van der Burg c8e55671cd nodejs-4_x: bump to version 4.3.1 2016-03-01 12:29:31 +00:00
Tobias Pflug 8625d2f8aa nodejs-5_x: 5.6.0 -> 5.7.0 2016-02-29 11:35:51 +01:00
Franz Pletz e3ecee8b13 nodejs: 5.5.0 -> 5.6.0 (CVE-2016-2086, CVE-2016-2216)
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
2016-02-27 17:06:24 +01:00
Franz Pletz 6fd20ad747 nodejs: 4.2.3 -> 4.3.0 (CVE-2016-2086, CVE-2016-2216)
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
2016-02-27 17:06:24 +01:00
Franz Pletz 3673c5bf52 nodejs: 0.10.41 -> 0.10.42 (CVE-2016-2086, CVE-2016-2216)
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
2016-02-27 17:06:24 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Stacey Touset 4356d0ccce nodejs: fix Darwin build
- Add no-xcode patch back into node v5. Reverts some of
  5cb1e43fd6
- Fix patch to apply correctly
- Remove pkg-libpath patch from v4
2016-01-29 18:09:46 -08:00
Christian Albrecht 2dbd741009 nodejs-5_x: 5.4.1 -> 5.5.0 2016-01-28 13:27:40 +01:00
Tobias Pflug a265c8a05d nodejs: 5.1.1 -> 5.4.1 2016-01-21 10:31:18 +01:00
Dan Peebles 48513dfb22 nodejs: remove unreferenced patchfile 2016-01-19 22:29:02 -05:00
Dan Peebles 5cb1e43fd6 nodejs-5: fix on darwin
Turns out the darwin-flavored patches aren't needed anymore.

Fixes #12305
2016-01-19 22:28:42 -05:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Jude Taylor 36ebae29ce update xcode patches for node v0.10.41 2016-01-09 14:38:37 -08:00
Jude Taylor 81710923bd add gyp fix to node v4.x 2016-01-07 21:52:12 -08:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Rok Garbas c90d26a2e2 nodejs: fix naming of nodejs to fit into their versioning model, fixes #11497 2015-12-06 21:57:24 +01:00
zimbatm a6982cc525 nodejs: 5.0.0 -> 5.1.1 CVE-2015-8027
See
https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/
2015-12-06 21:57:09 +01:00
zimbatm 989966b293 nodejs: 4.2.2 -> 4.2.3 CVE-2015-8027
See
https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/
2015-12-06 21:57:09 +01:00
zimbatm 59fc3cd8ad nodejs: remove unlinked v4_1_0
The stable branch is v4.x.x and is already taken care of my the default.nix
2015-12-06 21:57:09 +01:00
zimbatm 46c65335ca nodejs: 0.10.40 -> 0.10.41
Maintenance release
2015-12-06 21:57:09 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Cillian de Róiste 5823ff2a92 nodejs: remove myself from the maintainers 2015-11-19 22:32:43 +01:00
Sander van der Burg a06dd213b6 nodejs-5_0: add package 2015-11-16 17:58:11 +00:00
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
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Luca Bruno e6a7834a56 valum: init at 0.2.0 2015-10-29 16:58:14 +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
Vladimír Čunát b1a38cd40d nodejs: fixup 2015-10-03 16:28:06 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
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
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
Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02: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
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
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
Rok Garbas 79ec396f6f plone: z3c.form downgraded to 3.0 2013-07-03 02:32:01 +02:00
Rok Garbas c590a5b4c3 plone: updating 4.3.0 to 4.3.1, minor renaming of nix files 2013-07-03 00:21:22 +02:00
Rickard Nilsson 070ddf8367 New package: Twitter Bootstrap 2.3.2, a front-end framework for web development. 2013-07-01 16:14:52 +02:00
Rok Garbas fd5e631e7d Plone: fix for 4.1 2013-06-10 20:59:58 +02: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 8ea9b3fbac plone: adding version 4.2.5 and 4.1.6 2013-04-17 02:28:45 +02:00
Rok Garbas 0416e77d82 plone: some versions got pinned wrong 2013-04-17 01:57:40 +02:00
Rok Garbas a690941f21 plone: update to 4.3 2013-04-17 01:27:59 +02:00
Rok Garbas df76d7f6a9 nodejs: update to 0.8.23 2013-04-16 18:19:16 +02:00
Rok Garbas d8fe87bbe1 Revert "plone43Packages.zc_buildout: 2.1.0"
new zc_buildout doesn't pick eggs from "system" site-packages

This reverts commit abf49f299e.
2013-04-06 23:10:31 +02:00
Rok Garbas abf49f299e plone43Packages.zc_buildout: 2.1.0 2013-04-06 17:59:23 +02:00
Rok Garbas 86e5e52d99 plone: upgrading to 4.3rc1 2013-03-31 08:53:23 +02:00