1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 02:24:27 +00:00
Commit graph

237 commits

Author SHA1 Message Date
Jan Tojnar 7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Daniel Nagy 052afa73a8
boost171: remove 2021-08-20 10:23:07 +02:00
John Ericson 904625852d pkgsStatic: Inline more of static overlay 2021-08-19 21:55:06 +00:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Doron Behar 7915d1e03f
Merge pull request #126398 from nagy/boost-167-remove
boost167: remove
2021-08-16 11:18:00 +00:00
sternenseemann 43e0f0688a boost: always set toolset for known compilers
There is an edge case when cross compiling where the auto detection
script would not correctly recognize the compiler (as it is only
good at recognizing native compilers, really, which we don't have
anymore since we don't need the build->build one anymore).

If bootstrap.sh doesn't detect the compiler correctly, it'll generate
a project-config.jam with a syntax error which breaks the build in a
hard to spot way: only a warning is displayed after configuring, the
build will appear to run normally until it fails quietly just before
installing. By providing it explicitly, we can prevent this.
2021-08-04 23:48:22 +02:00
sternenseemann d20aa4955d boost*: use packaged b2 instead it of building in configurePhase
If we build two things in one derivation, it becomes more complicated
and its build time is extended. Therefore we should avoid this if
possible. There's a good opportunity for this with boost: We have
boost-build packaged already. This has the additional benefit that
we can get rid of $CC_FOR_BUILD entirely in boost, meaning we don't
need to rely on (as many) hacks to make boost understand our way of
cross compiling.

Unfortunately boost-build is not backwards compatible, so we need to
build a specific boost-build for each boost derivation (the number
could probably be reduced, but I'm not interested in testing a lot
of boost builds at the moment).

Additionally we fix a few cross compilation problems:

- boost couldn't cope with different types of compilers for native
  and cross (as happens if useLLVM is true). Since we only use one
  of them per derivation, this is no longer an issue.

- boost didn't find the cross ar and ranlib for compilation (since
  it doesn't check $AR or $RANLIB). Instead it used plain ar and
  ranlib form $PATH which were the native ones before. This is now
  fixed by setting these tools explicitly in user-config.jam (and
  no longer providing the native tools).

With these changes, pkgsLLVM.boost builds.

On darwin, instead of patching the clang-darwin.jam definition, we
instead supply -rpath $out/lib via <linkflags> which causes the
correct directory to be added to the libraries' rpaths, so that
they find each other.
2021-08-04 14:46:38 +02:00
Frederik Rietdijk f887fbcaef boost: python is only used when called from python-packages.nix 2021-07-27 20:37:04 +02:00
Daniel Nagy ce76ecf505
boost167: remove 2021-06-09 22:13:53 +02:00
oxalica 74e20c9b27 boost: fix cross-compile support 2021-03-03 18:14:24 -05:00
oxalica 9dd7348c04 boost: fix meta.badPlatforms 2021-03-03 18:14:24 -05:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Markus Kowalewski 6dba41fbcb
mpi: use mpi attribute consistently as the default MPI implementations
Use the attribute mpi to provide a system wide default MPI
implementation. The default is openmpi (as before).
This now allows for overriding the MPI implentation by using
the overlay mechanism. Build all packages with mpich instead
of the default openmpi can now be achived like this:
self: super:
 {
   mpi = super.mpich;
 }

All derivations that have been using "mpi ? null" to provide optional
building with MPI have been change in the following way to allow for
optional builds with MPI:
{ ...
, mpi
, useMpi ? false
}
2021-01-23 12:15:13 +01:00
Ben Siraphob 66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
John Ericson f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Peter Simons 7bc8c1ce4f
Merge pull request #107116 from nagy/boost175
boost175: init at 1.75.0
2020-12-26 16:39:04 +01:00
Daniel Nagy 31066910b9
boost175: init at 1.75.0 2020-12-17 19:38:23 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Ryan Burns ca89e801ea boost: fix segfaults on ppc64
Fixes https://github.com/NixOS/nix/issues/2517

See also:
https://github.com/boostorg/context/issues/72
https://github.com/boostorg/fiber/issues/193

These issues have been resolved by:
https://github.com/boostorg/context/pull/106
d4608a4e8b
which is merged into boost as of v1.71.0.

This feature was introduced (with the bug) in
boost v1.61 and was fixed in v1.71. So we apply
the patch to all versions in that range.
2020-10-22 01:11:21 -07:00
Daiderd Jordan bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
Andrew Childs 722d02a720 treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
2020-10-21 13:26:53 +09:00
Rasmus Rendal 78b030f317 boost174: init at 1.74.0 2020-10-11 10:26:47 +02:00
Rasmus Rendal 35e296f5e5 boost173: init at 1.73.0 2020-10-11 10:26:47 +02:00
TQ Hirsch 777df0b4a5 boost: Fix library and include paths in generated cmake files
Boost generates its installed cmake configuration using custom logic
in its own build system; while this logic *knows* where it should be
installed, the generated config overrides the correct information with
new paths based on the location of the cmake configuration file in an
attempt to let the package be relocated after installation.

This patch simply undoes that.
2020-04-14 23:41:10 +02:00
Holger Wünsche 556b0e89ca
boost: check clang version
boost <1.69 can't be compiled with clang >=8. This commit adds an assert
to catch the error early on.
2020-04-13 16:01:50 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Matthias Beyer c028978211 boost: init at 1.72.0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-03 13:52:06 +02:00
Benjamin Hipple f5140d1b1e boost: remove versions 1.62, 1.63, and 1.64
These are relatively old, expensive to compile/cache, and not used by any
packages in the distribution.
2020-03-13 04:05:05 +00:00
Robin Gloster e298629fec
boost: *Flags are lists 2019-12-30 11:13:39 +01:00
Pulkit Sinha 562db4bbf9
boost : extra arguments to b2
Certain boost features require compile time flags. For example -
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/adv_scenarios/obsolete_init_func.html
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/link_references/link_boost_test_no_main.html
https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/link_references/link_boost_test_dyn_link.html

This commit add the ability to specify arbitrary extra arguments to b2's arguments.
2019-11-29 13:17:59 -05:00
Will Dietz 44d9a86f41
Merge pull request #67282 from dtzWill/feature/boost-1.71
boost171: init at 1.71.0
2019-11-16 01:15:09 -06:00
Will Dietz b538402127
boost171: use 'urls' attribute per suggestion (thanks!)
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
2019-09-03 18:20:22 -05:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Will Dietz bf3de125a3
boost171: grab from bintray, not on sf.net ("yet"?) 2019-08-22 13:43:58 -05:00
Will Dietz 3a192fb519
boost171: init at 1.71.0 2019-08-22 13:43:39 -05:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Vladimír Čunát b4ae841b23
Merge branch 'staging-next' into staging 2019-05-26 09:48:55 +02:00
Benjamin Hipple 3232cadf96 boost: run build and install hooks
Users who want to patch boost may put a postInstall hook in an overlay, which
requires that that expression runs them on the buildPhase and installPhase.
2019-05-24 17:46:46 -04:00
Matthew Bauer 3d26f06a19
Merge pull request #59754 from matthewbauer/remove-old-patches
Cleanup; Remove old patches
2019-05-18 15:36:17 -05:00
Frederik Rietdijk 0196d8f11c Merge master into staging-next 2019-05-07 09:00:06 +02:00
Peter Simons 3039b8db0c
Merge pull request #59602 from amirshavit/boost170
boost 170: init at 1.70.0
2019-05-06 14:41:17 +02:00
Matthew Bauer da38a49a24 treewide: mark bad packages
Some old stuff is known not to work.
2019-04-26 21:55:11 -04:00
Dmitry Kalinkin a2e8e6ffc9 boost167: patch for macOS 10.12 2019-04-26 21:54:57 -04:00
Matthew Bauer a3ac12aca9 boost: remove old cygwin patches
Most of these are unused and the others only used in 1.59.
2019-04-16 22:18:30 -04:00
strager 153e7fca32 boost: fix 1.55 build on macOS (#59508)
darwin-no-system-python.patch does not apply cleany on Boost 1.55's
sources. Fix this patch file for Boost 1.55, making it build
successfully on macOS.
2019-04-16 03:11:01 -04:00
Amir Shavit 9ce38796b1 boost170: init at 1.70.0 2019-04-15 13:24:55 +01:00
Peter Simons 3300c60fca boost: fix misspelled version numbers in 1.66.0, 1.67.0, 1.68.0, and 1.69.0 2019-03-06 15:12:57 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Samuel Dionne-Riel 3c38cc8058
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
2018-12-20 21:06:52 -05:00