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 4e8da0747c88375c221bf1b0f060183a863c6851)
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 e22889064f82be3
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 eb3794186c7357c9cf1abc5d9162d16f29526996.
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 e640935da6052547faaa8fe7d63bd8774de9f45c.
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