Commit Graph

9 Commits

Author SHA1 Message Date
github-actions[bot]
87a5d42cfa
Merge master into staging-next 2024-03-14 12:01:18 +00:00
R. Ryantm
d39877919e nickel: 1.4.1 -> 1.5.0 2024-03-13 23:08:33 +00: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
R. Ryantm
ce23190491 nickel: 1.4.0 -> 1.4.1 2024-01-26 02:10:44 +00:00
Felix Schröter
732bb2c5ef
nickel: 1.3.0 -> 1.4.0
https://github.com/tweag/nickel/releases/tag/1.4.0
2024-01-18 01:39:10 +01:00
zimbatm
4f56bd894c nickel: add meta.mainProgram 2024-01-02 22:20:08 +01:00
Simon Žlender
5f8f287c17 nickel: fix build on darwin 2023-11-20 23:17:40 -03:00
Yann Hamdaoui
a4e607c9f4
update nickel: 1.2.2 -> 1.3.0 2023-11-16 18:43:01 +01:00
Anderson Torres
b28b483ad3 nickel: migrate to by-name 2023-10-11 22:20:32 -03:00