Commit Graph

613 Commits

Author SHA1 Message Date
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
Alexandre Esteves
cb44120b81 Fix typo 2018-05-11 14:41:24 +01:00
Matthew Justin Bauer
73833ee446
darwin.architecture: add postPatch back in
I didn't think it was even being called before, but now getting this error:

https://hydra.nixos.org/build/73955984/nixlog/1
2018-05-11 08:14:21 -05:00
Periklis Tsirakidis
b12850d421 skhd: Bump 0.0.14 to 0.1.1 2018-05-10 20:57:45 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer
1c87d77efe
ppp: add dontBuild = true
Hopefully this is the last one.
2018-05-07 12:47:07 -05:00
Matthew Bauer
9811bf2258 treewide: cleanup phases from last commit
The last commit broken Darwin stdenv. We still need to skip some
phases when Apple provides a Makefile that shouldn’t be used.
2018-05-06 16:07:55 -05:00
Matthew Justin Bauer
295815bec7 treewide: Remove phases 2018-05-06 07:20:03 +00:00
Matthew Justin Bauer
5f65ec3f22
Merge pull request #39940 from matthewbauer/work
macOS closure-size reduction
2018-05-06 04:27:02 +00:00
Periklis Tsirakidis
bf65cf4d28 skhd: 0.0.12 -> 0.0.14 2018-05-05 22:33:34 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer
d88a61e439
libsystem: fix phases 2018-05-03 15:11:00 -05:00
Matthew Bauer
69d1b7ab79 darwin.libSystem: multiple outputs
adds 2 outputs for libSystem:

- out
- dev

should shrink closure sizes
2018-05-03 13:38:46 -05:00
Matthew Bauer
c0ebcab789 darwin.ICU: delete old /usr files
This is a huge directory & not referenced anywhere.
2018-05-03 13:38:46 -05:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Matthew Justin Bauer
3513034208 darwin.libiconv: fix setup hook 2018-05-02 15:35:46 -05:00
Matthew Bauer
8322b43e8e Revert "darwin.libiconv: fix setup hook"
This reverts commit ee08469d6c.

This one should go in staging first.
2018-05-02 15:35:12 -05:00
Matthew Justin Bauer
ee08469d6c
darwin.libiconv: fix setup hook 2018-05-02 15:31:37 -05:00
John Ericson
c377b21f83
Merge pull request #39844 from obsidiansystems/cctools-cleanup
cctools, apple libiconv: Apple clean up for iOS cross
2018-05-02 09:36:18 -04:00
John Ericson
62fd669ab7 darwin.libiconv: Start to fix for cross
I think I need postPatch for `autoreconfHook`, it's better anyways, and
I'm pairing this with another mass-rebuild so its essentially free.
2018-05-01 22:56:49 -04:00
John Ericson
4b3cc9ed87 cctools: Cleanup useOld conditions slightly
60771af5b6 jumped through some hoops in
order to avoid a mass-rebuild.
2018-05-01 22:31:37 -04:00
John Ericson
db4f96b3cb lib/systems: Fix eval for iphone32* examples
Whoops messed up 9a845de873 slightly.
2018-05-01 13:04:57 -04:00
Matthew Bauer
47a7383395 darling: fix src
Darling has a case conflict which means that its src hash will be
different between case sensitive and case insensitive file systems.
This is not ideal and the only way around it is basically to remove
the offending files from the output. I use fetchzip here to do that
but I hope there is a better fix available eventually.
2018-04-29 19:15:45 -05:00
John Ericson
ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Ken Micklas
ef3db7d14c ios-sdk-pkgs: Init from iOS SDK from XCode 2018-04-19 16:09:30 -04:00
Ken Micklas
60771af5b6 cctools-port: Use old version for iOS to support TBD linking 2018-04-19 11:37:10 -04:00
Matthew Justin Bauer
85cadf9a9b
darling: fixup hash 2018-04-18 18:35:21 -05:00
Matthew Justin Bauer
9330ef4df8
darling: darwin only for now 2018-04-16 17:01:38 -05:00
Matthew Bauer
6bb3ec8264 darling: use correct hash 2018-04-15 23:23:17 -05:00
Matthew Bauer
2a499ab411 adv_cmds: fix xcbuild invocation
Need to set SYMROOT and OBJROOT
2018-04-15 23:23:17 -05:00
Matthew Bauer
348215569a text_cmds: init at 99 2018-04-15 22:54:19 -05:00
Matthew Justin Bauer
4a9e37b7d2
maloader: linux only 2018-04-14 21:30:16 -05:00
John Ericson
800cb8ae71
Merge pull request #38881 from obsidiansystems/sierra-hack
cc-wrapper: More intelligent sierra hack
2018-04-13 14:39:56 -04:00
Matthew Bauer
23467e207f top: add meta 2018-04-12 18:42:21 -05:00
Matthew Bauer
5211410e69 top: init at 108 2018-04-12 18:27:11 -05:00
John Ericson
1001311280 cctools: Add alternative source for sierra hack
Source master rebase of my [PR #34].

Eventually, we might consider doing something for GNU binutils too, in
order that we switch (the normal) ld-wrapper to always use this to
leverage ld to resolve libraries, rather than faking it in bash.

[PR #34]: https://github.com/tpoechtrager/cctools-port/pull/34
2018-04-12 19:16:51 -04:00
John Ericson
01e1722e8f cctools: Make assert meta.broken instead
This more politely expresses the same thing
2018-04-12 19:15:47 -04:00
Matthew Bauer
5c491ab529 diskdev_cmds: init at 593 2018-04-12 17:16:49 -05:00
Matthew Bauer
ddbaa2dd33 libutil-new: fix with newest xcbuild stuff 2018-04-12 17:09:58 -05:00
Matthew Justin Bauer
29bc523733
Merge pull request #38865 from matthewbauer/darwin-security-fixes
[darwin] Security fixes
2018-04-12 14:27:00 -05:00
Matthew Bauer
59bcd129e5 libsecurity_apple_x509: add more symbols 2018-04-12 14:12:53 -05:00
Matthew Bauer
aa21f9c578 dtrace: patch impurities 2018-04-12 14:12:43 -05:00
Matthew Bauer
d227d1edf4 SmartCardServices: init 2018-04-12 14:12:36 -05:00
Matthew Justin Bauer
19a6f0e02b
Merge pull request #38715 from matthewbauer/shell_cmds-full
Build more commands from Apple's system_cmds
2018-04-11 11:13:50 -05:00
Frederik Rietdijk
ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Matthew Justin Bauer
15c1cd242c
Merge pull request #38329 from knedlsepp/fix-darwin.opencflite
darwin.opencflite: fix build
2018-04-11 01:36:38 -05:00
Matthew Bauer
dd4fd74f91 system_cmds: build more commands
Now includes getconf
2018-04-10 21:15:28 -05:00
Matthew Bauer
77ac9c50dc security_systemkeychain: init
Fixes #37838
2018-04-09 18:35:36 -05:00
Matthew Bauer
71b53c0cfe libsecurity_codesigning: init 2018-04-09 18:35:36 -05:00
Matthew Bauer
c468b30ede libsecurity_utilities: fixup 2018-04-09 18:35:36 -05:00
Matthew Bauer
4a515ed306 dtrace: add xcode drv
darwin.dtrace-xcode contains the dtrace bin
2018-04-09 18:35:35 -05:00
Matthew Bauer
0b83326172 darling: init 2018-04-09 18:35:35 -05:00
Matthew Bauer
d625fece18 CoreSymbolication: init 2018-04-09 18:35:35 -05:00
Matthew Bauer
72f8df9465 swift-corelibs: init
moves swift-corelibs-corefoundation to own dir

also adds libdispatch
2018-04-09 18:35:35 -05:00
Matthew Bauer
65562e4cdd treewide: change install references for xcbuild
now build directory is "Products/Release/"
2018-04-09 18:35:35 -05:00
Frederik Rietdijk
23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Daniel Peebles
fcbe4afe18
Merge pull request #36441 from LnL7/darwin-cleanup-frameworks
darwin-frameworks: cleanup
2018-04-04 09:38:27 -04:00
John Ericson
adaa110a72 binutils: No more darwin conditionals
Since at least d7bddc27b2, we've had a
situation where one should depend on:

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables,
   regardless of the host platform, at run time.

and that commit cleaned up this usage to reflect that. This PR flips the
switch so that:

 - `binutils` is indeed unconditionally GNU Binutils
 - `binutils-raw`, which previously served that role, is gone.

so that the correct usage will be enforced going forward and everything
is simple.

N.B. In a few cases `binutils-unwrapped` (which before and now was
unconditionally actual GNU binutils), rather than `binutils` was used to
replace old `binutils-raw` as it is friendly towards some cross
compilation usage by avoiding a reference to the next bootstrapping
change.
2018-04-03 13:34:52 -04:00
Josef Kemetmüller
d1dfe27ad9 darwin.opencflite: fix build 2018-04-02 12:00:23 +00:00
Matthew Justin Bauer
75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Daiderd Jordan
261a958170
skhd: 0.0.10 -> 0.0.12 2018-03-25 00:54:11 +01:00
Matthew Bauer
9c6b76f6af darwin.libiconv: add setup hook 2018-03-22 16:50:12 -05:00
Daiderd Jordan
adf11dcc01
darwin-frameworks: add hook for private frameworks to CoreMIDI
Some parts of CoreMIDI depend on private frameworks, this enables eg.
adding -framework MultitouchSupport to a build.
2018-03-17 14:02:51 +01:00
Daiderd Jordan
43be4ebfb1
Merge pull request #36581 from matthewbauer/darwin-fixes
darwin: fixes
2018-03-09 19:32:54 +01:00
Matthew Bauer
c7abef4c5d network_cmds: fix on darwin 2018-03-08 19:00:09 -06:00
Matthew Bauer
54e2c28b09 darwin: disable broken packages 2018-03-08 17:21:17 -06:00
Daiderd Jordan
9f516c23c5
darwin-frameworks: cleanup 2018-03-07 20:03:07 +01:00
Daiderd Jordan
b84d22cbbd
skhd: init at 0.0.10 2018-03-05 20:05:39 +01:00
Daiderd Jordan
6a4cd9d744
qes: init at 0.0.2 2018-03-03 13:54:06 +01:00
Daiderd Jordan
9717e6268f
kwm: 4.0.4 -> 4.0.5 2018-03-02 20:54:27 +01:00
Daiderd Jordan
d35c7590a2
khd: 2.1.1 -> 3.0.0 2018-03-02 20:54:19 +01:00
Daiderd Jordan
69779a5f7e
Merge pull request #33374 from dtzWill/update/llvm-5-default
Update LLVM default 4 -> 5
2018-02-11 18:29:26 +01:00
Varun Patro
e8f480fb6c
Add 'varunpatro' as a maintainer. 2018-02-07 13:59:34 +08:00
Daiderd Jordan
79f43537e6
ICU: fix build with clang-5 2018-02-06 23:38:46 +01:00
Varun Patro
6626349a03
Create default.nix 2018-02-06 00:35:55 +08:00
Shea Levy
43f647e5b4
Merge branch 'dynamic-function-args' 2018-02-02 09:41:16 -05:00
Will Dietz
bdc48d3b61 maloader: fix hash (currently broken) 2018-02-01 14:06:00 -06:00
Shea Levy
943592f698
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
2018-01-31 14:02:19 -05:00
Pascal Wittmann
459e6ba9fb
Merge pull request #25713 from jbaum98/darwin-trash
darwin: trash 0.9.0
2018-01-12 09:34:03 +01:00
John Ericson
a224dfc253 haskell infra: Fix cross as much as possible without changing hashes 2018-01-02 21:00:13 -05:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Daiderd Jordan
c8080388d8
libresolv: fix library version 2017-12-27 18:41:31 +01:00
John Ericson
a0b1ebeee9 Merge remote-tracking branch 'upstream/staging' into binutils-wrapper 2017-12-13 16:14:47 -05:00
John Ericson
cebe1b4c08 darwin binutils: Better handling of man pages and info 2017-12-13 16:08:18 -05:00
John Ericson
2bba929062 bintools-wrapper: Import separately from cc-wrapper 2017-12-13 16:08:18 -05:00
Shea Levy
8a7b2f889d
insert_dylib: Set platforms attribute 2017-12-10 20:22:36 -05:00
Shea Levy
6d7ceedaf9
Add insert_dylib darwin package. 2017-12-09 14:37:24 -05:00
Vladimír Čunát
cdde22aef5
Merge branch 'staging' (older one) 2017-12-08 10:22:31 +01:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Orivej Desh
99ed136809 darwin.Libsystem: fix build on 10.13.2 2017-12-04 18:54:39 +00:00
John Ericson
e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Daiderd Jordan
a0948ffdb0
Csu: fix build with CoreFoundation 2017-11-21 23:15:00 +01:00
Orivej Desh
b089c21506 Merge branch 'master' into staging
* master: (39 commits)
  python.pkgs.pybfd: move to python-modules
  documentation: python 2.6 is no more
  documentation: python3Packages is python36Packages
  wireguard: 0.0.20171101 -> 0.0.20171111
  php_excel: init at 1.0.2
  libxl: init at 3.8.1
  matrix-synapse: 0.24.1 -> 0.25.1
  grafana: 4.6.1 -> 4.6.2
  linux: 4.4.98 -> 4.4.99
  linux: 4.9.62 -> 4.9.63
  linux: 4.13.13 -> 4.13.14
  nixos/zsh: add the type for enableAutosuggestions option
  zsh-powerlevel9k: init at 2017-11-10
  fio: 3.1 -> 3.2
  filebench: rehash source
  nano: 2.8.7 -> 2.9.0
  bonnie: replace dead source link
  less: 520 -> 529
  strace: 4.19 -> 4.20
  iperf: 3.2 -> 3.3
  ...
2017-11-19 08:30:14 +00:00
Shea Levy
a8dc88258f
Merge branch 'system_cmds' 2017-11-18 08:34:05 -05:00
John Ericson
ccb93aee17
Merge pull request #31754 from obsidiansystems/simplify-darwin-binutils
cctools, darwin-bintuils: Don't always bring in headers
2017-11-17 15:31:45 -05:00
John Ericson
652c2beda9 cctools: Don't always bring in headers
- Give cctools a dev output for the headers

 - Update Libsystem to grab the headers from that dev output

 - Don't include the headers in Darwin binutils, just as GNU Binutils no
   longer does.
2017-11-16 17:45:41 -05:00
John Ericson
32a6838bc6 darwin-bintuils: Don't try to bring in missing bits of GNU Binutils
libbfd and libopcdes are separate derivations which now provide all
headers and libraries. Binutils should just provide executables.
2017-11-16 17:40:38 -05:00
Jake Waksbaum
232ff39115 darwin: trash 0.9.0 2017-11-16 07:47:47 -05:00
Daiderd Jordan
dadcca3f40 frameworks-coremedia: add impure dependnecy on CoreImage
Fixes ffmpeg sandbox build on darwin
2017-11-14 21:51:40 -05:00
Dan Peebles
49a5791bc4 darwin.stdenv: fix up to allow sandboxing 2017-11-14 10:36:04 -05:00
Dan Peebles
762a05cbb6 cctools-port: add a couple of (temporary) impure dependencies 2017-11-14 10:35:18 -05:00
Dan Peebles
b2f8185695 configd: remove unsupported sandbox profile 2017-11-14 10:34:28 -05:00
Vladimír Čunát
8559b6db82
Merge branch 'master' into staging
A couple thousand rebuilds from master.
2017-11-11 09:25:07 +01:00
Pascal Wittmann
24e87b49b6
Change many homepage urls from http to https #30636 2017-11-10 22:13:46 +01:00
Daiderd Jordan
63bac2c23e
cf-private: overwrite headers from CF 2017-11-09 23:29:41 +01:00
Dan Peebles
bb863378d3 adv_cmds: remove custom sandbox profile (not allowed in recent Nix) 2017-11-08 22:32:44 -05:00
Dan Peebles
48a34be41c Support frameworks properly in sandbox 2017-11-08 22:06:52 -05:00
Domen Kožar
2b995c544d osx_private_sdk: reduce output size and remove it from runtime closures 2017-11-07 11:06:10 +01:00
Domen Kožar
ea6a4068cf
darwin: build apple stuff in parallel 2017-10-31 07:47:58 +00:00
Vladimír Čunát
6525c22ef1
Merge branch 'master' into staging
Hydra: ?compare=1401528
2017-10-14 10:36:13 +02:00
Dan Peebles
e86991e1e8 darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there.
We'll need to get xcbuild into the stdenv bootstrap before we can make the main build,
but it's nice to see that it can work.
2017-10-12 07:16:22 -04:00
Shea Levy
48595335f4
Add system_cmds apple project
Actually just build sysctl for now, as xcbuild segfaults.
2017-10-11 15:13:27 -04:00
Dan Peebles
b426c85ce2 Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Daiderd Jordan
b196241f42
reattach-to-user-namespace: 2.5 -> 2.6 2017-09-26 00:58:51 +02:00
Daiderd Jordan
bb02b800a2
darwin-frameworks: add impure version of CoreFoundation 2017-09-23 22:29:43 +02:00
Peter Simons
3510197dcc Revert "haskell infra, ghc: Slight cleanup" 2017-09-15 18:45:15 +02:00
John Ericson
2295533f43 Merge pull request #29424 from obsidiansystems/slight-haskell-cleanup
haskell infra, ghc: Slight cleanup
2017-09-15 12:12:47 -04:00
John Ericson
e92cda161a haskell infra: Fix cross as much as possible without changing hashes 2017-09-15 11:37:39 -04:00
Jörg Thalheim
419869269d Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
John Ericson
0d12d040e7 Merge pull request #29402 from obsidiansystems/binutils-output-ref
treewide: Fix some references to binutils
2017-09-14 18:51:12 -04:00
John Ericson
bf7b521500 treewide: Fix some references to binutils
- Compiler's shouldn't use `binutils.dev` as that doesn't yet exist
   with a cross binutils.

 - Last two `binutils.binutils` which weren't reverted
2017-09-14 18:12:54 -04:00
Matthew Bauer
9111b53325 duti: init at 1.5.4pre
I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+.
2017-09-13 16:33:54 -05:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
Frederik Rietdijk
d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Tuomas Tynkkynen
e6a83ed89c apple-source-releases: Add some meta.platforms
Or Hydra tries to build them on Linux...
2017-09-04 19:04:05 +03:00
Thomas Mader
2a0f1ecdc8 apple-sdk: Move cf-private first in list, otherwise the build fails because CoreFoundation/CFAttributedString.h could not be found.
The problem appeared when building ldc on Mac OSX. See also 13778.
2017-09-02 08:35:07 +02:00
John Ericson
b64736a8e4 darwin binutils: Unwrap GNU Binutils before splicing with cctools 2017-09-01 11:44:56 -04:00
Daiderd Jordan
adca58c2e7 Merge pull request #27598 from LnL7/darwin-cf-rpath
CoreFoundation: use rpath to fix issues when using frameworks
2017-08-29 22:16:56 +02:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Daiderd Jordan
5a28fd660a
darwin-frameworks: move fixup setup-hook 2017-08-28 23:25:11 +02:00
Daiderd Jordan
cc1bfbd9a7
darwin-frameworks: use the system CF when frameworks are used
This will get propagated down to other libraries loaded because
everything in nixpkgs references CF based on an rpath entry.
2017-08-28 23:25:09 +02:00
Daiderd Jordan
92652b4d79
darwin-CF: use @rpath for library id and add an rpath entry for CF based on NIX_COREFOUNDATION_RPATH 2017-08-28 23:24:58 +02:00
John Ericson
7a22c01b54 apple misc pkgs: buildInputs -> nativeBuildInputs 2017-08-28 15:21:55 -04:00
Vladimír Čunát
a4c2613f3d
darwin.usr-include: set meta.platforms
Otherwise scripts may try to evaluate it and that fails due to
missing `stdenv.libc`.
2017-08-27 17:06:45 +02:00
John Ericson
056a389d3b ios cross cc-wrapper: Fail assertion to avoid breaking tarball job
Previously, this wasn't being evaluated by CI.
2017-08-21 11:50:29 -04:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Dan Peebles
0419452113 Fix Darwin stdenv to work on 10.13
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Domen Kožar
ca76954e49 Merge pull request #27245 from NixOS/osx_private_sdk/cleanup
Get rid of some usages of osx_private_sdk
2017-07-09 22:49:31 +02:00
Domen Kožar
e211504db6
Get rid of some usages of osx_private_sdk
For example this reduces haskell closure on
darwin for some packages for almost 500MB.
2017-07-09 22:48:04 +02:00
Ryan Trinkle
754c3f6ba4 cc-wrapper: fix response file parsing on ios-cross 2017-07-05 16:04:39 -04:00
John Ericson
95c8277701 misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
John Ericson
f43ae985a6 ios-cross: Just properly use the cc-wrapper
No other downstream derivations are needed anymore.
2017-06-22 17:56:12 -04:00
Daiderd Jordan
91caa85804
darwin-Libsystem: include libplatform headers 2017-05-27 23:19:50 +02:00
Daiderd Jordan
815f25f31b
darwin-CF: 855.17 -> 1153.18 2017-05-27 23:19:49 +02:00
Daiderd Jordan
bf58495177
darwin-dispatch: 339.92.1 -> 442.1.4 2017-05-27 23:19:48 +02:00
Daiderd Jordan
857648dd31
darwin-libplatform: init at 125 2017-05-27 23:19:47 +02:00
Daiderd Jordan
ff1253200b
darwin-ICU: init at 531.48 2017-05-27 23:19:42 +02:00
John Ericson
2e7ec6fb70 lib: Make platform predicates more ergonomic to use
`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin
hostPlatform.parsed`
2017-05-22 00:25:02 -04:00
John Ericson
7018dfb9f4 binutils and cctools: Prefix derivation names with target for cross
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter
2017-05-17 15:33:05 -04:00
John Ericson
88ea6463a3 binutils on darwin: Clean up the rats nest
- No more *Cross duplication for binutils on darwin either.
   `cctools_cross` is merged into plain `cctools`, so `buildPackages`
   chains alone are used to disambiguate.

 - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
   Previously, this was only done in the native case as nobody had
   bothered to implement the masher in the cross case. Implemented it
   basically consisted of extending the wrapper to deal with prefixed
   binaries.
2017-05-17 15:33:05 -04:00
John Ericson
db5a921945 crossStdenv on iphone: Just get info from targetPlatform 2017-04-24 16:12:26 -04:00
Vladimír Čunát
24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Daniel Peebles
f21a6940da Merge pull request #24838 from matthewbauer/ibtool
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Matthew Bauer
bb2eb5b0e8
ibtool: use xib2nib src 2017-04-11 03:22:32 -05:00
Dan Peebles
c595d5ed3d cctools-port: 886 -> 895 2017-04-09 17:32:37 -04:00
Dan Peebles
d93f2c3865 darwin.libSystem: fix intermittent impurity bug
If you've seen issues with libsystem_symptoms.dylib,
this should fix that.
2017-04-09 09:39:30 -04:00
Matthew Bauer
34422f428d
ibtool: add to toolchain
- init package
- add into xcbuild/toolchain.nix
2017-04-09 04:27:21 -05:00
Matthew Bauer
a78af29ae7
install_name_tool: remove
cctools provides install_name_tool
2017-04-09 04:22:44 -05:00
Dan Peebles
3a9c217804 rtags: fix for clang/libc++ 4
This also fixes a missing header in the SDK that rtags needs to work
properly. The underlying cause is that C++ headers got shuffled around a
lot in libc++ 3.8 (I believe) and became more standards-compliant, which
led to a lot of C-compatible passthrough header files being added to it
like math.h, which defines some C++-compatible versions of standard
functions like signbit, while #include_next'ing the system math.h. In
this case, including the SDK was stuffing another math.h in front of the
libc++ shim, which led to all sorts of mysterious failures.
2017-04-04 08:07:52 -04:00
Periklis Tsirakidis
6414533391 darwin: cleanup obsolete sdks 2017-03-24 08:06:03 +01:00
Daiderd Jordan
5b5357ae1e
khd: remove g++ patch 2017-03-23 23:03:17 +01:00
Dan Peebles
5561abd556 libauto: more obscene hackery to make it work on LLVM 4
This sort of thing is going to get revamped to be less hackish soon but
for now I want it to work. In this particular case, libc++ 4 (and maybe
earlier) gets very upset if we're imprecise about our const markers, and
I guess libauto was careless. This fixes it (PtrPtrMap) to be correct.
2017-03-21 22:24:12 -04:00
Daniel Peebles
38a03817b0 Merge pull request #22571 from LnL7/darwin-frameworks-hook
add setup-hook to fix darwin frameworks
2017-03-15 11:33:23 -04:00
Dan Peebles
59b795c590 apple-sdk: 10.9 -> 10.10
This is a slightly less ambitious version of the (now reverted) commit
377cef8d16, which had a bunch of issues
that I don't have time to resolve right now.
2017-03-14 22:36:21 -04:00
Daiderd Jordan
97a3e7cf52
darwin-frameworks: don't use pure CF 2017-03-12 15:19:04 +01:00
Daiderd Jordan
9ac3a8a5af
khd: 2.0.0 -> 2.1.1 2017-03-04 19:38:31 +01:00
Daiderd Jordan
7bd49cded4
khd: 1.1.4 -> 2.0.0 2017-01-30 22:43:54 +01:00
Michael Raskin
e08cae373b Merge branch 'master' into kwm 2017-01-24 17:59:56 +00:00
Michael Raskin
2bcc678f5a Merge pull request #22070 from LnL7/khd
khd: init at v1.1.4
2017-01-24 17:58:50 +00:00
Daiderd Jordan
adfb7e1f13
kwm: init at 1.1.4 2017-01-24 08:31:11 +01:00
Shea Levy
4f9f00fcc9 Add function to build a ghc standalone archive (OSX/iOS only) 2017-01-23 18:35:03 -05:00
Daiderd Jordan
0f91cdc45f
kwm: init at 4.0.4 2017-01-23 21:45:01 +01:00
Daiderd Jordan
034d39b244
darwin: update shas, some sources where re-released with different metadata 2017-01-23 19:39:03 +01:00
Shea Levy
b82d6b3a0a ios-cross: Expose the SDK directory via ccCross 2017-01-23 08:23:43 -05:00
Daiderd Jordan
c7d49e5f69
darwin: fixed eval of frameworks 2017-01-21 01:01:46 +01:00
Shea Levy
e70dcf6818 ios-cross: Bump sdk version, verify sdk install at build time 2017-01-20 14:10:15 -05:00
Daiderd Jordan
d6517b6e5e Merge pull request #21898 from matthewbauer/darwintools
DarwinTools: init at 1
2017-01-15 10:11:39 +01:00
Jude Taylor
3f49c4f3ce reattach-to-user-namespace: fix version 2017-01-10 12:21:43 -08:00
Jude Taylor
f2713ce805 update reattach-to-user-namespace 2017-01-10 11:51:03 -08:00
Matthew Bauer
6f72be9962
DarwinTools: init at 1 2017-01-08 02:28:44 -06:00
Daiderd Jordan
538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Vladimír Čunát
2e03ae274d Merge branch 'master' into staging 2016-12-22 11:28:56 +01:00
Aristid Breitkreuz
bb18e10ba0 Merge remote-tracking branch 'origin/master' into staging 2016-12-20 14:05:30 +01:00
Daiderd Jordan
fb2a7cd705 Revert "apple-sdk: 10.9 -> 10.11"
This reverts commit 377cef8d16.
2016-12-20 12:33:27 +01:00
Dan Peebles
377cef8d16 apple-sdk: 10.9 -> 10.11 2016-12-19 19:47:24 -05:00
Vladimír Čunát
86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
Daiderd Jordan
a01a5ed925
darwin.libunwind: fix source
Fixes #20977

since this was the same sha as the linux package nix just used that instead.
2016-12-15 21:11:04 +01:00
Daiderd Jordan
87b3918d0b Merge pull request #21133 from matthewbauer/shell_cmds
shell_cmds: init at 198
2016-12-15 17:53:09 +01:00
Matthew Bauer
ac4f27666e
darwin.CoreOSMakefiles: remove
This wasn't being used and it was causing an error when evaluating:

error: attribute ‘CoreOSMakefiles’ missing, at /Users/mbauer/Projects/nixpkgs2/pkgs/os-specific/darwin/apple-source-releases/default.nix:140:71
2016-12-14 23:45:19 -06:00
Matthew Bauer
83c7660279
shell_cmds: init at 187
fixes #11707
2016-12-14 21:18:09 -06:00
Vladimír Čunát
b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Anthony Cowley
1712366bac
apple-sdk: Include system cups libraries
The SDK includes cups header files, but not the libraries. The
`nixpkgs.cups` definition doesn't build on darwin due to the SDK being
too old. This change symlinks the system cups libraries into the old
SDK.
2016-12-07 23:14:38 +01:00
Tuomas Tynkkynen
f91458ca38 reattach-to-user-namespace: Set platforms 2016-12-05 02:36:54 +02:00
Matthew Bauer
bd57e32312
file_cmds: init at 264.1.1 2016-11-27 21:58:07 -06:00
Shea Levy
12cc39514e ios-cross: Document known prefixes 2016-11-19 10:29:01 -05:00
Vladimír Čunát
b69f568f4c
Merge branch 'staging'
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
2016-11-19 04:35:51 +01:00
Shea Levy
6f1d4149d5 ios-cross: Fix for simulator 2016-11-18 18:14:20 -05:00
Shea Levy
64ec4dd87b Add haskell packages set for cross ghc 2016-11-18 10:44:53 -05:00