Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-10 |
|\ | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs | ||
| * | nodejs: 5.10.0 -> 5.10.1 | Mathias Schreck | 2016-04-06 |
| | | |||
| * | nodejs: 5.9.0 -> 5.10.0 | Mathias Schreck | 2016-04-01 |
| | | |||
* | | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-01 |
|\| | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts. | ||
| * | Merge pull request #13974 from gilligan/node-5.9.0 | Sander van der Burg | 2016-03-18 |
| |\ | | | | | | | nodejs: 5.8.0 -> 5.9.0 | ||
| | * | nodejs: 5.8.0 -> 5.9.0 | Mathias Schreck | 2016-03-16 |
| | | | |||
| * | | Remove dead link | Ryan Scheel | 2016-03-18 |
| |/ | | | | | The link being pointed to belongs to a domain that no longer exists. Just a bunch of spam there now. | ||
| * | nodejs: 5.7.1 -> 5.8.0 | Mathias Schreck | 2016-03-12 |
| | | |||
* | | Merge master into closure-size | Vladimír Čunát | 2016-03-08 |
|\| | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems. | ||
| * | nodejs: 5.7.0 -> 5.7.1 | Mathias Schreck | 2016-03-04 |
| | | |||
| * | nodejs-4_x: bump to version 4.3.1 | Sander van der Burg | 2016-03-01 |
| | | |||
| * | nodejs-5_x: 5.6.0 -> 5.7.0 | Tobias Pflug | 2016-02-29 |
| | | |||
| * | nodejs: 5.5.0 -> 5.6.0 (CVE-2016-2086, CVE-2016-2216) | Franz Pletz | 2016-02-27 |
| | | | | | | | | https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/ | ||
| * | nodejs: 4.2.3 -> 4.3.0 (CVE-2016-2086, CVE-2016-2216) | Franz Pletz | 2016-02-27 |
| | | | | | | | | https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/ | ||
| * | nodejs: 0.10.41 -> 0.10.42 (CVE-2016-2086, CVE-2016-2216) | Franz Pletz | 2016-02-27 |
| | | | | | | | | https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/ | ||
* | | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-02-14 |
|\| | |||
| * | nodejs: fix Darwin build | Stacey Touset | 2016-01-29 |
| | | | | | | | | | | | | | | - Add no-xcode patch back into node v5. Reverts some of 5cb1e43fd6eb7f87c9b17e9dc6d1a92ae7c360a4 - Fix patch to apply correctly - Remove pkg-libpath patch from v4 | ||
* | | Merge recent 'staging' into closure-size | Vladimír Čunát | 2016-02-03 |
|\| | | | | | | | Let's get rid of those merge conflicts. | ||
| * | nodejs-5_x: 5.4.1 -> 5.5.0 | Christian Albrecht | 2016-01-28 |
| | | |||
| * | nodejs: 5.1.1 -> 5.4.1 | Tobias Pflug | 2016-01-21 |
| | | |||
| * | nodejs: remove unreferenced patchfile | Dan Peebles | 2016-01-19 |
| | | |||
| * | nodejs-5: fix on darwin | Dan Peebles | 2016-01-19 |
| | | | | | | | | | | | | Turns out the darwin-flavored patches aren't needed anymore. Fixes #12305 | ||
* | | Merge branch 'staging' into closure-size | Vladimír Čunát | 2016-01-19 |
|\| | |||
| * | update xcode patches for node v0.10.41 | Jude Taylor | 2016-01-09 |
| | | |||
| * | add gyp fix to node v4.x | Jude Taylor | 2016-01-07 |
| | | |||
* | | Merge branch 'master' into closure-size | Luca Bruno | 2015-12-11 |
|\| | |||
| * | nodejs: fix naming of nodejs to fit into their versioning model, fixes #11497 | Rok Garbas | 2015-12-06 |
| | | |||
| * | nodejs: 5.0.0 -> 5.1.1 CVE-2015-8027 | zimbatm | 2015-12-06 |
| | | | | | | | | | | See https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/ | ||
| * | nodejs: 4.2.2 -> 4.2.3 CVE-2015-8027 | zimbatm | 2015-12-06 |
| | | | | | | | | | | See https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/ | ||
| * | nodejs: remove unlinked v4_1_0 | zimbatm | 2015-12-06 |
| | | | | | | | | The stable branch is v4.x.x and is already taken care of my the default.nix | ||
| * | nodejs: 0.10.40 -> 0.10.41 | zimbatm | 2015-12-06 |
| | | | | | | | | Maintenance release | ||
* | | Merge remote-tracking branch 'origin/master' into closure-size | Luca Bruno | 2015-11-25 |
|\| | |||
| * | nodejs: remove myself from the maintainers | Cillian de Róiste | 2015-11-19 |
| | | |||
| * | nodejs-5_0: add package | Sander van der Burg | 2015-11-16 |
| | | |||
| * | Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging) | Domen Kožar | 2015-11-16 |
| |\ | | | | | | | | | | Merge rest of the fixes from staging | ||
| * \ | Merge pull request #11014 from Havvy/node10 | Arseniy Seroka | 2015-11-15 |
| |\ \ | | | | | | | | | nodejs: 0.10.38 -> 0.10.40 | ||
| | * | | nodejs: 0.10.38 -> 0.10.40 | Ryan Scheel (Havvy) | 2015-11-13 |
| | | | | |||
* | | | | Merge staging into closure-size | Vladimír Čunát | 2015-11-20 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | 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. | ||
| * | | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-14 |
| |\| | | |||
| | * | | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" | William A. Kennington III | 2015-11-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes. | ||
| * | | | nodejs: 4.1.2 -> 4.2.2 | Domen Kožar | 2015-11-11 |
| |/ / | |||
| * | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-30 |
| |\| | |||
| | * | valum: init at 0.2.0 | Luca Bruno | 2015-10-29 |
| | | | |||
| * | | Merge master into staging | Vladimír Čunát | 2015-10-23 |
| |\| | |||
| | * | nodejs-0.10: apply gyp patches to node-gyp in fixup | Jude Taylor | 2015-10-16 |
| | | | |||
| * | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-15 |
| |\| | |||
| | * | nodejs: 4.1.0 -> 4.1.2 | Ryan Scheel (Havvy) | 2015-10-06 |
| | | | |||
| * | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06" | Eelco Dolstra | 2015-10-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix | ||
* | | | nodejs: fixup | Vladimír Čunát | 2015-10-03 |
| | | | |||
* | | | Merge staging into closure-size | Vladimír Čunát | 2015-10-03 |
|\| | | | | | | | | | | | This makes gcc5 the default builder, etc. |