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
Jude Taylor
881fd7f589
disable libsystem_stats (temporarily?)
2015-08-25 11:12:10 -07:00
Jude Taylor
16a615a0f6
IOKit: add 10.11-only dependency
2015-08-25 11:12:09 -07:00
zimbatm
5bf732bf4b
Restore the listing of Darwin packages.
...
`nix-env -qaP -A pkgs.darwin`
pkgs.darwin.libutil:
Commented-out because the package definition doesn't exist. The source
doesn't even provide a Makefile...
pkgs.darwin.objc4_pure:
Commented-out because the package is broken and referencing unknown
applefetchsource and libc_old names. It doesn't seem to be used by any
other packages too.
2015-08-23 13:58:32 +01:00
Eelco Dolstra
aba76f23a5
Revert "add Darwin's flavor of lsof"
...
This reverts commit 7024b4dc62
. It
breaks evaluation (possibly related to earlier reverts):
http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Jude Taylor
ef95107ddc
make isClang work the way a user might expect
2015-08-12 11:27:54 -07:00
Jude Taylor
7024b4dc62
add Darwin's flavor of lsof
2015-07-31 11:35:42 -07:00
Jude Taylor
d3a4fe374f
update framework impure deps
2015-07-11 16:05:04 -07:00
Jude Taylor
5f308b50e4
add system keychains to security-tool's propagated inputs
2015-07-11 16:05:04 -07:00
Jude Taylor
066412c7b0
clean up propagated stuff for x509-system
2015-07-10 10:41:08 -07:00
Jude Taylor
630bff3b7d
remove unused security-tool deps file
2015-07-10 10:41:07 -07:00
Jude Taylor
0f763a12bf
update PCSC dependencies
2015-07-10 10:41:07 -07:00
Jude Taylor
7851df4454
fix input propagation on security-tool
2015-07-10 10:41:07 -07:00
Jude Taylor
43c72cb6af
add security-tool
2015-07-10 10:41:07 -07:00
Jude Taylor
f72beea75e
darwin purity: nodejs-0.10
2015-07-10 10:28:27 -07:00
Jude Taylor
ce5afbbb26
update libiconv source hash
2015-07-08 14:15:04 -07:00
Jude Taylor
976d80eb57
map apple sdk frameworks CF to darwin.CF to avoid confusion
2015-07-08 14:15:04 -07:00
Jude Taylor
857efa12fb
make vim frameworks-compliant
2015-06-30 17:34:13 -07:00
Jude Taylor
5429e06f58
move impure deps to a separate file
2015-06-30 16:29:05 -07:00
Jude Taylor
a4fbe26ec8
darwin purity: haskell-hfsevents
2015-06-20 15:29:55 -07:00
Jude Taylor
ee951a92d3
relocate adv_cmds
2015-06-18 12:37:42 -07:00
Jude Taylor
fa9c81f694
pure darwin stdenv
2015-06-18 12:37:41 -07:00
Daiderd Jordan
f119508140
darwin os-specific: rez and derez packages
2015-06-18 11:34:05 +02:00
Spencer Whitt
9119103656
command-line-tools: Update url
2015-05-18 15:10:33 -04:00
Spencer Whitt
165456bba2
command-line-tools: Update broken URL and packages
...
Close #7452 .
2015-04-18 22:55:43 +02:00
Dan Peebles
ecf662efc6
Flip cctools and cctools cross
2015-02-18 00:24:33 -05:00
Peter Simons
34413a142b
pkgs/os-specific/darwin/osx-private-sdk: fix evaluation
2015-02-14 23:07:16 +01:00
Dan Peebles
3cb733779b
Pretty sure nothing uses these, since they don't work (and we have a replacement in apple-source-releases)
2015-02-08 23:36:19 -05:00
Dan Peebles
1b2ae59102
This now lives elsewhere (the file was unreferenced)
2015-02-08 13:41:28 -05:00
Dan Peebles
29f265dfd2
Add a big bundle of packages from apple source releases. Many of them only provide headers or stubs, but are what's needed for the upcoming pure-darwin stdenv, and don't do any harm for now.
2015-02-08 01:53:52 -05:00
Dan Peebles
e32950d11a
Upgrade cctools port to 862, and fix the cross version so it evaluates
2015-02-08 01:11:03 -05:00