1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Commit graph

259 commits

Author SHA1 Message Date
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
Vladimír Čunát 5af7b82336
Merge branch 'master' into staging
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Daniel Peebles f6a7296499 Merge pull request #16540 from matthewbauer/xcbuild
xcbuild: add wrapper
2016-11-16 12:11:15 -05:00
Matthew Bauer fc1f6f55ea
xcbuild: Get rid of developer.nix, move to wrapper
also:

- add custom outputs "specs" for xcbuild
- get rid of unneeded tools
- update xcbuild
- add more comments
- fixup xcbuild derivations

Affected xcbuild derivations include:

- adv_cmds
- network_cmds
- basic_cmds
2016-11-15 19:13:23 -06:00
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 5ddaca179c)
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