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 f283145308
)
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 0b468bf033
)
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
Eric Bailey
aad111f567
skhd: 0.2.2 -> 0.3.0
2018-12-04 22:15:51 -06:00
Matthew Bauer
5e06294276
darwin/libiconv: fix static/shared logic
...
The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.
2018-12-04 21:13:24 -06:00
Frederik Rietdijk
7863aae5b2
Merge master into staging-next
2018-11-11 08:59:44 +01:00
Frederik Rietdijk
53d00c3351
Merge master into staging-next
2018-11-10 11:08:54 +01:00
Daiderd Jordan
ee1c6f62f8
darwin.trash: add cf-private
...
Undefined symbols for architecture x86_64:
"_OBJC_CLASS_$_NSMutableArray", referenced from:
objc-class-ref in trash-571f39.o
"_OBJC_CLASS_$_NSURL", referenced from:
objc-class-ref in trash-571f39.o
"_OBJC_CLASS_$_NSUserDefaults", referenced from:
objc-class-ref in trash-571f39.o
objc-class-ref in HGCLIUtils-31f3b3.o
ld: symbol(s) not found for architecture x86_64
2018-11-07 19:15:43 +01:00
Daiderd Jordan
f2fadc0e91
darwin: don't include cf-private in framework dependencies
...
Using cf-private can cause problems, it's better to include it
explicitly in places where it's actually required.
2018-11-05 00:24:04 +01:00
Matthew Bauer
bda626e3f0
Merge pull request #49371 from matthewbauer/cctools-bump
...
cctools: bump to latest commit
2018-10-28 21:03:34 -05:00
Matthew Bauer
ac682e362c
cctools: bump to latest commit
...
Lots of our patches are no longer needed. This simplifies things a
bunch. In addition, it now includes man pages.
2018-10-28 16:44:05 -05:00
Nikita Voloboev
dd9e60f75e
goku: init 0.1.11
2018-10-27 16:15:36 +01:00
Daiderd Jordan
0fcd2ca7b2
darwin.cf-private: include headers from osx_private_sdk
...
This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
2018-10-24 12:04:05 +02:00
Daiderd Jordan
d856710c1f
reattach-to-user-namespace: 2.6 -> 2.7 ( #48283 )
...
Adds macOS Mojave (10.14) support.
2018-10-12 22:31:43 +02:00
John Ericson
7319013ea1
Merge remote-tracking branch 'upstream/master' into staging
2018-09-18 16:55:42 -04:00
Dan Peebles
110c252870
cctools: support LTO on Darwin
...
LTO is disabled during bootstrap to keep the bootstrap tools small and
avoid unnecessary LLVM rebuilds, but is enabled in the final stdenv
stage and should be usable by normal packages.
2018-09-16 02:12:11 -04:00
Dan Peebles
4efd4053ed
stdenv/darwin: integrate a new CoreFoundation
...
This also updates the bootstrap tool builder to LLVM 5, but not the ones
we actually use for bootstrap. I'll make that change in a subsequent commit
so as to provide traceable provenance of the bootstrap tools.
2018-09-15 16:05:46 -04:00
Uli Baum
4795c2a23a
darwin.maloader: mark as broken
...
no successfull build in Hydra history back to 2017-08-21
2018-09-08 20:08:34 +02:00
Dan Peebles
f223f417fa
swift-corelibs.corefoundation: update and modernize
...
This actually makes it useful to the Darwin stdenv, which I'll soon be
adjusting to use this library
2018-09-08 03:08:16 -04:00
Shea Levy
18337f3ece
Merge branch 'no-toPath'
2018-09-06 08:09:53 -04:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Daiderd Jordan
ea1542e9ee
Merge pull request #43140 from LnL7/macos-10.14
...
darwin: fix Libsystem compatibility for macOS 10.14
2018-08-14 23:02:04 +02:00
Daiderd Jordan
54f901d346
Libsystem: remove version symbols
...
These no longer exist on 10.14
Fixes #42719
2018-08-12 00:32:18 +02:00
Matthew Bauer
52681db9a3
darwin.objc4: install Object.h header
2018-07-29 12:02:04 -04:00
Periklis Tsirakidis
09cfb65c99
skhd: bump 0.1.1 to 0.2.2
2018-07-25 11:19:27 +02:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next
...
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Jake Waksbaum
1dd67f1aef
trash: f68ad25a -> 0.9.1 ( #43361 )
2018-07-11 21:07:22 +02:00
Matthew Bauer
0534ceac81
xcbuild: move setup hook to xcbuildHook
...
Not every package that needs xcbuild will want to use its build phase.
I have moved the xcbuild setup hook to the new attribute xcbuildHook.
This means that dontUseXcbuild is no longer needed. If you just need
to call xcbuild on its own you can just refer to xcbuild.
2018-07-09 17:13:58 -04:00
Daiderd Jordan
52b8b68e82
Libsystem: remove libsystem_network.dylib from reexport list
...
Fixes #42719
2018-07-07 11:42:50 +02:00
Matthew Bauer
f513d580b0
Merge pull request #43040 from matthewbauer/darwin-closure-reductions
...
Darwin stdenv tweaks
2018-07-05 14:34:54 -04:00
Matthew Bauer
c7ab795274
darwin.security_tool: disallow requiring sdk
...
As requested by @domenkozar
2018-07-04 15:08:35 -04:00
Matthew Bauer
d7591c44f0
apple_sdk.frameworks.Ruby: remove
...
This was broken & apparently unused.
2018-07-04 15:01:00 -04:00
Matthew Bauer
f7138342cb
libiconv: use enableFeature for static/shared
...
This makes things more predictable w.r.t. what is actually being built.
2018-07-03 16:51:30 -04:00
Matthew Bauer
d568d5016a
libsecurity: set NDEBUG
...
This prevents debugging stuff from coming into play. This avoids some
headers from accidentally winding up in the .dylib file.
2018-07-02 17:51:38 -04:00
Matthew Bauer
db414a2f5e
xpc: copy instead of linking to sdk
...
This prevents the apple sdk from coming into security tool
Fixes #42836
2018-07-02 17:51:38 -04:00
Matthew Bauer
907d7518d8
darwin.libsecurity: switch to multiple outputs
2018-07-02 17:51:38 -04:00
Matthew Bauer
526103a82d
darwin: fix syntax in makeFlagsArray
...
the double ’ should only be needed when using the braces. Otherwise
this will mess up some syntax highlighting, unfortunately, including nix-mode.
2018-07-02 17:51:38 -04:00
Matthew Bauer
e686bd2771
xcode: default to 8.2
...
There is some weird issue with 9.4 that needs to be resolved. 8.2 is
used by iOS anyway so that makes it easier.
2018-06-28 10:24:09 -04:00
Matthew Justin Bauer
fe9f4abec2
libsecurity_generic: fix apple_sdk lookup
...
apple_sdk is now multiple output.
2018-06-26 13:25:06 -04:00
Matthew Justin Bauer
e4d9ce9061
Merge pull request #42599 from obsidiansystems/xcodever-in-system
...
xcode: add xcodePlatform to system
2018-06-26 10:56:57 -04:00
Matthew Bauer
0bfffbc5e1
xcode: add xcodePlatform to system
...
This give us a little bit more control over what target we are using.
Eventually we can target other things like WatchOS or MacOS.
2018-06-25 22:18:23 -04:00
Matthew Justin Bauer
c16eb04425
Merge pull request #42399 from obsidiansystems/xcodever-in-system
...
xcode: add xcodeVer to system
2018-06-25 21:59:01 -04:00
Matthew Bauer
9b0b31d981
xcode: add xcodeVer to system
...
This version number controls which xcode version to use when building
cross to iOS.
2018-06-25 21:57:24 -04:00
Matthew Bauer
73e2f60837
libiconv: add "enableShared" option
...
When false, shared libraries will be disabled.
also adds patch to *really* disable shared libiconv.
2018-06-25 17:10:11 -04:00
Frederik Rietdijk
48110c1295
Merge staging into master
2018-06-22 13:20:37 +02:00
Matthew Bauer
3da395fd96
xcode: add 9.4 sdk
...
This is the newest sdk. I have skipped 9.3 for now but someone can
certainly add it if they need it for some reason.
Also I added a generic "xcode" that will always point to the newest
xcode that is available in Nixpkgs.
2018-06-21 13:24:52 -04:00
Frederik Rietdijk
ae215d1ba8
Merge master into staging
2018-06-10 10:10:42 +02:00
Florian Klink
dcdeaa1a24
darwin.iproute2mac: wrap network_cmds
2018-06-09 23:12:16 +02:00
Florian Klink
857ab32cca
darwin.iproute2mac: init at 1.2.1
2018-06-09 22:47:21 +02:00
Matthew Bauer
06fa867498
apple_sdk: use multiple outputs
2018-06-09 00:05:38 -04:00
Matthew Justin Bauer
a1b5b1a660
xcode: update Xcode URL
...
Apple has changed this location. Now the url should look like:
https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_8.2/Xcode_8.2.xip
2018-06-08 10:27:40 -04:00
Matthew Justin Bauer
3ebcac8d85
darwin.libiconv: use static library
...
This is necessary to get stuff into the Apple App Store for iOS. Apple does not really like using dynamic libraries in iOS. Also the libcharset thing is apparently a "private" symbol.
See https://github.com/reflex-frp/reflex-platform/pull/307 for more details.
See 3dee596ed1 (diff-261d74054a31954b7c6175e2e7e28356)
for discussion
2018-06-07 10:53:02 -04:00
Matthew Bauer
050557ef8a
PowerManagement: init at 572.50.1
2018-05-31 12:36:23 -04:00
Matthew Bauer
279fd72b33
darwin.ICU: fix cctools
2018-05-31 12:34:15 -04:00
Alexandre Esteves
129dfedaa9
xcode: remove extra quote from message ( #41286 )
2018-05-30 23:10:48 +02:00
Jan Malakhovski
ad35019501
Merge branch 'master' into staging
...
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
Alexandre Esteves
3ab9caa3fa
Use requireFile for impure Xcode dependency
2018-05-23 20:32:15 +01:00
Matthew Justin Bauer
89e196d971
libiconv: fix setup hook
...
Fixes issue from PR #40139 .
2018-05-23 13:09:45 -05:00
John Ericson
18742471af
Merge remote-tracking branch 'upstream/master' into staging
...
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
John Ericson
266adab32d
cctools: Remove a bunch of stuff no longer needed for Linux
2018-05-23 09:22:19 -04:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath.
...
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
2018-05-22 16:42:02 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02:00
Eric Bailey
84919cd3ef
m-cli: init at 0.2.5
2018-05-19 13:52:42 -05:00
John Ericson
ddbe9191ef
Merge remote-tracking branch 'upstream/master' into staging
...
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
John Ericson
4956767f53
Make libiconv build for iOS with prefixed tools
2018-05-16 14:25:54 -04:00
Daiderd Jordan
f14841f3ce
Revert "darwin.libSystem: multiple outputs"
...
Broke the stdenv.
This reverts commit 69d1b7ab79
.
2018-05-13 10:01:52 +02:00
Matthew Bauer
326d0bf2aa
darwin.libSystem: cleanup
...
We don’t want to rely on a certain output so just use ‘getDev’ so Nix
will choose the right output for us.
2018-05-12 10:03:48 -05:00
Matthew Bauer
d000198ab7
darwin.architecture: correctly install headers
...
I’m not going to fix all of them but this is the best way to do this
in Apple things. Just add ‘EXPORT_DSTDIR’ to the installFlags & set
‘DSTDIR’ to $(out). Please do this instead of the patching!
2018-05-12 10:02:30 -05:00
John Ericson
ee4b56edd3
Merge remote-tracking branch 'upstream/master' into staging
2018-05-11 14:36:08 -04:00