Commit Graph

19 Commits

Author SHA1 Message Date
Jörg Thalheim
ab7468eb1d harmonia: 0.7.4 -> 0.7.5 2024-03-21 17:49:27 +01:00
a-n-n-a-l-e-e
ce789e7e35
llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
Simon Žlender
6b3932ed4a harmonia: fix build on darwin 2023-12-21 22:56:44 +01:00
Jörg Thalheim
37fb10aa71 harmonia: 0.7.3 -> 0.7.4 2023-12-20 09:31:57 +01:00
Jörg Thalheim
2699f5c424 harmonia: 0.7.2 -> 0.7.3 2023-11-14 10:37:39 +01:00
Janne Heß
6c5d6e211f
harmonia: 0.7.1 -> 0.7.2 2023-08-30 21:06:31 +02:00
Jörg Thalheim
6b801a2830 harmonia: 0.7.0 -> 0.7.1 2023-08-07 11:19:17 +02:00
Jörg Thalheim
efe95a157a harmonia: 0.6.7 -> 0.7.0 2023-08-07 09:22:10 +10:00
Robert Hensing
4c1d3cee60 treewide: Add meta.mainProgram
This should fix most warnings getExe in based on grepping `nixos/`.
2023-07-31 21:54:43 +02:00
Ilan Joselevich
2bc84b6f67
harmonia: 0.6.4 -> 0.6.7 2023-06-20 20:12:49 +00:00
Ilan Joselevich
5d02fb0a6c
harmonia: 0.6.3 -> 0.6.4 2023-05-10 15:57:34 +00:00
Jörg Thalheim
76ffeaf06c nixos/harmonia: init service 2023-05-10 14:52:31 +02:00
Jörg Thalheim
115cd57ab5 harmonia: drop fab
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-05-10 14:40:52 +02:00
Jörg Thalheim
574bc9e054 harmonia: update homepage + maintainer 2023-05-10 14:40:51 +02:00
Jörg Thalheim
e7a72819bd harmonia: 0.6.2 -> 0.6.3 2023-05-07 19:55:30 +02:00
Jörg Thalheim
4408e386f1 harmonia: 0.6.1 -> 0.6.2
Diff: https://github.com/nix-community/harmonia/compare/refs/tags/harmonia-v0.6.1...harmonia-v0.6.2
2023-05-02 08:23:28 +02:00
Jörg Thalheim
7d6f837b80 harmonia: 0.6.0 -> 0.6.1 2023-04-04 12:00:39 +02:00
Jörg Thalheim
5f6b338fb0 harmonia: 0.2.0 -> 0.6.0
This also switches to a maintained fork of harmonia as discussed in https://github.com/NixOS/nixpkgs/issues/221498
2023-03-30 12:52:39 -03:00
Fabian Affolter
01d2fab743 harmonia: init at 0.2.0 2022-10-18 22:44:13 +02:00