Commit graph

753 commits

Author SHA1 Message Date
Andrew Childs
aa3361326b darwin.adv_cmds: fix cross compilation 2021-05-17 00:27:00 +09:00
John Ericson
7bba32a069 darwin packages: Get ready for cross
If things build fine with `stdenvNoCC`, let them use that. If tools
might be prefixed, prepare for that, either by directly splicing or just
using the env vars provided by the wrapper setup-hooks.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2021-05-11 16:07:01 -04:00
John Ericson
a3e54cb582 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-06 15:48:25 -04:00
John Ericson
470640e7fe treewide: Do a number of no-op cleanups for cross and darwin
I am taking the non-invasive parts of #110914 to hopefully help out with #111988.

In particular:

 - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
   a proper `callPackage`.

 - Adjust Darwin `stdenv`'s overlays keeping things from the previous
   stage to not stick around too much.

 - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
   closer to a unified LLVM and GCC bootstrap.
2021-05-06 11:17:26 -04:00
Andrew Childs
7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
github-actions[bot]
f42b75df03
Merge staging-next into staging 2021-04-18 18:10:40 +00:00
github-actions[bot]
b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
Dmitry Kalinkin
6eeab63be4
Merge pull request #107431 from veprbl/pr/darling_src_fix
darwin.darling.src: fix build on case-sensitive filesystems
2021-04-18 09:55:45 -04:00
github-actions[bot]
33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
github-actions[bot]
8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Pavol Rusnak
29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Calum MacRae
28192c446c
spacebar: fix builds on macOS Big Sur 2021-04-16 17:19:17 +01:00
Calum MacRae
2c82907da4
apple-sdk: generate SkyLight framework outputs 2021-04-16 17:19:17 +01:00
Calum MacRae
914c604a01
apple-sdk: fix PrivateFrameworks symlinks
With the absence of these symlinks, private frameworks aren't exposed
to the linker.
2021-04-16 17:19:17 +01:00
John Ericson
82ca81cd62
Merge pull request #111988 from thefloweringash/darwin-platform-versions
Darwin platform versions
2021-04-12 11:40:16 -04:00
Andrew Childs
33265e0dd9 darwin/xcode: remove platform version flags
These are now provided by the standard bintools and cc wrappers.
2021-04-11 09:47:10 +09:00
midchildan
87f578a36f
sshfs: add darwin build 2021-04-06 10:37:53 +09:00
Sandro Jäckel
f9bcee4ed5
darwin.text_cmds: Fix editor check 2021-04-04 19:49:52 +02:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
Zach Coyle
c7c2e2f54f
mas: init at 1.8.1 2021-04-02 12:14:36 -04:00
midchildan
c595604bed
fuse: use macfuse-stubs instead on Darwin 2021-03-23 23:42:16 +09:00
Bernardo Meurer
1d1089dbf4
Merge pull request #116958 from midchildan/package/macfuse
macfuse-stubs: replace osxfuse 3.8.3
2021-03-21 07:28:48 +00:00
midchildan
fa6c8b656b
macfuse-stubs: init at 4.0.4
replaces osxfuse 3.8.3
2021-03-21 15:50:13 +09:00
Andrew Childs
5268bf50d2 apple_sdk.libs.sandbox: init 2021-03-20 11:32:32 -04:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Ivan Babrou
a730703e6f
darwin.binutils: use clang for as on aarch64-darwin (#115167)
Without this change `as` on `aarch64-darwin` is defunct:

```
$ /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as -v
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as: assembler (/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as or /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as) for architecture arm64 not installed
Installed assemblers are:
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc64/as for architecture ppc64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/x86_64/as for architecture x86_64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc/as for architecture ppc
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/i386/as for architecture i386
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm/as for architecture arm
```

Apple defaults to Clang in all cases from what I see, but nixpkgs prefers `cctools`: #51881.
2021-03-17 00:27:34 -04:00
github-actions[bot]
d6257d451b
Merge master into staging-next 2021-03-11 18:23:54 +00:00
Eric Bailey
9628427a85
m-cli: remove maintainer 2021-03-10 20:56:05 -06:00
Andrew Childs
e6be0f45ef darwin.bootstrap_cmds: use correct arch in "mig" 2021-03-03 11:01:24 +09:00
Andrew Childs
8feb949ab5 darwin/xcode: remove -arch flags
These are now provided by the standard bintools and cc wrappers.
2021-03-02 17:22:06 +09:00
github-actions[bot]
344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Mathieu Post
7c9c8a1fd0
Goku: 0.1.11 -> 0.3.6 2021-02-10 15:37:33 +01:00
github-actions[bot]
571eb10996
Merge staging-next into staging 2021-02-03 18:22:22 +00:00
Sandro
0829a51862
Merge pull request #109626 from holymonson/darwin-impure-cmds
darwin: add impure-cmds
2021-02-03 18:11:58 +01:00
Dmitry Kalinkin
f602c10ea7
Merge pull request #109368 from holymonson/check-headers
darwin: check apple headers
2021-02-01 12:12:03 -05:00
Dmitry Kalinkin
98cc48e3f7
Merge pull request #109052 from holymonson/bootstrap_cmds
darwin.bootstrap_cmds: update to 121
2021-01-31 19:07:51 -05:00
Dmitry Kalinkin
84b3d08ba6
Merge pull request #111057 from veprbl/pr/darwin_CF_fix_sandboxing
darwin.CF: fix sandboxed build
2021-01-30 19:30:51 -05:00
Monson Shao
c12df57435
darwin.apple-source-releases: implement headers check 2021-01-30 21:37:46 +08:00
Monson Shao
4bc22226a2
darwin.hfs: add appleHeaders and set headersOnly=true by default 2021-01-30 21:37:46 +08:00
Monson Shao
0681f7f979
darwin.Libsystem: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao
e2fb835ce2
darwin.xnu: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao
1eb3a0d5c9
darwin.Libc: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao
4da71ef5af
darwin.CommonCrypto: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao
c08b0b360a
darwin.Libinfo: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao
24feb6adb2
darwin.architecture: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao
c02807ece4
darwin.launchd: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao
69625af7d1
darwin.libclosure: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao
f4b4000e8f
darwin.libdispatch: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao
4efe7aae90
darwin.libplatform: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao
e70c149458
darwin.libpthread: add appleHeaders 2021-01-30 21:37:44 +08:00
Monson Shao
e6b3f18ee5
darwin.libutil: add appleHeaders 2021-01-30 21:37:44 +08:00
Monson Shao
79c264411e
darwin.removefile: add appleHeaders 2021-01-30 21:37:44 +08:00
Monson Shao
145ed3fcbc
darwin.ICU: update to 66108 and restruct 2021-01-29 15:42:27 +08:00
Monson Shao
84410e29df
darwin.bootstrap_cmds: update to 121 2021-01-29 15:39:51 +08:00
Monson Shao
399dbcac67
darwin.apple-source-releases: drop sdkName in version 2021-01-29 15:39:32 +08:00
Dmitry Kalinkin
684963881b
darwin.CF: fix sandboxed build
Had to abandon the use of sourceRoot primarily because it prevents
stdenv from chmod'ing the ../configure into a writable file.
2021-01-28 16:55:53 -05:00
github-actions[bot]
a008c42d22
Merge staging-next into staging 2021-01-25 18:52:12 +00:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Jan Tojnar
3c5dff210a
Merge branch 'staging-next' into staging 2021-01-24 20:43:48 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
github-actions[bot]
5d637e0016
Merge staging-next into staging 2021-01-24 06:44:06 +00:00
Matthew Bauer
84408a6ad0
Merge pull request #100687 from spease/add-newer-xcode-hashes
darwin: update xcode versions
2021-01-23 20:04:50 -06:00
Dmitry Kalinkin
963286d5b6
Merge pull request #108590 from holymonson/apple_package_version
darwin: generate apple packages preparing for update macos sdk
2021-01-23 08:16:29 -05:00
Matthew Bauer
ba5f50a76c
Merge pull request #107924 from matthewbauer/fix-duti
Fix duti on macOS Big Sur
2021-01-20 16:09:41 -06:00
Matthew Bauer
dcbbbcdb05 duti: pass ApplicationServices directly 2021-01-20 15:30:57 -06:00
Steven Pease
a128336cf6 Use buildPlatform instead of targetPlatform for unxip instructions 2021-01-20 10:08:03 -08:00
Monson Shao
2467f5e4d2
darwin.apple-sdk: drop appleSdkVersion
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
2021-01-21 00:26:16 +08:00
Monson Shao
9d5cece352
darwin: generate apple packages preparing for update macos sdk 2021-01-20 15:19:13 +08:00
Steven Pease
0fdab8d560 Merge branch 'master' into add-newer-xcode-hashes 2021-01-19 20:42:30 -08:00
Steven Pease
d8c1c0dc50 Update to XCode 12.3 2021-01-19 20:41:39 -08:00
Dmitry Kalinkin
1a25e9b05c
darwin.darling.src: fix build on case-sensitive filesystems
Co-authored-by: Andrew Childs <lorne@cons.org.nz>
2021-01-18 21:11:00 -05:00
Ben Siraphob
16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
Monson Shao
5f1d105505
darwin: add impure-cmds
On darwin, there are some commands neither opensource nor able to build in nixpkgs.
We have no choice but to use those system-shipped impure ones.
2021-01-17 23:44:40 +08:00
Monson Shao
b9be1501fe
darwin.libauto: mark broken and drop stdenv.lib 2021-01-14 01:21:59 +08:00
Monson Shao
5f6e6516e0
darwin.hfs: mark broken 2021-01-13 19:05:21 +08:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00: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
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Matthew Bauer
90a8f69fac
Merge pull request #107262 from midchildan/update/libtapi
libtapi: 1000.10.8 -> 1100.0.11
2020-12-30 14:37:10 -06:00
Matthew Bauer
c9c3dd4950 duti: set kernel to darwin18
Unfortunately, we can’t do arm64 multi-arch with the current nixpkgs
sdk, which duti assumes if your kernel is darwin20 (Big Sur). To fix
this, we can just hardcode to darwin18 which should be compatible with
Nixpkgs Darwin.

Fixes #105751
2020-12-29 17:03:34 -06:00
Matthew Bauer
46db547063 duti: 1.5.4pre -> 1.5.5pre
This adds changes including support for macOS Big Sur.
2020-12-29 16:58:38 -06:00
Andrew Childs
34c8fae439 darwin/stdenv: tapi stub based bootstrap
Fixes bootstrapping on macOS Big Sur.
2020-12-22 11:43:54 +09:00
midchildan
10e8c6d323
libtapi: 1000.10.8 -> 1100.0.11
closes #106348
2020-12-21 00:55:58 +09:00
Sandro
f097374754
Merge pull request #105938 from virusdave/dnicponski/scratch/add_osx-cpu-temp
osx-cpu-temp: Init at 1.0
2020-12-11 06:56:57 +01:00
Sandro Jäckel
848d1986b8
apple_sdk.frameworks.AVFoundation: Add missing MediaToolbox
This fixes:
/nix/store/7ckpydmlah3j86py3c4f27p0fbkxyzfi-apple-framework-AVFoundation/Library/Frameworks/AVFoundation.framework/Headers/AVAudioMix.h:15:9: fatal error: 'MediaToolbox/MTAudioProcessingTap.h' file not found
2020-12-09 20:10:59 +01:00
Sandro Jäckel
eb1d742813
apple_sdk.frameworks.AVFoundation: Add missing CoreMedia
This fixes apple-framework-AVFoundation/Library/Frameworks/AVFoundation.framework/Headers/AVAsset.h:17:9: fatal error: 'CoreMedia/CMTime.h' file not found
2020-12-09 20:10:59 +01:00
Dave Nicponski
9fbe8cc64b osx-cpu-temp: Init at 1.0 2020-12-09 12:18:05 -05:00
Sandro
1a90114a95
Merge pull request #104192 from cmacrae/upgrade/yabai/3.3.4
yabai: 3.3.3 -> 3.3.4
2020-11-23 15:17:45 +01:00
Sandro
a7fd3a21ca
Merge pull request #104191 from cmacrae/upgrade/spacebar/1.2.1
spacebar: 1.1.1 -> 1.2.1
2020-11-23 14:37:45 +01:00
cmacrae
69d9d5d88e
yabai: 3.3.3 -> 3.3.4 2020-11-18 17:14:53 +00:00
cmacrae
d09c7c44a1
spacebar: 1.1.1 -> 1.2.1 2020-11-18 17:09:55 +00:00
Jason Lau
49325a0d7f reattach-to-user-namespace: 2.8 -> 2.9 2020-11-17 10:43:43 -08:00
Frederik Rietdijk
986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Frederik Rietdijk
da6239dab3 Merge #98541 into staging-next 2020-11-14 09:19:31 +01:00
cmacrae
7fb1069a13
yabai: 3.3.0 -> 3.3.3 2020-11-13 14:47:11 +00:00
Andrew Childs
f2b81a021e darwin/print-reexports: add an overview comment 2020-11-12 16:57:19 +09:00
Andrew Childs
7e49fb6592 darwin/apple-sdk: explain why Kernel.framework has no .tbd file 2020-11-12 16:57:19 +09:00
Andrew Childs
3456ef6f30 darwin/apple-sdk: use darwin stubs 2020-11-12 00:23:09 +09:00