Commit graph

580 commits

Author SHA1 Message Date
Robin Gloster edfdd0f3e4
darwin: use dontUnpack instead of phases 2019-12-31 01:24:10 +01:00
Robin Gloster bb2a6f7396
treewide: structured attrs fixes 2019-12-31 00:51:41 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Daiderd Jordan d5d8b3514d darwin.CF: fix retry condition (close PR #75528)
Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca86129f
never gets triggered.
2019-12-12 08:16:32 +01:00
Denis Redozubov 7233afc886 apple_sdk: broken link update (#73984) 2019-11-27 14:17:43 -05:00
Matthew Bauer fa383dcb7c cctools: fixup gnu-config detection
Use autoreconfHook instead of preConfigure autogen.sh. This avoids
getting the bad version of the gnu-config script and makes the newish
iOS triples work.
2019-11-27 10:04:32 -05:00
Matthew Bauer 848d4a08a0 cctools: readd ld-rpath-nonfinal patch
This patch is needed to build ghc, which adds -rpath flags for some
reason. Updated patch for newest cctools and reapplied.
2019-11-27 10:01:57 -05:00
Matthew Bauer 08d6c4019d Merge remote-tracking branch 'origin/staging' into dnicponski/scratch/update_darwin_cctools 2019-11-25 22:00:13 -05:00
Matthew Bauer 0c6a0c817a 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.
2019-11-25 21:57:56 -05:00
Matthew Bauer f0f4f90847 libtapi: bump to 1000.10.8 2019-11-25 21:57:39 -05:00
John Ericson 6d3b7458cc
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
2019-11-24 18:35:13 -05:00
John Ericson ef328622e0 cctools, darwin biutils: Use pname and version 2019-11-24 18:36:40 +00:00
Dave Nicponski 7b77c09e40 darwin.cctools: 895 -> 927.0.2
Update the version of `cctools` on darwin.  The older version fails
to work on some modern packages, such as `bazel 1.1`.
2019-11-19 09:20:13 -05:00
Daiderd Jordan 41ca86129f
darwin.CF: workaround intermittent CFRuntime.c failures
Based on testing this issue seems to only occur with clang_7, so
we should be able to revert this when the default llvm versions are
updated.

Fixes #66811
2019-11-17 14:55:00 +01:00
John Ericson f1481f2c90 apple-sdk setup hooks: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:28:59 -05:00
John Ericson beda0365a6 darwin private frameworks setup hook: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:24:20 -05:00
Jason Felice e4c34f2db4 osxsnarf: init at 0.1.0 2019-10-30 08:57:59 -07:00
volth 8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Nikita Voloboev 8b75a0a25f wifi-password: init at 0.1.0 (#68373)
* wifi-password: init at 0.1.0

* Apply suggestions from code review

Co-Authored-By: symphorien <symphorien@users.noreply.github.com>
2019-09-10 00:40:05 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Robin Gloster 64f6a951eb
darwin.network_cmds: pin to openssl 1.0.2 2019-08-26 01:31:10 +02:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Robert Winslow e91d400dff darwin.adv_cmds: Fix fetchzip call by using https not http (#64546) 2019-08-14 10:24:34 -04:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Eric Norris de9bf55774
smimesign: init at v0.0.13 2019-07-04 12:43:43 -04:00
Daiderd Jordan 4e7695fc69
darwin.trash: remove cf-private 2019-07-03 22:20:23 +02:00
Daiderd Jordan 8ea702a484
darwin-frameworks: add import CoreFoundation to CoreServices 2019-07-03 22:20:09 +02:00
Daiderd Jordan 73d9cac377
darwin-frameworks: replace cf-private and move it's setup-hook
The only remaining use-case for cf-private are symbols that are not
available in the opensource build.  This generally solved the problem
because of it's setup-hook.
2019-07-03 22:20:09 +02:00
Daiderd Jordan c2b76fa13c
darwin-frameworks: remove CF
CoreFoundation is included by the stdenv, moving the decision of what
version should be used there makes it possible to override it entirely
rather then prepending flags like cf-private does which can be
unreliable.
2019-07-03 22:20:04 +02:00
Matthew Bauer e49729f9b1
Merge pull request #63707 from matthewbauer/fix-63043
Qt5 + Darwin fixes
2019-06-23 20:37:54 -04:00
Matthew Bauer 4e22fe4f63 apple-sdk: add MetalKit 2019-06-23 18:28:36 -04:00
Mario Rodas 2932be89af
Merge pull request #63051 from marsam/init-noah
noah: init at 0.5.1
2019-06-22 13:18:45 -05:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Mario Rodas 7b2325622a
noah: init at 0.5.1 2019-06-12 21:30:00 -05:00
Matthew Bauer dba9208407
Merge pull request #62684 from bdesham/trash-0.9.2
trash: 0.9.1 -> 0.9.2
2019-06-11 19:32:55 -04:00
Daiderd Jordan 6b363b3717
chunkwm: init at 0.4.9 2019-06-07 22:15:53 +02:00
Benjamin Esham 6586effe96 trash: 0.9.1 -> 0.9.2 2019-06-04 15:58:40 -04:00
Renaud 2fb1b3156f
Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
2019-05-07 23:34:04 +02:00
c0bw3b 9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Matthew Bauer 87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer d1f988ca3c darwin: correct framework dependency
AudioUnit depends on AudioToolbox now, so use that to keep
compatibility.
2019-04-26 21:55:03 -04:00
Matthew Bauer 43cda1b854 apple-sdk: add Metal framework for QuartzCore 2019-04-26 21:54:56 -04:00
Matthew Bauer 9d2326c622 Libsystem: get os/{log,trace,activity}.h from darling
This is the only place I can find the headers.
2019-04-26 21:54:56 -04:00
Matthew Bauer 4faa8d0238 cctools: add patch for apfs 2019-04-26 21:54:55 -04:00
Matthew Bauer 9da646ed29 darwin.xnu: install os/log.h file in Libsystem 2019-04-26 21:54:55 -04:00
Matthew Bauer e3a9b1ea23 apple-sdk: Foundation needs cf-private 2019-04-26 21:54:54 -04:00
Matthew Bauer 4903e825fa apple-sdk: update frameworks location
Some have been removed like:

- DrawSprocket
- DVComponentGlue
2019-04-26 21:54:53 -04:00
Matthew Bauer 565f28fba7 Libsystem: add os/availability.h 2019-04-26 21:54:53 -04:00
Matthew Bauer dc483505d4 cf-private: don’t use private sdk
no private sdk is available for 10.12.
2019-04-26 21:54:51 -04:00
Matthew Bauer 8cabf4d5c5 treewide: rename llvm-dsymutil to dsymutil
This is a change introduced between llvm 5 and llvm 7.
2019-04-26 21:54:50 -04:00
Matthew Bauer 7f08b28bbf Revert "Revert "cctools: bump to latest commit""
This reverts commit 0e78f2bd10.
2019-04-26 21:54:47 -04:00
Matthew Bauer 36450d8d0b cctools: enable tapi everywhere
Gets us closer to #19906.
2019-04-26 21:54:46 -04:00
Matthew Bauer f76c7b8fab libtapi: init
(cherry picked from commit 69347697d3336d4b6add8276d9f75daf6f0cacf3)
2019-04-26 21:54:46 -04:00
Joachim F 50833cdc62
Merge pull request #53863 from thefloweringash/osxfuse
osxfuse: init at 3.8.3
2019-04-21 07:42:08 +00:00
Matthew Bauer d69cc779b5 Revert "Revert "darwin 10.12 commits""
This reverts commit 8505e710e7.
2019-04-20 23:17:04 -04:00
Vladimír Čunát 8d502fd425
Merge branch 'staging-next' into staging 2019-03-10 08:05:27 +01:00
Matthew Bauer 1e7bac9401 xcode-sdk-pkgs: add sdk to extraPackages
this gives you access to libraries like Foundation.
2019-03-09 18:12:25 -05:00
Matthew Bauer 8a08d7e7cc
Merge pull request #56031 from matthewbauer/priorities
Add some more priorities
2019-03-09 18:02:55 -05:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Michael Raskin a059fc7420
Merge pull request #56067 from oxij/tree/fetchurl-boot
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
2019-02-21 09:43:11 +00:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Jan Malakhovski a1fec8667d treewide: assemble all fetchurlBoot uses in overrides to fetchurl itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.

Pros:

- Aggregates all behind-the-scenes insanity in a single place.

Cons:

- At the cost of 10 more derivations (but 0 new outpaths).
2019-02-19 20:55:59 +00:00
Matthew Bauer e3ca9d954e
Merge pull request #56029 from matthewbauer/revert-cctools-bump
Revert cctools bump
2019-02-19 11:44:17 -05:00
Vladimír Čunát 424efc7e71
Merge branch 'staging-next' into staging 2019-02-19 11:08:32 +01:00
Matthew Bauer a4fbfe4217 darwin.binutils: set low priority 2019-02-18 21:09:14 -05:00
Matthew Bauer c5639650b8 darwin.binutils: add myself as maintainer 2019-02-18 20:56:09 -05:00
Matthew Bauer 5464dbe40a cctools: add myself as maintainer 2019-02-18 20:45:35 -05:00
Matthew Bauer 0e78f2bd10 Revert "cctools: bump to latest commit"
This reverts commit ac682e362c.

This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.

Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
2019-02-18 20:44:19 -05:00
Daiderd Jordan b4ea47749a
darwin: remove references to Ubiquity.framework
It was removed on recent versions of macOS and these entries break
sandboxing if they don't exist.

	Aborted: while setting up the build environment: getting attributes of path '/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity': No such file or directory
2019-02-17 15:30:30 +01:00
Daiderd Jordan 97c05bda52
darwin.architecture: fix sandbox build
Re-applies bad2db31b7.

This reverts commit f84aef11a4.
2019-02-17 10:11:25 +01:00
Daiderd Jordan f84aef11a4
Revert "darwin.architecture: fix sandbox build"
Moving changes to staging, this is a mass-rebuild.

This reverts commit e79278e4cd.
2019-02-17 10:03:26 +01:00
Daiderd Jordan e79278e4cd
darwin.architecture: fix sandbox build 2019-02-14 21:36:04 +01:00
Daiderd Jordan 051fcba987
swift-corefoundation: fix sandboxed build 2019-02-12 00:29:28 +01:00
Matthew Bauer 5f106e8aae darwin.xcode: update hashes 2019-01-25 16:37:37 -05:00
Andrew Childs 6300e62fd4 osxfuse: init at 3.8.3 2019-01-13 14:55:46 +09:00
Dmitry Kalinkin 1a7e65e146
adv_cmds: switch url to use https
warning: unable to download 'http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz': HTTP error 302 (curl error: Couldn't connect to server); retrying in 298 ms
2019-01-09 21:46:58 -05:00
Jorge Acereda 7dafdc1400 darwin: basic_cmds was installing binaries in the wrong path 2019-01-08 22:43:45 +01:00
Matthew Bauer ed6148726b darwin: fix more *_cmds derivation
Doh
2019-01-06 22:34:19 -06:00
Matthew Bauer 2bbec30c2e darwin.diskdev_cmds: fix build with dsymutil
xcbuild doesn’t handle dsymutil correctly. fuser.pl does not contain
debug symbols, but xcbuild doesn’t handle this like xcodebuild does.
So, just disable the debug information. We probably should do this in
more places using xcbuild, but it requires some arbitrary patching.
2019-01-06 22:13:11 -06:00
Matthew Bauer 030f66400d darwin.adv_cmds: fix build 2019-01-04 10:28:22 -06:00
Matthew Bauer 8cb2d35760 darwin: fix typos in install scripts
fixes some issues in my commits in:

- basic_cmds
- network_cmds

(cherry picked from commit f283145308aec6aa9a8c3c6cbd4864718ccb7c53)
2019-01-03 15:20:26 -06:00
Matthew Bauer 8505e710e7 Revert "darwin 10.12 commits"
Reverts commits bumping to macOS stuff to 10.12:

commit ec1f78d1cb.
commit d0dc91d24f.
commit a1d297374d.
commit 425112151d.
commit e6f7f2928f.
2019-01-03 15:20:26 -06:00
Matthew Bauer ec1f78d1cb darwin.libunwind: fix hash 2018-12-30 00:00:30 -06:00
Matthew Bauer 4f522648cb darwin: fix *_cmds installation
These just copy commands from Products/Release/. But with #52256 we
now build .dsym directories that somehow wind up in Products/Release/.
This makes things more exact by just copying the files in Products/Release/.
2018-12-29 23:58:10 -06:00
Matthew Bauer d0dc91d24f darwin: bump apple_sdks to 10.12
(cherry picked from commit 0b468bf0335eaa606fccfe98d4a36c3efbe83f2a)
2018-12-29 20:17:05 -06:00
Matthew Bauer a1d297374d darwin.hfs: put headers in hfs/ directory
This is where they are supposed to go. My mistake in the original
commit.
2018-12-27 11:18:28 -06:00
Matthew Bauer 425112151d
darwin: remove missing symbols
these symbols are not needed apparently
2018-12-19 23:46:06 -06:00
Matthew Bauer 59ec6b559d
Merge pull request #52256 from matthewbauer/52148-fix
Provide real dsymutil to darwin stdenv
2018-12-18 10:00:24 -06:00
Matthew Bauer d1dfc92187
Merge pull request #47678 from matthewbauer/landmarks
Update macOS frameworks to 10.12
2018-12-18 09:59:44 -06:00
Matthew Bauer e6f7f2928f darwin: 10.11 → 10.12
Lots of stuff has gotten moved around. Many security libraries have been merged
into the Security monorepo. I’ve cleared them out for now, we will
need to modify Security to build them!

This also moves some things around to more clearly separate
bootstrapping the stdenv from everything else. We want the “normal”
mode to be the non-bootstrapped version. When you ask for “Security”,
you want the actual built software, not a crippled one.

- Add TARGET_OS_OSX to darwin.libSystem. Looks like something
  introduced in 10.12. TARGET_OS_MAC is only set when building for
  desktop (iOS will have TARGET_OS_MAC set)
- Bump darwin.dtrace
- Bump darwin.libpthread
- Remove SmartCardServices, libsecurity*, etc.
- Install some more headers for darling.
2018-12-17 00:07:09 -06:00
Matthew Bauer 0a996c8ef3 darwin: use llvm’s dsymutil instead of dummy version
We were previously using a dummy wrapper for dsymutil. This meant that
debug symbols were not getting generated when dsymutil was otherwise
available. This should fix that issue & provide a real dsymutil from
llvm.

Fixes #52148.
2018-12-15 12:26:11 -06:00
Matthew Bauer 9564b8ed9e cctools: don’t depend on clang at runtime
--disable-clang-as flag disables the use of clang by cctools-port
2018-12-10 17:31:47 -06:00
Jörg Thalheim b2c86f46d9
Merge pull request #51549 from yurrriq/update/os-specific/darwin/skhd
skhd: 0.2.2 -> 0.3.0
2018-12-05 12:02:46 +00:00