Commit Graph

15 Commits

Author SHA1 Message Date
Martin Weinelt
3321e63b12
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/sphinx-autobuild/default.nix
2024-03-19 04:00:32 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +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
figsoda
dea17be39e topiary: fix build on darwin 2023-11-20 13:12:20 -05:00
figsoda
5653e06ea3 topiary: 0.2.3 -> 0.3.0
Diff: https://github.com/tweag/topiary/compare/v0.2.3...v0.3.0

Changelog: https://github.com/tweag/topiary/blob/v0.3.0/CHANGELOG.md
2023-10-02 10:18:33 -04:00
figsoda
4d32b87dc0
topiary: 0.2.2 -> 0.2.3 (#238767)
Diff: https://github.com/tweag/topiary/compare/v0.2.2...v0.2.3

Changelog: https://github.com/tweag/topiary/blob/v0.2.3/CHANGELOG.md
2023-06-20 20:59:13 +02:00
Weijia Wang
31a0a68dc7
Merge pull request #237356 from figsoda/topiary
topiary: 0.2.1 -> 0.2.2
2023-06-13 00:46:18 +03:00
Yuriy Taraday
a09afc8dac topiary: Add passthru.updateScript
Allows to use standard

```
  nix-shell maintainers/scripts/update.nix --argstr package topiary
```

to update topiary
2023-06-12 17:36:03 +02:00
figsoda
c910e69f34 topiary: 0.2.1 -> 0.2.2
Diff: https://github.com/tweag/topiary/compare/v0.2.1...v0.2.2

Changelog: https://github.com/tweag/topiary/blob/v0.2.2/CHANGELOG.md
2023-06-12 09:47:44 -04:00
figsoda
a1f57afc52 topiary: 0.2.0 -> 0.2.1
Diff: https://github.com/tweag/topiary/compare/v0.2.0...v0.2.1

Changelog: https://github.com/tweag/topiary/blob/v0.2.1/CHANGELOG.md
2023-05-23 07:34:10 -04:00
figsoda
180f05bf8c topiary: 0.1.0 -> 0.2.0
Diff: https://github.com/tweag/topiary/compare/v0.1.0...v0.2.0

Changelog: https://github.com/tweag/topiary/blob/v0.2.0/CHANGELOG.md
2023-05-22 10:39:43 -04:00
Yureka
f8cbc3c281 tree-wide: convert rust with git deps to importCargoLock 2023-03-26 01:52:04 +01:00
Niols
594c6593fc
topiary: unstable-2023-01-10 -> 0.1.0 2023-03-13 11:53:18 +00:00
figsoda
8f3de3efd4 topiary: unstable-2022-12-02 -> unstable-2023-01-10
Diff: ae861a3009...c36d4a2253
2023-01-10 16:28:19 -05:00
figsoda
7c01788915 topiary: init at unstable-2022-12-02 2022-12-02 11:41:17 -05:00