Commit graph

1069 commits

Author SHA1 Message Date
Michael Hoang f73bb818a1
karabiner-elements: init at 14.8.0 (#188129)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-08-28 20:59:16 +02:00
github-actions[bot] 7b5c82c518
Merge master into staging-next 2022-08-17 18:01:22 +00:00
Darwin Corn 96021cfb71 spacebar: 1.2.1 -> 1.4.0 2022-08-17 12:11:29 -04:00
Randy Eckenrode d1799fe385
moltenvk: 1.1.10 -> 1.1.11 2022-08-14 15:27:04 -04:00
Stéphan Kochen a7eb0a180b darwin.Libsystem: add missing modulemaps 2022-08-12 11:54:10 +02:00
Sandro 56ad3d56c8
Merge pull request #161288 from wlcx/pngpaste-0.2.3 2022-08-11 23:47:54 +02:00
Zhong Jianxin fdd94b489d sketchybar: 2.7.1 -> 2.8.2 2022-08-10 16:33:28 +08:00
Stéphan Kochen 71b05eccaa darwin.cctools: 949.0.1 -> 973.0.1 2022-08-08 12:52:12 +02:00
Sam Willcocks cbe518b293 pngpaste: init at 0.2.3 2022-08-07 18:20:24 +03:00
Uri Baghin 3b62a2b3cf
Merge pull request #179971 from jiegec/network-cmds-aarch64-darwin-staging
darwin.network_cmds: fix build on aarch64-darwin
2022-08-02 12:36:20 +10:00
Jiajie Chen 20447fd0dc darwin.network_cmds: fix build on aarch64-darwin
- Use network_cmds from macOS 11.0 packages
- Fix TARGET_OS_IPHONE error
- Disable unbound on aarch64-darwin
2022-07-24 09:53:59 +08:00
Randy Eckenrode c92d1a55d3
moltenvk: 1.1.9 -> 1.1.10 2022-07-21 17:03:54 -04:00
Randy Eckenrode 9d2b95eef3
moltenvk: refactor to build without Xcode
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

- Use the 11.0 SDK instead of the 10.12 one on x86_64-darwin;
- Use `NIX_CFLAGS_COMPILE` and `NIX_LDFLAGS` to pass flags to the
  compiler instead of patching the Xcode project files; and
- Use xcbuild to build the project.
2022-07-21 17:03:53 -04:00
github-actions[bot] 4bff9bab6b
Merge staging-next into staging 2022-07-10 12:02:29 +00:00
Janne Heß 05a276adf0
Merge pull request #180404 from helsinki-systems/libressl_3_5_default
libressl: default to 3.5
2022-07-10 13:30:16 +02:00
Chen 8073a6fb09
darwin.xnu: fix build on aarch64-darwin (#179921)
- Use xnu from macOS 11.0 packages
- Patch iig related usage
- Add a new list of headers for arm64
2022-07-09 10:39:31 -04:00
ajs124 f76d71f98f darwin.network_cmds:: pin to libressl 3.4 2022-07-07 22:11:54 +02:00
Randy Eckenrode 9659c7abce
apple_sdk_11_0: provide SDK-specific callPackage 2022-07-07 07:52:36 -04:00
Randy Eckenrode 4741402d54
apple_sdk_11_0: expose 11.0 sdk stdenv as an attribute 2022-07-06 19:41:17 -04:00
Randy Eckenrode d8f71776ff
apple_sdk_11_0: fix build on x86_64-darwin and expose as attribute 2022-07-06 19:41:17 -04:00
ajs124 a8517f95b8 maintainers: remove joelteon
no github account linked
2022-06-29 00:52:14 +02:00
Jiajie Chen 087eeea133 darwin.iproute2mac: 1.2.1 -> 1.4.0
https://github.com/brona/iproute2mac/releases/tag/v1.4.0

Add jiegec to maintaienr list.
2022-06-27 12:10:26 +08:00
github-actions[bot] ccdd0f7af6
Merge master into staging-next 2022-06-16 23:27:22 +00:00
Zhong Jianxin 26742b37dc sketchybar: 2.5.2 -> 2.7.1 2022-06-16 15:31:16 +08:00
github-actions[bot] f3de1bfb6d
Merge master into staging-next 2022-06-11 18:01:12 +00:00
Sandro 1ec895fd1d
Merge pull request #175851 from reckenrode/dxvk-refactor
dxvk: refactor derivation and Darwin support
2022-06-11 15:11:41 +02:00
github-actions[bot] 1a1be0c727
Merge staging-next into staging 2022-06-09 18:01:58 +00:00
Sergei Trofimovich d07b20daf3
Merge pull request #176389 from trofi/workaround-fno-common-for-darwin.developer_cmds
darwin.developer_cmds: add -fcommon workaround
2022-06-09 17:23:21 +00:00
Sergei Trofimovich daa44b3509
Merge pull request #176394 from trofi/workaround-fno-common-for-darwin.file_cmds
darwin.file_cmds: add -fcommon workaround
2022-06-09 17:23:01 +00:00
Sergei Trofimovich f436bf1145
Merge pull request #176351 from trofi/workaround-fno-common-for-darwin.top
darwin.top: add -fcommon workaround
2022-06-09 17:13:11 +00:00
Martin Weinelt 6451e9d4a5 Merge remote-tracking branch 'origin/staging-next' into staging 2022-06-08 22:22:26 +02:00
Randy Eckenrode 22d787323b
moltenvk: use functional form of mkDerivation
This allows MoltenVK to be overriden with pinned dependencies.
2022-06-07 10:06:31 -04:00
Randy Eckenrode 54d3d61b0c
moltenvk: remove DXVK compatibility patches 2022-06-07 10:06:31 -04:00
Dmitry Kalinkin 5906c4f6fb
Merge pull request #173152 from veprbl/pr/bsdmake_fix
darwin.bsdmake: fix for systems with non-standard RLIMIT_NOFILE
2022-06-05 12:03:40 -04:00
Sergei Trofimovich 7d6048d0ad darwin.file_cmds: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_chdname' in: ar_io.o tty_subs.o
2022-06-05 14:03:44 +01:00
Sergei Trofimovich d3805f8df5 darwin.dtrace: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o
2022-06-05 13:53:22 +01:00
Sergei Trofimovich 2923e72443 darwin.developer_cmds: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_btype_2' in:args.o pr_comment.o
2022-06-05 13:40:50 +01:00
Sergei Trofimovich 6868bb9ceb darwin.top: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_tsamp' in: main.o top.o
2022-06-05 10:11:41 +01:00
Randy Eckenrode 71ceba177f
moltenvk: provide MoltenVK-specific headers
These are needed to compile `vulkaninfo` in the Vulkan-Tools package.
2022-05-23 00:59:49 -04:00
Randy Eckenrode af99bbf451
moltenvk: fix broken ICD definition 2022-05-23 00:59:48 -04:00
Sandro bf3b55c038
Merge pull request #173282 from azuwis/sketchybar
sketchybar: 2.5.0 -> 2.5.2
2022-05-21 20:46:37 +02:00
Rick van Schijndel 83561001b3
Merge pull request #169782 from reckenrode/moltenvk-hydra
moltenvk: fix Hydra build failures
2022-05-18 20:03:07 +02:00
Jay Rovacsek 4ff9578411
dockutil 2.0.5 -> 3.0.2 (#167488)
* dockutil 2.0.5 -> 3.0.2

Implement required changes to dockutil to handle newer version of package: 3.0.2

* Add gzip to inputs, remove pbzx as it is unused

* Utilise recommended changes reducing build dependencies and following darwin patterns more closely.
Note; this changeset does maintain the symlinking of $out/usr/local/bin in order to resolve an issue with crashing.

* Apply format/lint with nixfmt
2022-05-18 04:57:38 +03:00
Zhong Jianxin 45a97a571b sketchybar: 2.5.0 -> 2.5.2 2022-05-17 14:15:14 +08:00
Dmitry Kalinkin df2ded87a3
darwin.bsdmake: fix for systems with non-standard RLIMIT_NOFILE 2022-05-15 10:53:50 -04:00
github-actions[bot] dae6d3bb73
Merge master into staging-next 2022-05-14 12:01:17 +00:00
yqrashawn 65c8b91090
goku 0.5.1 -> 0.5.2 (#1) 2022-05-14 09:45:19 +08:00
github-actions[bot] 2282e994f2
Merge staging-next into staging 2022-05-10 00:02:52 +00:00
Rick van Schijndel 1bd0b4de1f goku: fix download url
I accidentally merged this even though the url was not correct.
Fixup for https://github.com/NixOS/nixpkgs/pull/168863.
2022-05-09 20:00:06 +02:00
github-actions[bot] 27575e98ee
Merge staging-next into staging 2022-05-09 12:08:45 +00:00
Rick van Schijndel bf25f1af17
Merge pull request #168863 from yqrashawn/patch-1
goku: 0.3.6 -> 0.5.1
2022-05-09 11:09:32 +02:00
toonn 7fb011df89 Libsystem: Update headers.txt
Replacing `cpio -pdm` with `copyHierarchy` makes us end up with two
extra headers. I'm not sure why this happens, there's no reason why
`cpio` should miss those headers.
2022-05-05 11:53:52 -04:00
toonn 972c7e99ff Libsystem: Replace cpio with copyHierarchy
I noticed every time building Libsystem that there was a very slow phase
where the output consisted of many lines like `42 blocks`. This is
output from cpio and in brief testing it takes at least twice as long to
go through cpio for the simple copies we want to make. The interface is
very convenient but the performance penalty is very painful so I decided
to implement a function that emulates cpio's interface.

On my machine with a 7200 RPM HDD this speeds up the build from about
250 minutes to about 75 seconds, a factor of 200! I'm not certain the
results on modern hardware would be similarly positive so this could use
further testing.
2022-05-05 11:53:52 -04:00
Sandro 941c24d349
Merge pull request #170454 from willcohen/network_cmds
darwin.network_cmds: switch openssl to libressl
2022-04-27 16:54:51 +02:00
Will Cohen 36b5da498c darwin.network_cmds: switch openssl to libressl 2022-04-26 13:42:04 -04:00
Bobby Rong fd39a60a42
mas: use testers.testVersion 2022-04-26 15:59:18 +08:00
Randy Eckenrode 75c7e04801
moltenvk: fix Hydra build failures
MoltenVK requires Xcode to build until a newer SDK (11+) is available in
nixpkgs. Disable building on Hydra until that changes.
2022-04-22 08:54:54 -04:00
Kid 862c4f219a apple-sdk: update comment about frameworks version 2022-04-21 19:44:28 -04:00
Sandro 209244e930
Merge pull request #168138 from reckenrode/moltenvk-1.1.9
moltenvk: 1.1.8 -> 1.1.9
2022-04-21 01:55:06 +02:00
Lassulus 8d83fa4198
Merge pull request #160382 from steinybot/fix/upgrade-mas
mas: 1.8.2 -> 1.8.6
2022-04-20 19:18:21 +01:00
Randy Eckenrode 683e87e2eb
moltenvk: 1.1.8 -> 1.1.9 2022-04-19 20:35:45 -04:00
yqrashawn f77b63b46f
goku: 0.3.6 -> 0.5.1 2022-04-16 10:52:00 +08:00
Malo Bourgon 0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Martin Weinelt c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
ajs124 49c51cdd51 openssl_1_0_2: drop 2022-04-04 15:37:05 +01:00
Martin Weinelt d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Malo Bourgon 9683aa44a2 m-cli: 0.2.5 -> 0.3.0 2022-03-28 18:54:19 -07:00
github-actions[bot] e3d20dfaa5
Merge master into staging-next 2022-03-27 18:01:05 +00:00
Sandro 1bf32e43de
Merge pull request #163474 from reckenrode/dxvk-refactor 2022-03-27 17:00:33 +02:00
Vladimír Čunát 0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Artturin 33cce15e42 treewide: remove meta.repositories
there's no documentation for meta.repositories and its not widely used
2022-03-24 23:56:14 +02:00
Jason Pickens e55eb3d376
mas: 1.8.2 -> 1.8.6 2022-03-13 09:36:45 +13:00
github-actions[bot] 03c9842a65
Merge staging-next into staging 2022-03-10 18:02:01 +00:00
Zhong Jianxin 1cb1b5312d sketchybar: 2.4.3 -> 2.5.0 2022-03-10 01:07:06 +08:00
Randy Eckenrode f29e152b7e
dxvk: support version-specific MoltenVK patches
While it’s unlikely, it’s possible that different MoltenVK versions
could require their own compatability patches. Support that by making
the `moltenvk` derivation provide the patch via `passthru`. There is no
package with the patch applied because the patch should never be used by
anything other than DXVK.
2022-03-09 11:31:10 -05:00
Malo Bourgon 62860b31ef Revert "darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561)"
This reverts commit 92074a45f3.
2022-03-04 21:07:35 -05:00
github-actions[bot] c69af5b31c
Merge staging-next into staging 2022-03-02 06:16:36 +00:00
Thomas Boerger 80d6b6df01
dockutil: init at 2.0.5 (#155052) 2022-03-01 19:30:25 -05:00
github-actions[bot] 54a50a082c
Merge staging-next into staging 2022-02-24 06:01:49 +00:00
Finn Behrens 92074a45f3
darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561) 2022-02-23 15:57:01 -05:00
Randy Eckenrode 13c0a35fc1
moltenvk: 1.1.7 -> 1.1.8 2022-02-23 11:10:57 -05:00
Sandro 59e6eceb2e
Merge pull request #158534 from reckenrode/moltenvk 2022-02-17 13:42:40 +01:00
Zhong Jianxin 030962a9c0 sketchybar: init at 2.4.3 2022-02-17 09:51:50 +08:00
Randy Eckenrode b07e3705f2
moltenvk: add MoltenVK_icd.json to output 2022-02-16 17:36:50 -05:00
Randy Eckenrode f138abff3d
moltenvk: init at 1.1.7 2022-02-16 17:17:06 -05:00
Renaud e4779a33aa duti: update homepage 2022-02-06 15:10:26 +01:00
Thomas Boerger b00ecd5e3d
mysides: new package for darwin (#155053) 2022-02-03 16:04:31 -05:00
Dmitry Kalinkin 64b7c29da1
darwin.cctools-apple: init at 973.0.1-609 2022-01-31 20:37:48 -05:00
Dmitry Kalinkin 66ab3568d6
Merge pull request #155089 from veprbl/pr/usr-include_remove
darwin.usr-include: remove
2022-01-29 22:36:10 -05:00
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