3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

185 commits

Author SHA1 Message Date
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
Peter Simons 73f53ddf9c Merge pull request #11878 from lancelotsix/update_boost
pkgs.boost: 1.59 -> 1.60
2016-03-17 19:45:44 +01:00
Michael Raitza f7bf249b2b boost: Fix compilation for static builds.
The 'runtime-link=' feature must not be set in addition to 'link='
for boost-1.55 when building only the statically linked libraries.
Fixes errors that targets were defined multiple times.
2016-03-08 10:04:04 +00: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
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Lancelot SIX aa89e98474 pkgs.boost: 1.59 -> 1.60
See http://www.boost.org/users/history/version_1_60_0.html
2016-01-15 13:25:25 +01:00
janus 55aa9163cc FreeBSD: minor fixes, add notes and make stdenv more robust 2016-01-01 17:01:13 +00:00
janus 3cb831d2bc FreeBSD patches for miniupnpc, boost, bitcoin 2016-01-01 16:59:48 +00: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
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
John Wiegley 22392d8134 Correction to Boost RPATH for Darwin systems 2015-10-31 09:35:06 -07:00
Vladimír Čunát dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00
Vladimír Čunát 17a3f6a6fa icu: split into multiple outputs 2015-10-13 20:18:44 +02:00
Vladimír Čunát afd37d9251 boost-1.55: fix build with gcc-5 by upstream patch
Our higher versions have fix integrated upstream.

(cherry picked from commit 4e8da0747c)
2015-10-04 12:36:21 +02:00
Vladimír Čunát 4e8da0747c boost-1.55: fix build with gcc-5 by upstream patch
Our higher versions have fix integrated upstream.
2015-10-04 12:35:51 +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 1bc98b2e36 boost: Reduce the number of supported versions 2015-09-17 15:40:32 -07:00
William A. Kennington III da908b458b boost: Remove unused 1.58 2015-09-17 14:49:13 -07:00
William A. Kennington III c6d73dcbb0 boost: Add 1.59 2015-08-30 18:13:58 -07:00
William A. Kennington III 42ccbd9950 boost: Add 1.58 and make it the default 2015-07-17 14:34:19 -07:00
Rok Garbas 8908471ecc cygwin: add needed patches for boost 1.57.0 to build 2015-06-05 00:39:15 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vincent Laporte 7cf05bfe71 boost: use ${python.interpreter} rather than ${python}/bin/python 2015-04-25 22:35:25 +02:00
Vladimír Čunát ec6cb5742b boost: fix build; outputs seem same as on master 2015-04-19 15:15:09 +02:00
Dan Peebles b0e1db1159 Fix boost 1.55 on clang (1.56 onwards already have the fix)
See https://trac.macports.org/ticket/42282 for more.
2015-02-08 22:19:04 -05:00
William A. Kennington III 5a3683d7ee boost: Add 1.57.0 2014-11-23 02:33:15 -08:00
William A. Kennington III 07e80c6d98 boost: Add dependency fix for ipp files 2014-11-21 16:11:21 -08:00
William A. Kennington III 69bf3bd070 Merge pull request #4800 from aherrmann/pr_boost_mpi
boost 1.55: Add Boost.MPI (optional)
2014-11-15 00:59:49 -08:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Eelco Dolstra 19ea871862 boost: Fix building on Darwin 2014-11-11 10:17:08 -05:00
William A. Kennington III 83cecbdcbc boost: Fix runtime dependencies in fixup instead of using a hook to fix binaries 2014-11-10 13:15:37 -08:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Andreas Herrmann fe3267ac39 boost: Add optional Boost.MPI support
Boost.MPI is a C++ interface library to the
message passing interface (MPI) standard.
2014-11-05 10:39:34 +01:00
Michael Raskin 18ac683bbc Fix Boost 1.55 build 2014-11-04 15:21:33 +03:00
John Wiegley a4ee94b741 boost: correct the install names for darwin
This also makes the recent change for ledger unnecessary.
2014-11-04 02:28:35 -06:00
William A. Kennington III 8d605dafc6 boost: Pass arguments to generic.nix 2014-11-03 11:14:08 -08:00
William A. Kennington III 09d970ce12 boost: Remove dependencies on boost-dev 2014-11-02 17:22:27 -08:00
William A. Kennington III af8654db27 boost: Refactor into generic.nix 2014-11-02 17:22:27 -08:00
William A. Kennington III 1df867f008 boost: Remove old boost 2014-11-02 17:22:27 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
William A. Kennington III ecfc1a7fc3 Revert "boost: Quick eval fix"
This reverts commit eb3794186c.
2014-11-02 17:22:27 -08:00
William A. Kennington III 9b61ab1823 boost: Fix library dependencies 2014-11-02 17:22:27 -08:00
William A. Kennington III 529bd816c5 boost: Change header output name 2014-11-02 17:22:27 -08:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Domen Kožar 9fe2ac79af Revert "boost155: specify lib dir for lib output"
This reverts commit e640935da6.
2014-09-23 16:00:30 +02:00
Domen Kožar e640935da6 boost155: specify lib dir for lib output 2014-09-23 15:59:14 +02:00
Eelco Dolstra eb3794186c boost: Quick eval fix 2014-09-23 15:37:19 +02:00
Domen Kožar 9f057131f1 fix eval 2014-09-23 14:23:54 +02:00
Eelco Dolstra 9126447710 Bring back Boost 1.55 for now 2014-09-23 11:58:03 +02:00
William A. Kennington III f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
William A. Kennington III 89cf0e4fea boost: 1.55 -> 1.56 2014-09-21 15:18:16 -07:00
Eric Seidel e22889064f fix boost build with clang 2014-09-09 13:54:26 -07:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra 6303278ad3 boost: Drop unnecessary runtime dependency on Python
The only file that actually referred to the Python interpreter was
share/boost-build/example/customization/inline_file.py. So get rid of
the whole example directory.
2014-06-25 13:32:40 +02:00
Vladimír Čunát 161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Vladimír Čunát 35c586e624 boost149: fix CVE-2013-0252 by upstream patch
Also have just one patch per line in the expression.
2014-02-06 21:59:01 +01:00
Eelco Dolstra 6e2c60ad10 boost: Replace bjam with a symlink 2014-01-15 13:42:16 +01:00
Eelco Dolstra 8622548160 Add a setup hook for fixing dylib install names on Darwin
Install names need to be absolute paths, otherwise programs that link
against the dylib won't work without setting $DYLD_LIBRARY_PATH.  Most
packages do this correctly, but some (like Boost and ICU) do not.
This setup hook absolutizes all install names.
2014-01-15 13:41:09 +01:00
Shea Levy cc26a4b803 boost: enable setting toolset
Contribution suggested/initially implemented by Martin Bravenboer

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-14 07:23:48 -05:00
Eelco Dolstra ec5739ef17 jfsrec: Fix build
http://hydra.nixos.org/build/7008843
2013-12-10 14:28:19 +01:00
Eelco Dolstra ed463a7671 boost: Remove 1.53 and 1.54
These don't build against Glibc 2.18, but they're not used anyway
(except by source-highlight, which builds fine against 1.49).
2013-12-10 12:02:53 +01:00
Eelco Dolstra 2a36c61541 boost-1.49: Fix building against Glibc 2.18
Glibc 2.18 no longer defines __GLIBC_HAVE_LONG_LONG.

http://hydra.nixos.org/build/7003618
2013-12-10 11:50:29 +01:00
Aristid Breitkreuz f923c32204 boost: fix hardcoded hash
Closes #1209

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 23:02:39 +00:00
Peter Simons 2192ddec0e boost: say hello to version 1.55.0 2013-11-11 22:08:47 +01:00
Peter Simons 9e98650f8d boost: generalize the header-only expression
The 'header-only-wrapper' expression can now wrap any version of boost
that's passed to it as an argument.
2013-07-03 21:38:34 +02:00
Peter Simons ea04555518 boost-headers: update to version 1.54.0 2013-07-03 21:26:31 +02:00
Peter Simons cb31653acb boost: add version 1.54.0 2013-07-03 18:55:51 +02:00
Rob Vermaas da70c21cf7 Fix boost-1.49.0 on Darwin 2013-05-23 22:19:58 +02:00
Rob Vermaas ec8a661bf4 boost-1.44.0: also apply time utc patch that was applied for 1.49.0. Needed to be adapted for 1.44.0. 2013-04-12 14:26:16 +02:00
Lluís Batlle i Rossell 74275af383 boost: properly quoting cflags parameters 2013-03-13 16:48:51 +01:00
Vladimír Čunát fa42471a2f boost147: remove, seemed unneeded 2013-02-24 09:42:26 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons 28752752c0 boost: rename patch for version 1.47.0 to include its version number in the file name 2013-02-09 21:07:27 +01:00
Peter Simons 227dd2695c boost: remove obsolete version 1.52.0 2013-02-09 21:06:45 +01:00
Peter Simons 0edf39f1f8 boost-headers: remove obsolete version 1.49.0 2013-02-09 21:06:23 +01:00
Peter Simons 37db55f3ec boost: remove obsolete version 1.51.0 2013-02-09 21:04:31 +01:00
Peter Simons ad934df597 boost: remove obsolete version 1.46.0 2013-02-09 21:02:48 +01:00
Peter Simons 4aa56c21c8 Rename "boost-x.y.z-headers" derivation to "boost-headers-x.y.z" to ensure that
nix-env picks the full boost distribution when "nix-env -i boost" is installed.
2013-02-06 12:35:00 +01:00
Peter Simons af9747c1ef boost: add version 1.53.0
The default 'boost' attribute has not been updated yet as this needs
further testing.
2013-02-06 12:33:55 +01:00
Eelco Dolstra 1b7c5d3717 Remove some unused Boost versions 2013-01-28 17:19:02 +01:00
Eelco Dolstra f6e012591f Rename boost => boost-headers
Suffixes like "-headers" should go *before* the version part;
otherwise nix-env will think boost and boost-*-headers are the same
package.
2013-01-28 17:19:02 +01:00
Eelco Dolstra 84adcc2241 boost-1.49: Fix build
http://hydra.nixos.org/build/3890924
2013-01-28 17:19:01 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Evgeny Egorochkin a787cf2891 Boost: fix to install bjam 2012-12-10 13:35:24 +02:00
Rok Garbas 61d6ab05c5 boost: wrong unpacking command 2012-11-25 18:59:38 +01:00
Peter Simons 31ca4356fb boost: update to version 1.52.0 2012-11-05 21:45:51 +01:00
Peter Simons d3dc95834a boost-headers: update to version 1.51.0 2012-09-25 12:16:01 +02:00
Peter Simons bae4524eee boost: delete obsolete version 1.50.0 2012-09-25 12:15:59 +02:00
Peter Simons a9da133fda boost: add version 1.51.0 2012-09-08 14:35:05 +02:00
Peter Simons a59ed42a8b boost-1.50: added 'taggedLayout' parameter to force use of tagged layout in single variant builds 2012-07-07 12:01:25 +02:00
Peter Simons eb7ad413b8 boost-1.44: add 'taggedLayout' parameter to force use of tagged layout in single-variant builds 2012-07-07 11:57:14 +02:00
Shea Levy 4f8d6d0ee2 Merge remote-tracking branch 'peti/boost-cleanup'
Keep boost-1.49 for now.
2012-07-02 01:05:52 -04:00
Peter Simons 42faecad0d boost: delete unused versions 1.42.0, 1.48.0, and 1.49.0 as well as 1.49.0-headers 2012-06-28 18:06:59 +02:00
Peter Simons 8498c9b86c boost: update to version 1.50.0 2012-06-28 16:42:41 +02:00
Lluís Batlle i Rossell 526b207211 Adding a headers-only version of boost. I wrote it in a new file, replicating
the 'src', because to me this way looks simpler despite the copy of src..


svn path=/nixpkgs/trunk/; revision=33805
2012-04-16 22:13:27 +00:00
Peter Simons 9e7a5c5157 boost: updated to version 1.49
svn path=/nixpkgs/trunk/; revision=32562
2012-02-25 19:22:06 +00:00