cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
150283 commits 1 branch 0 tags 3.7 GiB
Commit graph

411 commits

Author SHA1 Message Date
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
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 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