1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

340 commits

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