mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Code Issues Wiki Activity
145792 commits 268 branches 125 tags 5.4 GiB
Commit graph

460 commits

Author SHA1 Message Date
John M. Harris, Jr 4219de070d
kore: init at 2.0.0 2017-10-01 14:08:36 -04:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Mathias Schreck f8ffbcb520 nodejs: 8.5.0 -> 8.6.0 2017-09-28 17:41:28 +02:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Mathias Schreck 9d2a2dc43e nodejs: 8.4.0 -> 8.5.0 2017-09-18 13:51:27 +02:00
Mathias Schreck c699694cbf nodejs: 8.3.0 -> 8.4.0 2017-08-30 02:57:36 +02:00
Jörg Thalheim a86b304a26 grails: 2.4.3 -> 3.3.0 2017-08-25 07:26:21 +01:00
Matthew Justin Bauer 2eacddf0dc treewide: homepage URL fixes (#28475) 
* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
 2017-08-22 20:50:04 +02:00
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Mathias Schreck 7c669d6f7b nodejs: 8.2.1 -> 8.3.0 2017-08-10 08:02:20 +02:00
Mathias Schreck 28b0a79c04 nodejs: remove version 7_x 
nodejs v7 reached its end of life in June 2017.
 2017-08-05 13:17:50 +02:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Mathias Schreck 77ebd34459 nodejs: 8.2.0 -> 8.2.1 2017-07-21 12:27:23 +02:00
Mathias Schreck e849c7645e nodejs: 8.1.4 -> 8.2.0 2017-07-20 20:13:39 +02:00
adisbladis ea4e03d7ac
nodejs: 7.10.0 -> 7.10.1 2017-07-14 12:31:48 +08:00
adisbladis fffe1efa03
nodejs: 6.9.5 -> 6.11.1 2017-07-14 12:31:09 +08:00
adisbladis f33f7dc0fa
nodejs: 4.8.1 -> 4.8.4 2017-07-14 12:30:49 +08:00
Stefan Lau 4e47390bce nodejs: 8.1.0 -> 8.1.4 2017-07-13 15:03:36 +02:00
Jörg Thalheim 19cd9f557f mailcatcher: do not override phases 2017-07-03 09:43:30 +01:00
David Costa 87b1566472 mailcatcher: init at 0.6.5 2017-07-03 09:13:12 +02:00
Mathias Schreck 9540cc4645 nodejs: 8.0.0 -> 8.1.0 2017-06-08 22:15:57 +02:00
Mathias Schreck b67d01a0e9 nodejs: init at 8.0.0 2017-05-30 22:39:43 +02:00
Mathias Schreck 4abefec367 nodejs-7_x: 7.9.0 -> 7.10.0 2017-05-24 21:11:05 +02:00
Mathias Schreck 6cdec33141 nodejs: 7.7.3 -> 7.9.0 2017-04-18 22:43:50 +02:00
Sander van der Burg 7408aca528 Regenerate NPM expressions with node2nix 1.2.0 2017-03-31 20:51:14 +02:00
Christine Koppelt 5861b8b1c9 nodejs-4_x: 4.6.0 -> 4.8.1 2017-03-25 17:29:02 +01:00
Jacek Smolak 07e6fe3e57 nodejs-7_x: 7.7.2 -> 7.7.3 2017-03-22 15:27:39 +01:00
Ben Zhang e50dba97d2
nodejs: 7.7.1 -> 7.7.2 2017-03-10 21:54:49 -05:00
Mathias Schreck 792d8bd74b nodejs: 7.6.0 -> 7.7.1 2017-03-03 20:08:38 +01:00
Maximilian Bosch e20575cf5f
nodejs: 7.2.1 -> 7.6.0 2017-02-23 23:38:35 +01:00
Robin Gloster e400eb36d1
nodejs: 6.9.1 -> 6.9.5 2017-02-17 00:13:34 +01:00
Sander van der Burg 5cf1a4d36a nodePackages: upgrade node2nix to version 1.1.1 and regenerate the package set 2017-01-20 22:05:44 +01:00
Jaka Hudoklin a50fc480c3 nodejs: add bash completions for npm 2016-12-11 15:14:38 +01:00
Mathias Schreck 61e9862bc0 nodejs: 7.1.0 -> 7.2.1 2016-12-07 15:25:31 +01:00
Frederik Rietdijk b191034d8a remarkjs: fix evaluation 2016-11-25 14:45:03 +01:00
Frederik Rietdijk 2de9321880 nodejs: add python to passthru 
so nodeEnv uses the exact same version.

See also https://github.com/svanderburg/node2nix/issues/25
 2016-11-24 22:28:04 +01:00
Tim Steinbach 80ec5b3f58 Merge pull request #20416 from cko/nodejs7_update 
nodejs-7_x: 7.0.0 -> 7.1.0
 2016-11-17 22:21:13 -05:00
Christine Koppelt eb5831a28e nodejs-7_x: 7.0.0 -> 7.1.0 2016-11-14 20:25:28 +01:00
Christine Koppelt f7e1da5fd1 nodejs: 4.6.0 -> 4.6.2; 6.8.0 -> 6.9.1 2016-11-14 00:27:40 +01:00
Sophie Taylor ba27636b58 nodejs: disable PaX mprotect hardening (#20301) 
Closes #19951
 2016-11-10 03:19:47 +01:00
Christine Koppelt 1bf7440b54 nodejs: cleanup files no longer needed (#20212) 2016-11-10 00:11:42 +01:00
Profpatsch 65fe0e98d7 twitterBootstrap3: init at 3.3.7 (#19852) 2016-11-07 12:55:10 +01:00
Christine Koppelt c9d27cc3ea nodejs-7_x: init 2016-11-03 00:21:44 +01:00
Vladimír Čunát 7f805a60d8 nodejs: put back a comment about closure size 2016-11-02 17:49:19 +01:00
Tobias Pflug a5dad8aeeb nodejs: refactor derivations (#19973) 
* refactor and clean up the derivation composition
* add slim variation: the slim variations configure node without npm.
Building node with npm introduces a python runtime depndency through
gyp - slim variation makes sense for building small nodejs production
images
 2016-11-02 17:46:01 +01:00
Christine Koppelt 162c65fc87
nodejs-0_10: remove 
node.js 0.10 reaches end of LTS in a few days (see https://github.com/nodejs/LTS for details). Therefore I removed it and set 3 dependant packages to broken as they don't build anymore
 2016-10-28 07:43:04 -04:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Willi Butz d0f288e002 nodejs-5_x: remove outdated file 2016-10-20 22:45:09 +02:00
Daiderd Jordan cebb4788e5
nodejs: fix darwin build 2016-10-20 09:00:37 +02:00
Frederik Rietdijk ad227648c0 nodejs: use python2 2016-10-18 23:16:05 +02:00
Graham Christensen 66f2a01222
nodejs-6_x: 6.7.0 -> 6.8.0 2016-10-13 20:04:24 -04:00
Graham Christensen f9df1b5de0
nodejs: 4.4.6 -> 4.6.0 2016-10-13 20:04:23 -04:00
Mathias Schreck 5b21c716c6 nodejs: 6.6.0 -> 6.7.0 2016-09-28 10:54:26 +02:00
Tobias Pflug 53fe6fc0bb nodejs-6_x: 6.4.0 -> 6.6.0 2016-09-16 19:26:17 +02:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Sander van der Burg fcbaf2bc23 remarkjs: use node2nix generated expressions 
(cherry picked from commit 0f591992df)
 2016-09-02 13:02:37 +00:00
Tobias Pflug 86c8a63603 nodejs-6_x: 6.3.1 -> 6.4.0 2016-08-30 08:45:35 +02:00
Franz Pletz e8d9e31a08 valum: 0.2.0 -> 0.2.16, fixes hardened build 2016-08-24 20:18:46 +02:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
Ram Kromberg 672cf9455d valum: vala -> vala_0_28 2016-08-21 20:02:05 +03:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json 
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
 2016-08-11 23:07:09 +02:00
Rok Garbas f17ff218ff nodejs: ensure that all scripts in nodejs have proper shebangs (#17594) 2016-08-08 22:14:01 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
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