mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
91822 commits 204 branches 125 tags 10 GiB
Commit graph

307 commits

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