Commit Graph

210 Commits

Author SHA1 Message Date
Matthew Bauer
4685bd7853
xcbuild: update meta and comments 2016-11-15 19:13:22 -06:00
Matthew Bauer
25485ece2a
xcbuild: add name to platform.nix 2016-11-15 18:58:13 -06:00
Matthew Bauer
9f46587841
network_cmds: init at 481.20.1
Fixes #16764
2016-11-15 18:58:13 -06:00
Matthew Bauer
3b17d9e35e
developer_cmds: init at 62 2016-11-15 18:58:13 -06:00
Matthew Bauer
823772b056
Librpcsvc: init at 26 2016-11-15 18:58:12 -06:00
Matthew Bauer
4a01a37051
basic_cmds: init at 55 2016-11-15 18:58:12 -06:00
Matthew Bauer
a35b330f30
adv_cmds: move from all-packages
Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix.
2016-11-15 18:58:11 -06:00
Matthew Bauer
1ee8685ee7
adv_cmds: add custom install phase 2016-11-15 18:58:10 -06:00
Matthew Bauer
f1897116d0
xcbuild: temporarily fix cflags/ldflags
This gets everything to build.

adv_cmds: remove NIX_LDFLAGS

- unneeded
2016-11-15 18:58:09 -06:00
Matthew Bauer
6c1858a93d
adv_cmds: Disable pkill.
pkill isn't building because of some missing headers:

- xpc/xpc.h
- os/base_private.h
- _simple.h

They are all available somewhere but not set up correctly in the Darwin
stdenv.

TODO: add pkill back in!
2016-11-15 18:58:09 -06:00
Matthew Bauer
8e301fab50
adv_cmds: add xcode derivation 2016-11-15 18:58:08 -06:00
Shea Levy
7df3d7446f Add initial basic support for cross-compiling to iOS 2016-11-15 16:31:55 -05:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
John Wiegley
aa23309a39
Add a patch for cctools to work with Xcode 8 2016-11-14 13:30:28 -08:00
Daiderd Jordan
52d4599b52
Revert "Update hash for xnu 3248.60.10, the tarball changed upstream, it seems."
This reverts commit 328ad17858.
2016-11-14 16:21:59 +01:00
Rob Vermaas
328ad17858 Update hash for xnu 3248.60.10, the tarball changed upstream, it seems.
(cherry picked from commit 5ddaca179c15154efae4e5b7efea843d2c67cff8)
2016-11-14 08:16:00 +00:00
Daiderd Jordan
16a90832cd
darwin.Libsystem: export _mach_init_routine 2016-11-09 20:01:54 +01:00
Dan Peebles
4f8a1094bd cctools: add patch I forgot 2016-10-17 08:51:48 -04:00
Dan Peebles
ead2424981 cctools: fix triple for the assembler
This was breaking `boost155` and would probably break anything else that
calls `as` with no explicit architecture.
2016-10-16 20:46:36 -04:00
Dan Peebles
b91d64463f Libsystem: update to 10.11.6 version
This actually has no effect but it bugged me to keep seeing an old version
in the package names :) and since we're making a bunch of stdenv changes
at once, I might as well.
2016-10-16 20:44:14 -04:00
dipinhora
6152c1ea7f Re-enable support for OS X 10.10 for darwin. 2016-10-13 11:09:37 -04:00
Dan Peebles
d8a0307a5d [darwin.stdenv] Fix to work on Sierra
This reinstates the libSystem selective symbol export machinery we used
to have, but locks it to the symbols that were present in 10.11 and skips
the actual compiled code we put into that library in favor of the system
initialization code. That should make it more stable and less likely to
do weird stuff than the last time we did this.
2016-10-12 00:08:13 -04:00
Jude Taylor
3dee596ed1 reinstate libiconv/libcharset wrapper 2016-10-06 11:56:32 -07:00
Vladimír Čunát
7a0b3c64ee Merge #18327: gcc darwin fixes 2016-09-17 00:32:03 +02:00
Matthew Bauer
8610a34474
gcc: use special native system headers for darwin
Darwin systems need to be able to find CoreFoundation headers as well as
libc headers. Somehow, gcc doesn't accept any "framework" parameters
that would normally be used to include CoreFoundation in this
situation.

HACK: Instead, this adds a derivation that combines the two. The result
works but probably not a good long term solution.

ALTERNATIVES: Maybe sending patches in to GCC to allow
"native-system-framework" configure flag to get this found.
2016-09-15 17:58:09 -05:00
Daiderd Jordan
28a0da5edc
darwin.libunwind: fix incorrect sha256 2016-09-14 00:42:07 +02:00
Dan Peebles
e6ea302c47 apple-source-releases: upgrade a bunch of stuff 2016-09-12 08:53:46 -04:00
Dan Peebles
31e79c5478 stdenv-darwin: upgrade a couple more constituents 2016-09-12 03:40:53 -04:00
Dan Peebles
7b9d3f8605 stdenv-darwin: upgrade a few more things
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.

There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.

Fixes #18461
2016-09-12 01:46:44 -04:00
Tuomas Tynkkynen
47784e55e1 darwin binutils: Fix binutils-raw output references 2016-08-30 02:57:43 +03:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
2016-08-24 07:35:30 -04:00
Daiderd Jordan
a9e913ffbf
darwin.security_tool: fix for gnustep makefiles 2016-08-20 13:43:58 +02:00
Daiderd Jordan
0ec2ba9497
darwin.libsecurity: fix for gnustep makefiles 2016-08-20 13:32:10 +02:00
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
2016-08-15 19:05:52 -04:00
Dan Peebles
ea34fe82bc swift-corefoundation: some cleanup
I upstreamed some patches so I'm using those now
2016-08-14 18:22:19 -04:00
Dan Peebles
4705a9a6c1 swift-corefoundation: actually remove spurious dependency 2016-08-14 17:42:03 -04:00
Dan Peebles
6cf13bfe66 swift-corefoundation: remove spurious buildInput
libpthread is part of libSystem, so there's no need to depend on it
explicitly
2016-08-14 17:40:05 -04:00
Dan Peebles
1861744e7c swift-corefoundation: init
This currently only produces a static library, but is a start :) soon we
might be able to incorporate it into our stdenv, but we need to get the
build system to produce a proper .framework first.
2016-08-14 17:35:44 -04:00
Dan Peebles
98b5e3a531 darwin.libpthread: fix messed-up header
We don't actually need the private headers and the private qos.h was
overwriting the public one, causing weird issues downstream (especially
with Swift's CoreFoundation)
2016-08-14 17:34:55 -04:00
Dan Peebles
948b7f23bb darwin.{xnu, Libc}: 10.9 -> 10.11
I can't submit this in smaller units because the various components all
depend on one another during the stdenv bootstrap, so I think this is
the smallest sensible change I can make.

I also removed the symbol-hiding shenanigans in Libsystem. It might mess
up compatibility with 10.9 but I don't really want to support the added
complexity and I see little evidence of anyone else wanting to support
it. If someone cares, we might be able to revive compatibility, but for
now it'll stay like this.
2016-08-14 12:53:33 -04:00
Daiderd Jordan
44c5b729b8 osx-private-sdk: Fix hash (#17185)
- use fetchFromGitHub
2016-07-23 00:54:25 +02:00
Tobias Pflug
68b0f2f500 reattach-to-user-namespace: fix sha (#15871) 2016-06-01 01:40:50 +02:00
Tuomas Tynkkynen
99acb412ab treewide: Make explicit that 'dev' output of ncurses is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen
3865e739de treewide: Make explicit that 'dev' output of binutils-raw is used 2016-05-19 10:00:26 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Arseniy Seroka
d0f909a0a8 Merge pull request #14706 from acowley/frameworks-GL
frameworks: GL is undefined
2016-04-24 22:38:47 +03:00
Anthony Cowley
ca1d46f98a ApplicationServices: add CoreGraphics child
The AVFoundation framework uses a relative path that presumes that
CoreGraphics is a child framework of ApplicationServices. It is not in
the 10.9 SDK.

This patch makes it one by tweaking the framework derivation generator
with special support to address this problem.
2016-04-15 18:21:33 -04:00
Anthony Cowley
970d80b0ff cf-private: fix CFLAGS surgery
The previous version could produce unparseable flags.
2016-04-15 18:21:33 -04:00
Anthony Cowley
52fb00535e frameworks: GL is undefined
The GLUT frameworks is currently a Nix evaluation error.
2016-04-14 17:31:04 -04:00
Vladimír Čunát
056b5a1a5f tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
2016-04-02 16:26:32 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Artecona
776c827842 otool: remove
The `otool` binary is provided by the `cctools` package (and `binutils`)
on darwin, which is properly packaged and compiled from source.

This old standalone `otool` was simply a symlink to `/usr/bin/otool`,
which notably depended on the user having already installed the Command
Line Tools via XCode, and would fail dependent builds if they hadn't.
2016-03-23 09:13:00 -04:00
zimbatm
d9e60e4d43 htop: merge both implementations
htop 2.0+ is now cross-platform
2016-03-19 22:20:20 +00:00
Tuomas Tynkkynen
0cd08e7e02 HACK: darwin adv_cmds: Add a dummy 'out' output 2016-02-13 15:50:20 -05:00
Tuomas Tynkkynen
79738a639a treewide: Mass replace 'binutils-raw}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Dan Peebles
a3dcb3051d apple-source-releases: bump many packages to 10.10.5
This also changes the versioning scheme to be in more "human-meaningful"
terms, so instead of the internal release numbers we talk about 10.10.5
or 10.9.5.
2016-01-10 14:53:44 -05:00
Dan Peebles
a63fa339a5 cctools-port: bump to 877.5 2016-01-10 12:16:43 -05:00
Yann Hodique
000fe58769 adv_cmds: fix typo in file name
adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While
that probably doesn't matter in default installations, it does matter
for case-sensitive filesystems.
2015-12-13 12:02:42 -08:00
Jude Taylor
d539d9c935 revert to __impureHostDeps where possible 2015-11-25 10:09:35 -08:00
Jude Taylor
32cb70bb07 propagate nothing for Kernel.framework since it exposes no library 2015-11-21 15:59:43 -08:00
Jude Taylor
4cd86cb068 in cf-private, use correct path to CoreFoundation 2015-11-21 15:55:19 -08:00
Jude Taylor
f5609a4d2a reintroduce impure host deps to all derivations 2015-11-21 15:51:48 -08:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Jude Taylor
914e9baefe start on sandbox stuff 2015-11-19 11:31:06 -08:00
Jude Taylor
7161be03c4 add libutil into darwin.Libsystem 2015-11-04 10:49:19 -08:00
Jude Taylor
74c99a9600 remove _main from CoreFoundation 2015-11-03 02:12:58 -08:00
Jude Taylor
ce4f1098ca reduce security setup hook duplication 2015-10-29 13:56:02 -07:00
Henry Till
3374d9f90d htop: fix on darwin 2015-10-29 00:40:30 -07:00
Jude Taylor
3b2b2ab046 wxmac: clean up and provide with stub packages 2015-10-28 17:36:20 -07:00
Jude Taylor
b3898c586a remove duplicate Kernel 2015-10-28 17:15:40 -07:00
Jude Taylor
74416dc40a wxmac: fix build 2015-10-28 17:15:16 -07:00
Henry Till
a7784cafa3 SDL: fix on darwin 2015-10-28 19:44:30 -04:00
Jude Taylor
de0182ee59 vim: clean up arguments list 2015-10-28 13:40:10 -07:00
Jude Taylor
5207f6b45c clean up emacs framework dependencies 2015-10-28 13:34:53 -07:00
Jude Taylor
62ac96fdca add ForceFeedback impure-deps 2015-10-28 13:34:53 -07:00
Jude Taylor
c62cf0b5b3 add propagated builds where needed to darwin frameworks 2015-10-28 13:34:53 -07:00
Jude Taylor
31fa564076 libunwind is included in libSystem; disable build, copy headers only 2015-10-28 13:34:53 -07:00
Jude Taylor
33db336914 add more needed headers to cf-private 2015-10-28 13:34:53 -07:00
Jude Taylor
6eaf7d318e build libunwind for real 2015-10-28 13:34:53 -07:00
Jude Taylor
5ea8770263 cf-private: prepend self to system includes 2015-10-26 17:13:29 -07:00
Jude Taylor
0a23e412b4 in darwin sdk, copy headers rather than linking them 2015-10-26 17:13:29 -07:00
Jude Taylor
3ff552fabe libdispatch: add os private header 2015-10-23 10:34:17 -07:00
Jude Taylor
657b1ccc47 darwin: repair QuartzCore paths 2015-10-22 09:47:20 -07:00
Jude Taylor
a7f09b201e fix filepaths for darwin.security_tool 2015-10-15 20:49:29 -07:00
Jude Taylor
b345f70939 propagate cf-private with AppKit; fixes emacs and others 2015-10-11 12:09:27 -07:00
Jude Taylor
7283bb7466 introduce separate cf-private package to account for no CLT 2015-10-06 00:11:10 -07:00
Jude Taylor
0870c09854 darwin purity: emacs-24.5-mac 2015-09-30 17:14:43 -07:00
Eric Seidel
86b1a18721 Merge pull request #9405 from zimbatm/darwin-listing
Restore the listing of Darwin packages.
2015-09-25 13:50:44 -07:00
Jude Taylor
8a1b8a5b0a alias libtool to darwin.cctools on darwin 2015-09-20 13:08:38 -07:00
Jude Taylor
d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
Jude Taylor
9be2c355be remove 3 more outdated impure-deps 2015-09-14 17:54:15 -07:00
Jude Taylor
b3b2928ca6 Revert "libsecurity_generic: add El Capitan impure-deps"
This reverts commit 557fa59042.
2015-09-12 11:59:08 -07:00
Jude Taylor
f7cb16ff9b Revert "apple-sdk: add El Capitan impure-deps"
This reverts commit 3bf5d87f9e.
2015-09-12 11:58:59 -07:00
Jude Taylor
0d54f0de59 add new libs to impure-deps for CoreServices
affects nodejs, vim, etc.
2015-08-26 17:06:10 -07:00
Jude Taylor
e5fe8aab74 add reattach-to-user-namespace 2015-08-25 19:03:49 -07:00
Jude Taylor
557fa59042 libsecurity_generic: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00
Jude Taylor
3bf5d87f9e apple-sdk: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00