Jonathan Ringer
e74ccf2d72
Merge pull request #154708 from NixOS/staging-next
...
Staging next 2022-01-12
2022-01-25 11:54:52 -08:00
Dmitry Kalinkin
d3ec14f6cb
darwin.text_cmds: fix build
2022-01-23 08:18:46 -05:00
Devin Singh
c74a7840e2
diskdev_cmds: fix build using arch's xnu source
2022-01-18 06:52:26 -06:00
Dmitry Kalinkin
831e799e47
darwin.usr-include: remove
...
Originally introduced in 8610a344
('gcc: use special native system
headers for darwin') as a hack, not used anymore.
2022-01-15 04:16:21 -05:00
Dmitry Kalinkin
a56da82f7a
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/restfly/default.nix
2022-01-13 21:39:05 -05:00
Sandro Jäckel
24e553ceab
maloader: use fetchFromGitHub
2022-01-13 17:16:39 +01:00
Jonathan Ringer
172bcecd6b
Merge remote-tracking branch 'origin/staging-next' into staging
2022-01-07 10:32:13 -08:00
Jonathan Ringer
86f9a32c4c
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/hydra/default.nix
2022-01-07 10:31:29 -08:00
Ben Siraphob
8641b298b1
chunkwm: remove
2022-01-07 16:45:53 +07:00
Randy Eckenrode
a42a04fadd
libresolv: fix build on aarch64-darwin
...
Use `configdHeaders` instead of `configd`. This fixes #134292 .
2022-01-03 21:32:52 -05:00
Randy Eckenrode
3791603924
configdHeaders: init at 453.19
...
`configd` is aliased to `apple-sdk.frameworks.SystemConfiguration` in
apple-sdk-11.0, which is the default on aarch64-darwin, but it does not
include all of the headers. This package introduces the missing
headers, which are needed to build `libresolv`.
A subsequent commit will fix libresolv to build on aarch64-darwin.
2022-01-03 21:32:52 -05:00
github-actions[bot]
2aa3af36ca
Merge staging-next into staging
2021-12-06 12:01:55 +00:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
Christian Kögler
7980f52d0c
yabai: 3.3.4 -> 3.3.10
2021-12-05 19:15:43 +01:00
Felix Buehler
b40eaa1675
swift-corelibs: use pname&version instead of name
2021-12-05 15:39:48 +01:00
Jonathan Ringer
3bbe9a9459
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2021-11-29 10:15:20 -08:00
toonn
e33c11a557
Libc: Merge TARGET_OS_EMBEDDED patches
...
Both patches implement the same fix so they'll probably have to be
removed at the same time. This avoids one of them being left behind.
2021-11-24 15:17:13 -08:00
toonn
459dc34b2b
Libc: Define target in stdio too
2021-11-24 15:17:13 -08:00
toonn
5aa4c46dcd
Libc: Define target instead of including
...
Including `TargetConditionals.h` had knock-on effects, breaking the zlib
build because `TARGET_OS_MAC` gets defined, for instance.
Defining `TARGET_OS_EMBEDDED` to be `0` if it's not defined is simpler
and maintains the default behavior so it shouldn't break any dependents.
2021-11-24 15:17:13 -08:00
toonn
99bef31835
Libc: stdlib uses undefined TARGET_OS_EMBEDDED
2021-11-24 15:17:13 -08:00
Sandro Jäckel
7e9d442837
darwin.CF: Add pre-/postBuild hooks to buildPhase
2021-11-24 15:17:13 -08:00
toonn
3b2d3f65b7
darwin.CF: Drop clang 7 workaround
2021-11-24 15:17:13 -08:00
toonn
2bb0e256ea
darwin.CF: Include missing TARGET_OS_* defines
...
This patch is static and may not be appropriate if the compilation
target is iOS.
2021-11-24 15:17:13 -08:00
toonn
84454c3233
darwin.Libsystem: Patch TargetConditionals.h
...
`TargetConditionals.h` was missing several definitions, like
`TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't
seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`.
I added the definitions from SDK 10.12 verbatim and defined
`TARGET_OS_EMBEDDED_OTHER` to be equal to `0`.
I think none of this works if `darwin.Libsystem` is used to build for
linux or iOS though so maybe this needs a more thorough fix?
This reverts 336d82617f
because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
toonn
e07eef85e8
xnu: Fix python3 patch
...
This reverts 7da313e10a
because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
Jan Tojnar
b8c07facaa
Fix eval with nix-env -qas
...
At least on NixOS, it fails to evaluate as follows:
$ nix-env -qaPs -f .
error: attribute '__propagatedImpureHostDeps' missing
2021-11-17 16:28:55 +01:00
Felix Buehler
9480444dae
treewide: rename name to pname&version
2021-11-09 22:24:57 +01:00
Lein Matsumaru
ae4666c415
darwin.rewrite-tbd: only build on darwin
2021-11-08 13:11:29 +00:00
Andrew Childs
e456e9b1ae
sigtool: 0.1.0 -> 0.1.2
...
Fixes build on x86_64-darwin
2021-09-25 10:38:35 +09:00
Michael Stone
470466fdbd
sigtool: 4a3719b4 -> 2a13539d ( #138453 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-23 17:14:07 +02:00
github-actions[bot]
6f038e8b11
Merge master into staging-next
2021-09-14 12:01:03 +00:00
Emily
35a1ca8a0a
darwin.trash: fix on aarch64-darwin
...
None of these clang options should be necessary with the nixpkgs stdenv
infrastructure, and the -arch was breaking Apple Silicon builds.
2021-09-14 03:31:31 +01:00
github-actions[bot]
dbad333a72
Merge master into staging-next
2021-08-28 12:01:06 +00:00
Domen Kožar
09818c59fa
Merge pull request #135345 from prusnak/ghc-aarch64-darwin
...
ghc: enable build on aarch64-darwin (aka Apple Silicon)
2021-08-28 13:10:55 +02:00
Pavol Rusnak
236fd9c902
darwin.signingUtils: move signDarwinBinariesIn from fixupOutputHooks to postFixupHooks
...
to fix ghc build
2021-08-28 12:54:05 +02:00
github-actions[bot]
b13b005f0e
Merge master into staging-next
2021-08-26 12:01:09 +00:00
zowoq
13ea123c74
treewide: buildFlagsArray -> ldflags
2021-08-26 21:35:06 +10:00
Jan Tojnar
4ff3577f25
Merge branch 'staging-next' into staging
2021-08-23 14:19:54 +02:00
github-actions[bot]
1f6dedd364
Merge master into haskell-updates
2021-08-18 00:05:52 +00:00
Jan Tojnar
e286e1cfa0
Merge branch 'staging-next' into staging
...
- boost 167 removed on staging-next (7915d1e03f
) × boost attributes are inherited on staging (d20aa4955d
)
- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507
) × hardened kernels are versioned on staging (a5341beb78
) + removed linux_5_12 (e55554491d
)
- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Jasper
00037f7403
darwin.binutils: fix wrapper of as
when cross-compiling to aarch64-darwin ( #134097 )
2021-08-16 22:12:51 -04:00
sternenseemann
283d622397
darwin.xattr: init at 61.60.1
2021-08-14 17:06:29 +02:00
Dmitry Kalinkin
dda4394889
Merge pull request #127229 from veprbl/pr/libsystem_targetconditionals
...
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h
2021-08-06 02:14:09 -04:00
Angus Trau
6395aaba17
darwin.apple_sdk.frameworks.AVFoundation: Add missing dependencies
2021-08-01 12:51:26 +10:00
Sandro
d0f62aae75
Merge pull request #130501 from SuperSandro2000/remove-noop-phases-mass
...
Convert phases that contain ":" to dont* = true
2021-07-18 23:46:50 +02:00
Sandro Jäckel
dc48d23a0f
Convert phases that contain ":" to dont* = true
2021-07-17 23:39:16 +02:00
Luke Granger-Brown
a7be563707
darwin.apple_sdk.frameworks.CoreSymbolication: expose under SDK 11.0
...
This is used by the `root` package, and otherwise prevents the
nixpkgs.tarball build from succeeding (e.g.
https://hydra.nixos.org/build/146838433 ).
2021-07-05 02:09:35 +00:00
Andrew Childs
55dcd99859
root: use pure CoreSymbolication on Darwin
...
The current build works by linking against CoreSymbolication in
/System/Library/PrivateFrameworks. This is impure and doesn't work in
newer versions of macOS.
See https://github.com/NixOS/nixpkgs/issues/128576
2021-06-29 11:00:05 +09:00
Dmitry Kalinkin
03137b50d2
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h
...
These are defined in the SDK for Apple compilers and some projects assume those are defined unconditionally.
https://reviews.llvm.org/D103598
2021-06-17 11:01:16 -04:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Jason Lau
8a2d578017
reattach-to-user-namespace: support apple silicon
2021-06-15 11:30:21 -07:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Sandro
b083c7e9eb
darwin.mas: Fix dontBuild
2021-06-14 14:59:21 +02:00
github-actions[bot]
65a7d168af
Merge master into staging-next
2021-06-12 18:04:56 +00:00
Zach Coyle
88fc8922a4
mas: 1.8.1 -> 1.8.2
2021-06-11 19:22:35 -04:00
Jonathan Ringer
430ac9b830
apple_sdk_11: alias JavaVM
...
Apple removed JavaVM but JavaNativeFoundation seems to be
the replacement. Should be safe to substitute usage of
JavaVM with JavaNativeFoundation.
2021-06-06 15:09:41 -07:00
Domen Kožar
aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval
...
Aarch64 darwin eval
2021-06-03 11:21:20 +02:00
Domen Kožar
9e6417f2a4
fix tarball job evaluation for aarch64-darwin
2021-06-03 10:52:46 +02:00
Anbang Wen
2565e3bba6
nixos/apple-sdk: 11.0 -> 11.1
...
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.
2021-06-02 09:23:28 -07:00
Andrew Childs
e592d342da
darwin.ICU: avoid platform.darwinMinVersion references on non-darwin
...
This package isn't expected to work outside of darwin, but must still
evaluate cleanly.
2021-05-17 00:28:05 +09:00
Andrew Childs
3706fe567b
darwin.DarwinTools: remove reference to CFPriv.h
...
Fixes build on aarch64-darwin.
2021-05-17 00:28:05 +09:00
Ivan Babrou
68733c16f5
darwin.apple_sdk.frameworks: add missing dependencies
...
```
/nix/store/5mgn511gbldf7xl5kjm27z9lj10xcycl-apple-framework-CoreData-11.0.0/Library/Frameworks/CoreData.framework/Headers/NSPersistentCloudKitContainerOptions.h:10:9: fatal error: 'CloudKit/CKDatabase.h' file not found
^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
```
/nix/store/a7k7kqj08602785vsrss0xa85b08hik4-apple-framework-CloudKit-11.0.0/Library/Frameworks/CloudKit.framework/Headers/CKRecord.h:9:9: fatal error: 'CoreLocation/CLLocation.h' file not found
^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:04 +09:00
Ivan Babrou
d0eff87f68
darwin.file_cmds: add missing Libinfo dependency
...
Fixing:
```
/private/tmp/nix-build-file_cmds-264.1.1-osx-10.11.6.drv-0/file_cmds-264.1.1/ls/print.c:56:10: fatal error: 'membershipPriv.h' file not found
^~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:03 +09:00
Ivan Babrou
577bcf38f8
darwin.shell_cmds: add missing dependency on launchd
2021-05-17 00:27:03 +09:00
Ivan Babrou
da3ae0231a
apple-source-releases: make it compile on aarch64
2021-05-17 00:27:03 +09:00
Ivan Babrou
2eb97f2ddd
darwin.developer_cmds: wrap clang -E from clang-wrapped as clang-cpp
2021-05-17 00:27:03 +09:00
Andrew Childs
d2c9670339
darwin: add CoreFoundation to the build when explicitly required
2021-05-17 00:27:02 +09:00
Matthew Bauer
3e7034abb9
darwin/xcode: provide libc++ from XCode toolchain
...
We could use our own libc++ here, but it is probably best to use the
provided one to ensure consistency. This fixes some C++ programs when
running aarch64-apple-ios-clang++.
2021-05-17 00:27:02 +09:00
Andrew Childs
7eb1e3695d
darwin.signingUtils: init
...
Helper scripts for code signing on darwin.
2021-05-17 00:27:02 +09:00
Andrew Childs
4c890ce9aa
darwin.sigtool: init
2021-05-17 00:27:02 +09:00
Andrew Childs
fe0d5a54c1
darwin/apple-sdk-11.0: inject an sdk for macOS 11
2021-05-17 00:27:01 +09:00
Andrew Childs
0ba7a04743
darwin/binutils: include codesign_allocate
2021-05-17 00:27:01 +09:00
Andrew Childs
eb8f8afac7
libtapi: cross compilation
2021-05-17 00:27:01 +09:00
Andrew Childs
b7abec31d4
rewrite-tbd: init
2021-05-17 00:27:01 +09:00
Andrew Childs
257cb1c8e8
print-reexports: rehome, tbd4 support, cross compilation
2021-05-17 00:27:01 +09:00
Andrew Childs
bd4a45f5d4
cctools: drop suspicious dependency
2021-05-17 00:27:00 +09:00
Andrew Childs
cbe172fa67
darwin.ICU: cross compilation
2021-05-17 00:27:00 +09:00
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
Andrew Childs
8e6d830423
darwin/objc4: use darwin-stubs
2020-11-12 00:23:09 +09:00
Andrew Childs
193c91233c
darwin/IOKit: use darwin-stubs
2020-11-12 00:23:09 +09:00
Andrew Childs
03988a5fec
darwin/Security: use darwin-stubs
2020-11-12 00:23:09 +09:00
Andrew Childs
b176ad9546
darwin/Libsystem: use darwin-stubs
2020-11-12 00:23:09 +09:00
Andrew Childs
fd33052999
darwin/print-reexports: nixpkgs-specific utility to inspect .tbd files
...
Used during bootstrap to check that re-exported libraries are not
dangling.
2020-11-12 00:23:09 +09:00
Andrew Childs
8946ff8d71
darwin/darwin-stubs: init
2020-11-12 00:23:09 +09:00
Dmitry Kalinkin
7c1e712c39
Merge pull request #103180 from veprbl/pr/darwin_adv_cmds_fix
...
darwin.adv_cmds: fix build
2020-11-10 13:26:28 -05:00
Dmitry Kalinkin
f0efe2d16c
darwin.adv_cmds: fix build
...
Also disable pgrep that depends on pkill
2020-11-08 20:28:45 -05:00
Frederik Rietdijk
470f05cb5d
Merge staging-next into staging
2020-11-03 12:06:41 +01:00
Jonathan Ringer
16357a697f
libtapi: add homepage and description, use pname
2020-10-29 14:05:46 -07:00
bb2020
5ef5d96c08
discrete-scroll: added myself as maintainer
2020-10-26 18:38:52 +03:00
Ben Siraphob
683a87dbeb
treewide: remove periods from end of package descriptions
2020-10-17 08:22:31 -07:00
Steven Pease
6217cc92b5
Add newer xcode versions
2020-10-15 23:17:55 -07:00
Bas van Dijk
d5b0c8bcdf
libvirt: 6.3.0 -> 6.6.0
...
Also upgrades `python3Packages.libvirt`
and patches the `rpcgen` tool from Apple's `developer_cmds` package.
2020-09-29 00:18:24 +02:00
Matthew Bauer
86d8c55470
Merge branch 'staging' into ios-13
2020-09-10 23:24:26 -05:00
Matthew Bauer
61517de024
Merge pull request #93912 from thefloweringash/cctools-tapi
...
stdenv/darwin: enable tapi support in cctools
2020-09-10 23:23:52 -05:00
cmacrae
b9326ecf0a
yabai: 3.2.1 -> 3.3.0
2020-09-03 17:23:46 +01:00
bb2020
026269906f
discrete-scroll: init at 0.1.1
2020-08-27 13:47:08 +03:00
Andrew Childs
630f5d30df
stdenv/darwin: enable tapi support in cctools
2020-08-21 01:09:42 +09:00
zowoq
0dc28e4475
smimesign: 0.0.13 -> 0.1.0
2020-08-18 10:25:43 +10:00
zowoq
cea7cd902e
buildGoModule packages: set doCheck = false
2020-08-10 16:02:30 +10:00
Matthew Bauer
5a741d16ff
Merge pull request #93541 from matthewbauer/ios-deploy-update
...
ios-deploy: move out of nodePackages
2020-07-30 19:55:52 -05:00
Andrew Childs
b418d4c6a4
libtapi: fix build, install phase and install name
...
installTarget looks like a typo for installTargets. This causes a lot
of llvm and clang to be built and installed.
Clang is not intended to be an external dependency. The source bundle
includes llvm and clang. Adding include paths and building clangBasic
first is sufficient to use the internal clang components.
2020-07-28 19:16:24 +09:00
Matthew Bauer
95eabdfd5f
xcode/sdk-pkgs.nix: set -platform_version in addition to -miphoneos-version-min
...
The App Store looks at LC_VERSION_MIN_IPHONEOS to verify you have a
new enough SDK version. This is not just the minimum version, but also
the sdk version used. When the linker can’t figure it out, it tries to
infer it from the sdk path[1]. When no sdk version is found, it
defaults to just using the -miphoneos-version-min value[2]. So, to make
sure we don’t rely on inference (which doesn’t work in the current
directory structure), we have to specify -platform_version.
[1]:
43f32a4c61/cctools/ld64/src/ld/Options.cpp (L5355-L5376)
[2]: 43f32a4c61/cctools/ld64/src/ld/ld.hpp (L58)
2020-07-23 10:44:51 -05:00
Matthew Bauer
753e80125f
darwin/xcode: default to 11.3.1
2020-07-21 21:58:51 -05:00
cmacrae
fcdb62dc73
spacebar: 1.1.0 -> 1.1.1
2020-07-21 20:13:03 +01:00
Matthew Bauer
3c6bd61560
darwin.cctools: 927.0.2 -> 949.0.1
...
Needed for iOS 13 support
2020-07-21 10:34:24 -05:00
Matthew Bauer
39c536c8db
darwin.libtapi: update, fix installTargets
2020-07-21 10:30:19 -05:00
Matthew Bauer
c36cf877f1
darwin.xcode: add hash for 11.3.1
2020-07-21 10:27:55 -05:00
Matthew Bauer
10aa776340
ios-deploy: move out of nodePackages
...
This doesn’t need nodePackages to work, so we can move it to
pkgs/os-specific/darwin. Note that it still requires xcodebuild to
work.
2020-07-21 10:24:53 -05:00
cmacrae
8bc2e52c88
spacebar: 0.5.0 -> 1.1.0
...
Also update owner, description, & homepage
2020-07-17 14:20:55 +01:00
Calum MacRae
15e8fa9f96
yabai: 3.2.0 -> 3.2.1 ( #90717 )
2020-06-29 16:06:55 +02:00
cmacrae
b3a8e07fa0
yabai: 3.1.2 -> 3.2.0
2020-06-14 11:24:38 +01:00
cmacrae
154fc03194
yabai: 3.1.1 -> 3.1.2
2020-06-09 00:19:08 +01:00
cmacrae
e9198cb7a5
yabai: 3.1.0 -> 3.1.1
2020-06-08 22:42:42 +01:00
cmacrae
74e87de0ad
yabai: 3.0.2 -> 3.1.0
2020-06-05 14:11:39 +01:00
Shardul Baral
2d95536210
yabai: 3.0.1 -> 3.0.2
2020-05-31 10:29:34 -04:00
Mario Rodas
9917caa5e8
Merge pull request #87542 from cmacrae/upgrade/yabai/3.0.1
...
yabai: 3.0.0 -> 3.0.1
2020-05-14 08:14:56 -05:00
Colin L Rice
d6162dab50
go-modules: Update files to use vendorSha256
2020-05-14 07:22:21 +01:00
cmacrae
89be001b27
yabai: 3.0.0 -> 3.0.1
2020-05-10 21:54:13 +01:00
Ryan Mulligan
3e73635e51
Merge pull request #86556 from cmacrae/pkgs/os-specific/darwin/spacebar
...
spacebar: init at v0.5.0
2020-05-06 15:19:38 -07:00
Frederik Rietdijk
9875bbae75
Merge master into staging-next
2020-05-05 19:51:09 +02:00
Daiderd Jordan
64279cff00
Merge pull request #86557 from cmacrae/upgrade/yabai/3.0.0
...
yabai: 2.4.3 -> 3.0.0
2020-05-02 11:34:56 +02:00
cmacrae
c57532cf4e
spacebar: init at v0.5.0
2020-05-02 10:18:34 +01:00
cmacrae
fe9938ebd4
yabai: 2.4.3 -> 3.0.0
2020-05-02 10:17:32 +01:00
cmacrae
1e16e652d8
skhd: 0.3.0 -> 0.3.5
2020-05-02 09:58:41 +01:00
Frederik Rietdijk
afb1041148
Merge master into staging-next
2020-05-02 09:39:00 +02:00
cmacrae
8e8459921a
yabai: init at 2.4.3
2020-05-01 11:57:28 +01:00
Dmitry Kalinkin
c00ad799a0
darwin.cctools: install ar man pages
...
In the distribution they are located in a separate directory from the
others and the standard installation doesn't process them.
2020-04-20 23:56:51 -04:00
Dmitry Kalinkin
125c469d3e
darwin.binutils.bintools: propagate man pages from cctools
2020-04-20 23:49:02 -04:00
Dmitry Kalinkin
3e880bad79
darwin.cctools: split man output
2020-04-20 19:51:49 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
...
This reverts commit 4e6bf03504
, reversing
changes made to afd997aab6
.
Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
Mario Rodas
78f00558e2
smimesign: fix build on darwin
2020-03-21 06:22:00 -05:00
Daiderd Jordan
3987ea9a9d
mpv: add flag for swift on darwin
...
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.
self: super:
let
CommandLineTools = "/Library/Developer/CommandLineTools";
in
{
swift = super.stdenv.mkDerivation {
name = "swift-CommandLineTools-0.0.0";
phases = [ "installPhase" "fixupPhase" ];
propagatedBuildInputs = [ self.darwin.DarwinTools ];
installPhase = ''
mkdir -p $out/bin $out/lib
ln -s ${CommandLineTools}/usr/bin/swift $out/bin
ln -s ${CommandLineTools}/usr/lib/swift $out/lib
ln -s ${CommandLineTools}/SDKs $out
'';
setupHook = builtins.toFile "hook" ''
addCommandLineTools() {
echo >&2
echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
echo " $ xcode-select --install" >&2
echo >&2
[ -d ${CommandLineTools} ]
export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
export SWIFT=swift
export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
}
prePhases+=" addCommandLineTools"
'';
__impureHostDeps = [ CommandLineTools ];
};
mpv = super.mpv.override { swiftSupport = true; };
}
2020-02-06 14:15:35 +01:00
Daiderd Jordan
6567823996
stdenv: introduce appleSdkVersion and macosVersionMin
2020-01-31 21:52:11 +01:00
hlolli
78b34b5e5b
graalvm8: 19.1.1 -> 19.2.1
...
- - nixpkgs now with full darwin support
2020-01-18 16:43:03 +01:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
...
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Daiderd Jordan
c05efedd4d
darwin.iproute2mac: explicitly use python2
2020-01-13 11:41:23 +01:00
Daiderd Jordan
da6bc4b4cb
darwin.libtapi: python2 -> python3
2020-01-13 11:41:23 +01:00
Daiderd Jordan
73db5d8c38
darwin.apple_sdk: python2 -> python3
2020-01-13 11:13:57 +01:00
Daiderd Jordan
453e009947
darwin.CF: python2 -> python3
2020-01-13 11:13:06 +01:00
Daiderd Jordan
c7d457c9da
darwin.xnu: python2 -> python3
2020-01-13 11:13:01 +01:00
Vladimír Čunát
5c780036c5
Merge branch 'master' into staging-next
...
The nss rebuild isn't so small.
2020-01-08 22:48:13 +01:00
squalus
9314327dee
keepassxc: fix darwin build
...
- Removed the unnecessary libmicrohttpd dependency, which doesn't
build on macOS. KeepassXC removed this dependency in 2.1.2
- Fixed a compiler error related to the Touch ID feature by adding a
dependency on the LocalAuthentication framework
2020-01-08 16:44:14 +01:00
Greg Pevnev
a17dbd86ad
reattach-to-user-namespace: 2.7 -> 2.8
...
Add macOS Catalina (10.15) "support".
2020-01-08 13:50:08 +03:00
Matthew Bauer
04000331c1
Merge pull request #74284 from matthewbauer/ios-with-xcode-11
...
Update iOS for XCode 11
2020-01-03 15:35:41 -05:00
Matthew Bauer
9c1a2ac51e
Merge remote-tracking branch 'origin/master' into ios-with-xcode-11
2020-01-03 15:34:20 -05:00
Matthew Bauer
8b41b16a9f
cctools: fixup gnu-config detection
2020-01-03 15:20:55 -05:00
Matthew Bauer
6f8b2f3961
cctools: only add libtool on native builds
...
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2020-01-03 15:20:54 -05:00
Matthew Bauer
010d2f4aa2
lib/systems: use newer ios sdk
2020-01-03 15:20:54 -05:00
Matthew Bauer
3432b1baa8
xcode: don’t use libstdc++ on iOS
...
Apple no longer ships with it, so best to avoid forcing it into use.
2020-01-03 15:19:34 -05:00
John Ericson
28c37155d7
xcode: Add more hashes, and fix some old ones
2020-01-03 15:19:08 -05:00