JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,604 Commits 2 Branches 0 Tags 13 GiB
81a3a5b3d4
Commit Graph

199 Commits

Author SHA1 Message Date
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
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
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
Mathias Schreck
594416b210 nodejs: 5.10.1 -> 5.11.0 2016-04-22 12:31:09 +02: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
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
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