Commit Graph

1408 Commits

Author SHA1 Message Date
Randy Eckenrode
5f43b93b50
Merge pull request #300484 from reckenrode/libiconv-revert
darwin.libiconv: revert switch to libiconvReal
2024-03-31 11:23:13 -04:00
Randy Eckenrode
a426aa3a3f
Revert "darwin.libiconv: remove and add to darwin-aliases"
This reverts commit 521ea079b9.
2024-03-31 09:57:54 -04:00
github-actions[bot]
d7ece48399
Merge staging-next into staging 2024-03-30 18:01:46 +00:00
github-actions[bot]
50812f5204
Merge master into staging-next 2024-03-30 18:01:17 +00:00
Weijia Wang
602a94f999
Merge pull request #300024 from hraban/grandperspective/mainprogram
grandperspective: set mainProgram, link $out/bin
2024-03-30 17:20:00 +01:00
Hraban Luyat
a74d6c775b grandperspective: set mainProgram, link $out/bin 2024-03-29 13:14:49 -04:00
Randy Eckenrode
39a5f4a6ee
darwin.apple_sdk.sdkRoot: init at 10.12 and 11.0
Based on the derivation from xcbuild.sdk. apple_sdk.sdkRoot provides
version plists and a hook that passes them automatically to the compiler
as `-isysroot`. This is needed to correctly set the SDK version in
compiled binaries. Otherwise, clang will infer the SDK version to be the
same as the deployment target, which is usually not what you want.
2024-03-29 08:47:41 -04:00
Randy Eckenrode
79db5b641e
darwin.apple_sdk_10_12: add objc4 2024-03-29 08:47:41 -04:00
Randy Eckenrode
2573f2c44a
darwin.apple_sdk_10_12: add Libsystem 2024-03-29 08:47:40 -04:00
Randy Eckenrode
1500fe6dda
Merge pull request #299613 from reckenrode/libiconv-switch
darwin.libiconv: switch to libiconvReal and add to darwin-aliases
2024-03-28 23:35:42 -04:00
github-actions[bot]
373201cddf
Merge staging-next into staging 2024-03-28 00:02:59 +00:00
github-actions[bot]
944103e875
Merge master into staging-next 2024-03-28 00:02:30 +00:00
Randy Eckenrode
521ea079b9
darwin.libiconv: remove and add to darwin-aliases 2024-03-27 17:34:51 -04:00
Randy Eckenrode
6ed574305e
Merge pull request #297290 from reckenrode/binutils-fix 2024-03-27 17:21:28 -04:00
DontEatOreo
ba1834b908
mousecape: move to by-name/mo
- Previously package resided in darwin/mousecape due to confusion, this
  breaks the pkgs category hierarchy as mentioned by
  https://github.com/NixOS/nixpkgs/pull/299032#issuecomment-2021684755
- Also switched to using fetchzip
- Fixed maintainer name
2024-03-27 18:43:54 +02:00
github-actions[bot]
607cdcc471
Merge master into staging-next 2024-03-26 18:01:21 +00:00
Pol Dellaiera
71df962dfd
Merge pull request #299032 from DontEatOreo/darwin-mousecape
mousecape: init at 1813
2024-03-26 18:07:34 +01:00
github-actions[bot]
e6f06c8dc6
Merge master into staging-next 2024-03-26 12:01:01 +00:00
DontEatOreo
539f801b60
mousecape: init at 1813 2024-03-26 00:09:19 +02:00
Austin Horstman
5a1b40ea92
yabai: 7.0.2 -> 7.0.3 2024-03-25 14:05:52 -05:00
Austin Horstman
bb9a549d5c
yabai: add passthru.updateScript 2024-03-25 14:03:16 -05:00
annalee
7541ec60b6
Merge remote-tracking branch 'upstream/master' into staging-next 2024-03-25 18:04:41 +00:00
Austin Horstman
79391c8b92
yabai: refactor derivation (#297334)
Currently, yabai doesn't show up in nixos package search
and, maintainers dont get notified on pull requests.
Reorganizing derivation to resolve.
2024-03-25 13:17:02 +01:00
github-actions[bot]
df8426f141
Merge master into staging-next 2024-03-25 06:01:21 +00:00
DontEatOreo
7f6fd46ab6
raycast: 1.66.2 -> 1.70.2 2024-03-24 22:22:11 +02:00
github-actions[bot]
7f8db6f00d
Merge staging-next into staging 2024-03-20 18:01:38 +00:00
github-actions[bot]
36232fff71
Merge master into staging-next 2024-03-20 18:01:02 +00:00
Weijia Wang
bc8d07840e
Merge pull request #296780 from wegank/opencflite-bump
opencflite: 476.19.0 -> 635.21.8
2024-03-20 14:42:25 +01:00
Weijia Wang
ea012e17f7 maloader: unstable-2014-02-25 -> 0-unstable-2018-05-02 2024-03-20 09:53:22 +01:00
Randy Eckenrode
3c0088e8a8
darwin.binutils: properly handle cctools-llvm
- Only link `libexec` when using cctools-port. cctools-llvm does not
  have a `libexec` folder;
- Use `as` provided by cctools-llvm, which is already using the
  clang-integrated assembler on both platforms; and
- Clean up inconsistent use of `builtins`.
2024-03-19 19:04:55 -04:00
github-actions[bot]
66eeab8faf
Merge staging-next into staging 2024-03-19 06:01:43 +00:00
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
Weijia Wang
ad87dc75d6 opencflite: 476.19.0 -> 635.21.8 2024-03-18 00:23:38 +01:00
github-actions[bot]
83409a8a66
Merge staging-next into staging 2024-03-17 12:02:22 +00:00
Randy Eckenrode
d8c7cd0119
Merge pull request #296321 from reckenrode/system_cmds-970.0.4
darwin.system_cmds: 735.50.6 -> 970.0.4
2024-03-17 07:47:59 -04:00
annalee
8ead81a60f
Merge remote-tracking branch 'upstream/master' into staging-next 2024-03-17 07:18:11 +00:00
Randy Eckenrode
25af398f88
darwin.system_cmds: 735.50.6 -> 970.0.4
- Update to the latest available version from Apple;
- Use Meson because dealing with xcbuild is too much trouble; and
- Conditionally build certain programs when newer SDKs are available.
2024-03-16 22:58:40 -04:00
Randy Eckenrode
55505c558f
darwin.libplatform: fix build of 11.0 SDK source release 2024-03-16 22:46:03 -04:00
Randy Eckenrode
b552612217
darwin.CoreSymbolication: build as a framework
`zlog` in darwin.system_cmds requires the CoreSymbolication framework.

This change does two things:

- Adds a patch with the required missing symbols; and
- Uses the stubs to create `CoreSymbolication.framework`.

Co-authored-by: a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
2024-03-16 22:46:03 -04:00
Randy Eckenrode
2dab101ca5
Merge pull request #295856 from reckenrode/moltenvk-cleanup
darwin.moltenvk: clean up derivation
2024-03-16 22:37:48 -04:00
Randy Eckenrode
bf86b51cd2
darwin.moltenvk: clean up derivation
- Drop the patches in favor of patching up the xcodeproj files, which
  should make updates in the future easier (no more patch conflicts);
- Switch to building `MoltenVKPackaging.xcodeproj` instead of building
  the projects individually;
- Link `libMoltenVK.dylib` manually, which is needed for MoltenVK 1.2.8
  due to xcbuild not being able to build the dylib in the xcodeproj;
- Add support for enabling private API usage and default it to `true`.
  This will be a new feature in MoltenVK 1.2.8;
- Use darwin.apple_sdk.libs.simd instead of symlinking from the SDK;
- Filter out rc and beta releases in the update script; and
- Support static builds of MoltenVK.
2024-03-16 21:44:27 -04:00
github-actions[bot]
2178d8d857
Merge master into staging-next 2024-03-17 00:02:17 +00:00
Randy Eckenrode
0fb285678d
darwin.apple_sdk.darwin-stubs: add SDK-specific stubs
For the 11.0 SDK, base the stubs on the SDK for now.
2024-03-16 19:21:47 -04:00
Weijia Wang
daae600111
Merge pull request #295747 from khaneliman/yabai
yabai: 6.0.15 -> 7.0.2
2024-03-16 22:47:11 +01:00
Randy Eckenrode
912752b5b9
appleDerivation: support mkDerivation fixpoint 2024-03-15 20:23:45 -04:00
github-actions[bot]
c160165e60
Merge master into staging-next 2024-03-14 18:01:26 +00:00
Austin Horstman
83b59271e3
sketchybar: 2.20.1 -> 2.21.0 2024-03-14 07:51:29 -05:00
Austin Horstman
8d803996c7
yabai: 6.0.15 -> 7.0.2 2024-03-13 19:48:43 -05: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