mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
55067 commits 218 branches 122 tags 7.1 GiB
Commit graph

15081 commits

Author SHA1 Message Date
Peter Simons 17589d33da haskell-list-t: add version 0.3.0 2014-12-13 12:06:01 +01:00
Peter Simons f514804aad haskell-mtl-prelude: add version 1.0.1 2014-12-13 12:06:01 +01:00
Michael Raskin 2c85888a04 Fix Firefox wrapper set-as-default functionality 2014-12-12 22:03:06 +03:00
Jaka Hudoklin 13e58784bf nixos/gitlab: fixes 
- fix timezone data not found
- fix module, add simple test
- allow to set port
 2014-12-12 18:01:31 +01:00
Thomas Hunger 59995e168c nixos: Add gitlab and gitlab-shell 
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
 2014-12-12 18:01:29 +01:00
tv 86055e2f00 nixopsUnstable: Initial version 1.3pre1362_2a616f8 2014-12-12 16:30:54 +01:00
Damien Cassou bc789064d8 Package for the Polari IRC app 
This commit includes a patch to telepathy's derivation, written by
Lethalman. This patch makes public the Telepathy's dependency to
dbus_glib. This patch will become problematic with the next pkgconfig
upgrade but this upgrade should make the patch irrelevant. See these 2
links for more information:
- https://bugs.freedesktop.org/show_bug.cgi?id=15199
- https://bugzilla.redhat.com/show_bug.cgi?id=436773

Modified by Luca Bruno:
- Moved telepathy_idle to propagatedUserEnvPkgs
- Added myself to maintainers
- Enable parallel building
 2014-12-12 15:12:19 +01:00
Damien Cassou f581054dc4 Add python package mutag 2014-12-12 13:35:27 +01:00
lethalman ed485025e3 Merge pull request #5305 from wizeman/u/scikit 
python3Packages.scikitlearn: Enable on py3k
 2014-12-12 09:48:51 +01:00
Austin Seipp 0bdff430a4 nixpkgs: rr 2.0.0 -> 3.0.0, with 64bit support 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-12 01:20:23 -06:00
Ricardo M. Correia b772ba327e python3Packages.scikitlearn: Enable on py3k 2014-12-12 03:48:07 +01:00
Brian McKenna a20ffe7f0f Add mimms, an mms (e.g. mms://) stream downloader 2014-12-11 19:27:36 -07:00
Jaka Hudoklin 8b512261be Add cava, console-based Audio Visualizer for Alsa 2014-12-12 00:09:32 +01:00
Domen Kožar d83bae657a deluge: 1.3.10 -> 1.3.11 2014-12-11 15:40:59 +01:00
Domen Kožar 8853d30707 pythonPackages.pyptlib: disable tests 
(cherry picked from commit c8d9073c0e)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-11 11:46:36 +01:00
Domen Kožar aaf998f604 remove libvlc, unused package 
cc @ttuegel
 2014-12-11 10:38:52 +01:00
Domen Kožar 9768adaf1e Revert "xulrunner: use gold linker" 
This reverts commit 4a3510ae2b.

Error occurs randomly http://hydra.nixos.org/eval/1165369
 2014-12-10 21:15:25 +01:00
Domen Kožar 89fa1733fa python3Packages.dateutil_2_1: fix build 2014-12-10 21:10:15 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove 
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
 2014-12-10 17:19:37 +01:00
Vladimír Čunát 62e5e2a880 apparmor: fix build by using older perl 
This is work around #5270.
Also bogus path in wrapper got fixed.

CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.
 2014-12-10 16:11:29 +01:00
Rok Garbas ed79420b55 weechatDevel: removing it 2014-12-10 14:59:41 +01:00
Mathijs Kwik 4a3510ae2b xulrunner: use gold linker 2014-12-10 13:56:04 +01:00
Vladimír Čunát d7a7b72353 qt5SDK: fix build by not building docs 
Feel free to find a proper fix.
 2014-12-10 13:20:36 +01:00
Domen Kožar 73ef06de48 flexget: fix runtime dependencies 2014-12-10 12:55:05 +01:00
Austin Seipp b31283dd8b nixpkgs: add tor-arm 1.4.5.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 03:59:59 -06:00
Mateusz Kowalczyk 4d520d9e12 haskell-call: new package 2014-12-10 09:42:03 +00:00
Mateusz Kowalczyk c4b4dfa1dc haskell-elevator: new package 2014-12-10 09:42:03 +00:00
Mateusz Kowalczyk 891a293aa6 haskell-bindings-portaudio: new package 2014-12-10 09:42:02 +00:00
lethalman 4faed098e8 Merge pull request #5278 from nckx/ftop 
Add ftop: show progress of open files and file systems
 2014-12-10 09:37:31 +01:00
Mateusz Kowalczyk a50a7ca3da haskell-hspec-laws: new package 2014-12-10 07:45:16 +00:00
Tobias Geerinckx-Rice 2e7d552122 Add ftop: show progress of open files and file systems 2014-12-10 05:34:57 +01:00
Domen Kožar 0fcef83b0d fix a bunch of perl modules 2014-12-10 01:38:00 +01:00
Vincent Laporte ef5c48326a Adds ocaml-fieldslib 
This library defines a syntax extension for OCaml using Camlp4 that
can be used to define first class values representing record fields,
and additional routines, to get and set record fields, iterate and
fold over all fields of a record and create new record values.

Homepage: https://ocaml.janestreet.com/
 2014-12-09 19:37:48 +01:00
Bjørn Forsman 1b396c7ae9 buildbot-slave: align attrname with pkgname 
Keep old attrname (buildbotSlave) around for backward compatibility.
 2014-12-09 19:14:03 +01:00
Dario Bertini 4ac75c3f79
Add paramiko test removal comment 2014-12-09 18:16:17 +01:00
Dario Bertini d1f9d97569
Skip nonreproducible Util test in paramiko 2014-12-09 17:21:53 +01:00
Domen Kožar fe28966179 pyptlib: disable py3k and pypy 2014-12-09 13:23:18 +01:00
Domen Kožar d7ab16aee4 remove cppnetlib, we already have cpp-netlib 2014-12-09 12:24:57 +01:00
lethalman 765eab6d5b Merge pull request #5269 from luke-clifton/lc-soundtouch 
Added SoundTouch library
 2014-12-09 10:25:26 +01:00
Luke Clifton e62aa58f71 Added SoundTouch library 2014-12-09 17:15:30 +08:00
William A. Kennington III a6f4c3624e kernel: Add 3.18 2014-12-08 23:18:04 -08:00
Alex Chapman 31b163b90b Add haskellPackages.ofx at version 0.4.0.0 2014-12-09 07:04:49 +11:00
Thomas Tuegel d75485c945 Add fontconfig-ultimate-20141123 2014-12-08 10:55:23 -06:00
wmertens 24924e4fdf Merge pull request #5125 from nckx/eid-mw 
Add eid-mw: authenticate & sign with Belgian eID identity cards
 2014-12-08 16:40:54 +01:00
Domen Kožar de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Luca Bruno 0b1d16cff2 vanubi: use Vala 0.26 2014-12-08 15:36:29 +01:00
Edward Tjörnhammar 3ce89ba002 srm: added package 2014-12-08 11:51:39 +01:00
Edward Tjörnhammar 7102ef5d49 Revert "nixpkgs: remove tsocks" 
torsocks and tsocks are not equivalent. torsocks needs a
tor proxy for DNS, tsocks do not.

This reverts commit 1ef6470f15.

tsocks: adding myself as maintainer
 2014-12-08 11:51:22 +01:00
Vincent Laporte 6a69a25c56 Adds coq-interval 
This library provides vernacular files containing tactics for
simplifying the proofs of inequalities on expressions of real numbers
for the Coq proof assistant.

Homepage: http://coq-interval.gforge.inria.fr/
 2014-12-08 09:15:13 +01:00
Michael Raskin 06f4ddf962 Add suckless.org sinit for experiments 2014-12-08 09:12:14 +03:00
Pavan Rikhi 211c9ba7f5 Add the Dina font 2014-12-07 18:11:49 -05:00
Benno Fünfstück 90c7b16fcf firefox-wrapper: add gstreamer plugins for h264 video support 
These plugins are required by firefox for the h264 support in HTML5 <video> tags.
 2014-12-07 20:37:17 +01:00
Cillian de Róiste 0d4843a388 ingen: update from 5464 to 5490, use default boost, wrap python scripts 2014-12-07 15:39:45 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Emery Hemingway 541ac07607 meters.lv2: initial package at 0.8.1 2014-12-06 14:20:58 -05:00
Bjørn Forsman f85ad2d378 nfs-utils: align attrname with pkgname 
nfsUtils => nfs-utils. Keep copy of old attribute for backward
compatibility.
 2014-12-06 17:01:05 +01:00
Bjørn Forsman 748b335256 sqlite-interactive: align attrname with pkgname 
sqliteInteractive => sqlite-interactive. Keep copy of old attribute for
backward compatibility.
 2014-12-06 17:01:05 +01:00
Bjørn Forsman 289ec3b5aa html-tidy: align attrname with pkgname 
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
 2014-12-06 17:01:05 +01:00
Peter Simons 0d9001e934 haskell-preprocessor-tools: remove obsolete version 0.1.3 2014-12-06 16:41:40 +01:00
Peter Simons e56b1610e7 haskell-ixdopp: remove obsolete package 2014-12-06 16:41:22 +01:00
Arseniy Seroka 6641f5d220 binary-strict: add haskell pkg 2014-12-06 18:34:23 +03:00
Arseniy Seroka 3cc8b15721 haskell: add pkg lin-alg 2014-12-06 18:24:30 +03:00
Bjørn Forsman 0ec7a55ec1 python-pycollada: update 0.4 -> 0.4.1 
Build tested with freecad, the only dependee.
 2014-12-06 16:13:15 +01:00
cillianderoiste aeea41f5c8 Merge pull request #5244 from ftrvxmtrx/schismtracker 
schismtracker: new package
 2014-12-06 14:40:08 +00:00
Austin Seipp d4dd59e74d nixpkgs: obfsproxy 0.2.2 -> 0.2.12 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:28 -06:00
Austin Seipp 1ef6470f15 nixpkgs: remove tsocks 
tsocks is old, and users should be using torsocks these days instead.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:26 -06:00
Pascal Wittmann 47eabfabe2 Merge pull request #5239 from robberer/pkgs/mrtg 
mrtg: add 2.17.4
 2014-12-06 10:58:53 +01:00
Longrin Wischnewski cf4318ad4e mrtg: add 2.17.4 
- The Multi Router Traffic Grapher
- You have a router, you want to know what it does all day long?
- Then MRTG is for you. It will monitor SNMP network devices and draw
- pretty pictures showing how much traffic has passed through each interface.
 2014-12-06 09:05:29 +01:00
Tobias Geerinckx-Rice 51ccf09ba2 Add duff: find duplicate files from the command line 2014-12-06 00:10:08 +01:00
Tobias Geerinckx-Rice b7425f8fef Add eid-mw: authenticate & sign with Belgian eID identity cards 2014-12-05 23:15:44 +01:00
Peter Simons efccab0cf2 Merge pull request #5232 from joachifm/haskell-mvc 
haskell-packages: add mvc and mvc-updates
 2014-12-05 18:53:02 +01:00
Peter Simons 6b45125f59 Merge pull request #5231 from luke-clifton/lc-linear-opengl 
Haskell package: linear-opengl
 2014-12-05 18:52:49 +01:00
Vincent Laporte 9d9323b3a9 camlimages: fix dependency 2014-12-05 14:55:25 +01:00
Joachim Fasting 0a9c590c8c haskell-mvc-updates: new expression 2014-12-05 14:25:50 +01:00
Joachim Fasting 757c39877b haskell-mvc: new expression 2014-12-05 14:25:50 +01:00
Benno Fünfstück effaa51680 firefox-wrapper: add missing gstreamer plugins 
These GStreamer plugins are required for H264 <video> tag support in Firefox.
 2014-12-05 14:22:51 +01:00
Pavan Rikhi b79bf417f0 Add the Clearlooks-Phenix GTK3 Theme 2014-12-05 05:13:17 -05:00
Luke Clifton 581fcc2ad2 Added linear-opengl 2014-12-05 16:08:39 +08:00
Michael Raskin b4084d4913 Just use old glm for LO, the rest of LO is not keen on using C++ git add -A 1 2014-12-05 10:51:40 +03:00
Charles Strahan aadb556e29 lastpass-cli: new package 
This adds the official lastpass CLI, a utility for manipulating lastpass logins.
 2014-12-04 18:23:25 -05:00
Arseniy Seroka 973e8ed171 Merge branch 'submit/vim-plugins-extra-file' of https://github.com/MarcWeber/nixpkgs into MarcWeber-submit/vim-plugins-extra-file 2014-12-05 01:43:18 +03:00
Peter Simons e51ece3a65 Merge pull request #5225 from jkarni/jkarni/monadIO 
Add haskell monadIO package.
 2014-12-04 22:36:49 +01:00
John Wiegley e5d92d45b7 coqPackages.coqeal: new expression 2014-12-04 14:15:30 -06:00
Julian K. Arni 1c55e474b9 Add haskell monadIO package. 2014-12-04 20:16:09 +01:00
Peter Simons 730286ddfd Merge pull request #5223 from Gonzih/master 
Add mopidy-mopify package
 2014-12-04 20:02:11 +01:00
Julian K. Arni f840b05fa1 Add haskell library parsec-extra. 2014-12-04 19:51:17 +01:00
Max Gonzih 0dd9d5d7d2 Add mopidy-mopify package to list of top-level packages 2014-12-04 18:46:40 +01:00
Thomas Tuegel 5c9de38488 zotero: use private firefox and xulrunner 
Zotero breaks every time firefox is updated (about every six weeks). It
is always fixed with the next zotero update, but that can take weeks.
Sometimes, upstream even skips firefox releases. This will stop zotero
breaking every time.
 2014-12-04 09:40:57 -06:00
Marc Weber abd016cea8 Refactoring vim plugins again: 
- sort automatcially generated vim derivations
- move the plugins to be derived by VAM into its own file: vim-plugin-names
- rename vimrc into vimUtils moving all common code into it
  so that it is possible to use it within ~/.nixpkgs/config.nix
- Moving all important documentation into vimUtils
- provide vimPlugins.pluginnames2Nix to provide a bin/vim-* command
  writing updated derivations into its buffer

VAM's repository's nix.vim got some improvements @ VAM repository, eg hg
fetchout out got fixed and shell failures are noticed now (Thanks to Arseniy
Seroka)
 2014-12-04 15:32:38 +01:00
Domen Kožar bd85d3ea7d qt-gstreamer1: fix build 2014-12-04 14:27:09 +01:00
Georges Dubus e019249936 Merge pull request #5169 from AndersonTorres/altcoins 
Altcoins
 2014-12-04 13:58:00 +01:00
Luca Bruno 51992d82a1 Merge "Ipxe" PR #5208 
Fixed some indentation issues
 2014-12-04 12:04:08 +01:00
Emery Hemingway 3faacca044 nixpkgs: iPXE initial package 2014-12-04 11:03:56 +01:00
cillianderoiste 24c0b84bea Merge pull request #5218 from olcai/icalendar 
Add pythonPackages.icalendar
 2014-12-04 09:14:40 +00:00
Erik Timan c0e7497484 Add olcai to maintainers 
Takes maintainership of pythonPackages.icalendar as well
 2014-12-04 09:05:36 +00:00
Evgeny Egorochkin 4672aadce2 KDE4: fix kdepim build 2014-12-04 10:22:27 +02:00
Erik Timan d41ae7ee90 Add pythonPackages.icalendar 2014-12-04 07:56:53 +00:00
John Wiegley aefdaaa098 haskellPackages.unboundGenerics: new expression 2014-12-04 00:19:29 -06:00
John Wiegley cded93d25d haskellPackages.hoopl: new expression 3.10.0.1 2014-12-03 22:33:13 -06:00
Domen Kožar 942d7b9006 pythonPackages.sure: fix pypy and py3k builds 2014-12-03 21:16:27 +01:00
Thomas Tuegel f7c27885d0 Add iwlegacy firmware for old Intel wireless cards 2014-12-03 10:10:00 -06:00
Peter Simons 1487b451c0 all-packages.nix: the default entry point to the R packages set is now pkgs/development/r-modules/default.nix 2014-12-03 16:28:28 +01:00
Georges Dubus 3441b41791 Merge pull request #5213 from olcai/master 
Add pythonPackages.azure
 2014-12-03 13:33:35 +01:00
Oliver Charles 9f30d7d038 haskellPackages.fixed,gl,half: New expressions 2014-12-03 12:07:06 +00:00
Erik Timan ce45fd97d4 Add pythonPackages.azure 2014-12-03 10:42:45 +00:00
Domen Kožar edef7d7ce0 pythonPackages.greenlet: 0.4.4 -> 0.4.5 2014-12-03 11:20:20 +01:00
Domen Kožar e144d50237 pythonPackages.sure: 1.2.7 -> 1.2.8 2014-12-03 11:10:47 +01:00
Bjørn Forsman fad7619799 python-seqdiag: update from 0.9.0 to 0.9.4 2014-12-03 07:43:06 +01:00
Bjørn Forsman 7317066e64 python-nwdiag: update from 1.0.0 to 1.0.3 2014-12-03 07:42:08 +01:00
Bjørn Forsman 6600bff65a python-construct: update from 2.5.1 to 2.5.2 2014-12-03 07:31:20 +01:00
Bjørn Forsman e3fcb91e42 python-blockdiag: update from 1.3.2 to 1.4.7 2014-12-03 07:26:20 +01:00
Bjørn Forsman 8bd848a565 python-actdiag: update from 0.5.1 to 0.5.3 2014-12-03 07:24:49 +01:00
Bjørn Forsman cf33e3c3eb python-robotframework-selenium2library: update 1.5.0 -> 1.6.0 2014-12-02 22:56:43 +01:00
Bjørn Forsman f7b0cc6fab python-robotframework: update 2.8.5 -> 2.8.6 2014-12-02 22:56:43 +01:00
Bjørn Forsman af6001a625 python-usbtmc: update 0.5 -> 0.6 2014-12-02 21:23:50 +01:00
cillianderoiste ebc96e4b0a Merge pull request #5201 from geerds/pidgin-window-merge 
Add package pidgin-window-merge
 2014-12-02 16:35:24 +00:00
Jaka Hudoklin 67e703e630 pythonPackages: ugly fix docker registry dependencies 2014-12-02 16:50:11 +01:00
Jaka Hudoklin aeba2947b0 Add chronos, fault tolerant job scheduler for Mesos 2014-12-02 12:22:05 +01:00
Jascha Geerds 4ba9aa074f Add package pidgin-window-merge 2014-12-02 11:37:11 +01:00
lethalman 14ba80a6e1 Merge pull request #5008 from nbp/rr 
Add rr & libpfm.
 2014-12-02 11:17:28 +01:00
Domen Kožar 9744404038 Merge pull request #5147 from teh/matplotlib 
Update matplotlib to 1.4.2.
 2014-12-02 10:55:43 +01:00
Michael Raskin 60b660b33a Adding slmenu 2014-12-02 12:29:54 +03:00
William A. Kennington III 1716c12b54 iwlwifi: Split into separate package with more up to date firmware 2014-12-01 16:25:20 -08:00
Arseniy Seroka ea3292523c daemons: add haskell pkg 2014-12-02 01:12:05 +03:00
Domen Kožar e8c4ef278c Merge pull request #5007 from nbp/bugwarrior 
Add Bugwarrior and its dependencies.
 2014-12-01 22:20:17 +01:00
Domen Kožar 50515b221e Merge pull request #5090 from eduarrrd/gramps 
Add gramps package.
 2014-12-01 22:06:22 +01:00
Oliver Charles 465a163e95 haskellPackages.opaleye: New expression 2014-12-01 19:18:43 +00:00
Siarhei Zirukin 1518d65866 schismtracker: new package 2014-12-01 19:58:25 +01:00
Moritz Ulrich 77049af46f pngcheck: New package. 2014-12-01 17:05:20 +01:00
Georges Dubus 1c3a9336ed Packaged cloud-init and its dependencies 2014-12-01 10:55:45 +01:00
Charles Strahan fcb173f70f rescuetime: a time tracking service 2014-12-01 05:16:57 +00:00
Jaka Hudoklin 725c55c810 nodePackages: hack version override sed some more to support github packages, until better solution is found 2014-12-01 03:04:55 +01:00
Jaka Hudoklin 61e19d6e81 rubyLibs: add tmuxinator, update 2014-12-01 00:39:40 +01:00
Domen Kožar 304b71bf64 deluge: 1.3.7 -> 1.3.10 2014-11-30 20:42:06 +01:00
Domen Kožar 1ad22e8c55 Merge pull request #5189 from NixOS/almir 
almir: pin the sqlalchemy version used by zope.sqlalchemy to 8
 2014-11-30 17:23:53 +01:00
Nicolas Pierron 1b294105d7 libpfm & rr: Add packages. 2014-11-30 17:20:34 +01:00
Nicolas B. Pierron ccc089f601 Add python-bugwarrior 1.0.2. 2014-11-30 16:48:52 +01:00
Nicolas B. Pierron 43bbfae9e5 Add python-taskw 0.8.6. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron 82f42f38bf Bump Jinja2 to version 2.7.3. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron e778d5dcfb Add python-bugzilla 1.1.0. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron 9e4de80736 Add python-Twiggy 0.4.5. 2014-11-30 16:48:51 +01:00
William A. Kennington III 92448fb3ae boost: Pin packages to 1.56 2014-11-30 05:33:35 -08:00
William A. Kennington III 5825d82e5f boost: Pin packages to 1.56 2014-11-30 05:31:02 -08:00
Arseniy Seroka 5b8fb2239c Merge pull request #5188 from DamienCassou/umlet 
New package for Umlet 13.1
 2014-11-30 15:30:03 +03:00
Cillian de Róiste 8cc590710c almir: pin the sqlalchemy version used by zope.sqlalchemy to 8 
Otherwise, sqlalchemy 9 is used which triggers iElectric/almir#61
pinning it to 7 caused a build error. This does mean that both versions
are on the PYTHONPATH, but it seems to work.
 2014-11-30 12:59:54 +01:00
Damien Cassou dcc2f1ac38 New package for Umlet 13.1 2014-11-30 12:56:08 +01:00
Arseniy Seroka c981f755a0 Merge pull request #5177 from sivteck/hask-package 
add hask, the haskell package
 2014-11-30 13:24:31 +03:00
Arseniy Seroka f8e1087209 Merge pull request #5121 from coreyoconnor/primus-upstream 
Add primus and extend bumblebee to support 32bit/64bit multilib
 2014-11-30 13:23:30 +03:00
Cillian de Róiste e0f0e2c731 Update sonic-visualiser 2.3 -> 2.4.1 and fix attribute name 2014-11-30 10:57:40 +01:00
William A. Kennington III f3d515e6dd Merge pull request #5091 from wkennington/master.boost 
This is close enough that any remaining incompatibilities can be sorted out.
 2014-11-29 22:48:44 -08:00