3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

40041 commits

Author SHA1 Message Date
aszlig a9ef42f33c
gcc-4.8: Add ObjC and ObjC++ support for Darwin.
Cross-compiling stuff against Mac OS X's CoreFoundation won't work
without ObjC support, and we don't want to compile commandline utilities
only, right?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:45 +01:00
aszlig 46e90f76c6
tzdata: Provide lib as an additional output.
We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
aszlig 9a0a85827c
gcc-4.8: Hook in cross-darwin libc and binutils.
Let's finally hook everything into the existing cross-building
infrastructure. We're using --with-sysroot instead of --with-headers
here, because the XCode SDK contains references to /usr/lib.

I've tried to patch those references, but unfortunately (at least with
install_name_tool) it isn't possible to change those refernces in stub
dylibs.

So after bugging @tpoechtrager with annoying questions (thanks again), I
think my initial approach (patching the SDK itself and/or regenerating
the dylib stubs) was way to complicated so I ended up with this
implementation.

Also, I've added a condition to binutilsCross to use cctools if the libc
is set to libSystem. This might need some cleanups someday, mainly to
figure out how to properly bridge cctools and binutils.

So, as an example on how to cross-compile GNU Hello to Darwin, you can
use something like this:

(import <nixpkgs> {
  crossSystem = {
    config = "x86_64-apple-darwin13";
    arch = "x86_64";
    libc = "libSystem";
    platform = {};
  };
}).hello.crossDrv

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
aszlig dd10bb3181
Add a cross-platform port of cctools.
This basically is binutils for Mac OS X, but ported to work on
(GNU/)Linux and FreeBSD.

And it's up-to-date as well! I'm mentioning this, because it was quite
hard to find a recent port of it and I just accidentally stumbled on it
while trying to do the port by myself.

So thanks to @tpoechtrager for doing this.

Also, I've added two more patches, which essentially are:

 * ld-rpath-nonfinal:
     This allows -rpath to be used for linking non-final builds, which
     was allowed for earlier versions of cctools and got a check for
     that in more recent versions.

 * ld-ignore-rpath-link:
     Ignores the -rpath-link option, because the cross-wrapper uses it
     in different places. Unfortunately, the cctools linker doesn't
     support it, so we might need to implement this later if it's
     possible (I'm not a Mach-O man^H^H^Hexpert).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
aszlig 83dd414ca2
Add new package for Apple's XCode.
This package provides the SDK and standard library needed for
cross-compiling to Mac US X. We're using xpwn here to extract the DMG.

Also, this version (XCode 5.0.2) only contains the SDKs for version 10.9
and 10.8, so we might need to add requireFile directives for older
versions as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:43 +01:00
aszlig 5e565754ab
Add new package "xpwn" from @dborca's fork.
This really hase some nice utilities for coping with HFS+ and DMG
format. We're going to use it for extracting the xcode DMG, but it could
be used for more, even generating DMGs.

The reason I'm using the fork instead of the repository from
@planetbeing is thet the fork contains a few fixes, especially for
dealing with symlinks in HFS+ images.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:43 +01:00
aszlig bd2d120c08
vm/windows: Allow to specify a different arch.
So far, we determined this based on stdenv.is64bit, but there are cases
where you want to run/build a 32bit program on a 64 bit Windows.

This is now possible, by passing windowsImage.arch = "i686" | "x86_64"
to runInWindowsVM. Based an what was passed, the corresponding Cygwin
packages and setup.exe are bootstrapped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-04 09:22:18 +01:00
Austin Seipp c4d5757e29 grsecurity updates
- stable:  3.0-3.2.55-201402241936 -> 3.0-3.2.55-201403022154
  - testing: 3.0-3.13.5-201402241943 -> 3.0-3.13.5-201403031445

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-04 01:13:22 +01:00
Corey O'Connor 19c59ab984 upgrade bbswitch to 0.8 2014-03-04 01:05:12 +01:00
aszlig c6cb3276dd
windows/cygwin-setup: Drop meta.platforms attr.
This prevents cross-builds, so let's drop it for now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-04 00:52:39 +01:00
aszlig e86ffa08b7
vm/windows: Update SHAs for Cygwin setup.ini.
Another very annoying part. Unfortunately, the only option we might have
here is to include it in nixpkgs or maybe make a fixed Hash on the
result of the closure fetcher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 23:37:41 +01:00
aszlig 5bd52771ba
vm/windows: Replace binary with cross cygwinSetup.
As the official Cygwin setup binary download doesn't come in snapshots
or even versioned, the fetchurl of setup.exe will frequently fail, which
in turn will annoy us as hell (or at least me).

One warning though: The fetchurl is currently broken and the cross-build
might not work yet for example on mingw32 (mingw-w64 branch on its way),
but the upstream URL has already changed and the new version contains a
bug (not yet tracked down) which breaks our Windows bootstrap process.

So to conclude: If it's already broken, make it at least "less broken".

"Not broken" is coming soon with the merge of the mingw-w64 branch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 23:21:34 +01:00
aszlig 1771e07e20
os-specific/windows: Add new package cygwinSetup.
This is primarily going to be used for vmTools.runInWindowsVM, but in
theory, it could also work with Nix on CygWin which I haven't tested.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 23:18:33 +01:00
aszlig 40635ed343
vm/windows: Remove stray "import <nixpkgs>".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:45:14 +01:00
aszlig ca8cdcda06
vm/windows: Fix typo in runInWindowsVM.
Coincidentally, even with this typo, most tests work anyway, so I didn't
notice it in the first place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:42:10 +01:00
Peter Simons 2a46778cbf haskell-wizards: add version 1.0.1 2014-03-03 22:12:28 +01:00
Peter Simons 191dabf923 haskell-control-monad-free: add version 0.5.3 2014-03-03 22:12:28 +01:00
Peter Simons 164cf167b4 xmobar: drop obsolete patch files 2014-03-03 22:12:28 +01:00
Peter Simons 513073afc1 haskell-scientific: jailbreak to fix build with recent versions of tasty 2014-03-03 22:12:28 +01:00
Peter Simons cd262e8312 haskell-yesod-bin: update to version 1.2.6.1 2014-03-03 22:12:28 +01:00
Peter Simons ae8d12259e haskell-yesod-auth: update to version 1.2.6 2014-03-03 22:12:28 +01:00
Peter Simons 63a72b6ea0 haskell-x509: update to version 1.4.10 2014-03-03 22:12:28 +01:00
Peter Simons 9dd8579769 haskell-utility-ht: update to version 0.0.10 2014-03-03 22:12:28 +01:00
Peter Simons e74767282c haskell-shelly: update to version 1.4.4.2 2014-03-03 22:12:28 +01:00
Peter Simons e84bb182b2 haskell-poppler: update to version 0.12.3 2014-03-03 22:12:28 +01:00
Peter Simons 18f1e8df59 haskell-pango: update to version 0.12.5.3 2014-03-03 22:12:28 +01:00
Peter Simons 867b2cb42f haskell-multiarg: update to version 0.26.0.0 2014-03-03 22:12:28 +01:00
Peter Simons be693f08cb haskell-mono-traversable: update to version 0.3.1 2014-03-03 22:12:28 +01:00
Peter Simons b6c59de551 haskell-miniutter: update to version 0.4.3.0 2014-03-03 22:12:28 +01:00
Peter Simons 011ca0210b haskell-http-reverse-proxy: update to version 0.3.0.1 2014-03-03 22:12:28 +01:00
Peter Simons 1095825fd2 haskell-gtk: update to version 0.12.5.4 2014-03-03 22:12:28 +01:00
Peter Simons 7e7dc6feff haskell-glib: update to version 0.12.5.3 2014-03-03 22:12:27 +01:00
Peter Simons f488349682 haskell-gio: update to version 0.12.5.3 2014-03-03 22:12:27 +01:00
Peter Simons b6c93edded haskell-crypto-pubkey-types: update to version 0.4.2.2 2014-03-03 22:12:27 +01:00
Peter Simons 2978b1c334 haskell-cairo: update to version 0.12.5.3 2014-03-03 22:12:27 +01:00
Peter Simons eeb8e36bad haskell-base-compat: update to version 0.4.0 2014-03-03 22:12:27 +01:00
Peter Simons a72f47b2f8 haskell-assert-failure: update to version 0.1.1.0 2014-03-03 22:12:27 +01:00
Peter Simons 9597c8f8fe haskell-SVGFonts: update to version 1.4.0.2 2014-03-03 22:12:27 +01:00
mornfall 17e32945a1 Merge pull request #1864 from ttuegel/arpack
arpack: version 3.1.5, fix pkgconfig
2014-03-03 20:37:56 +01:00
mornfall 528b600ec6 Merge pull request #1867 from thoughtpolice/fixes
Some minor fixes for my packages - ktap, cb0cat, etc
2014-03-03 20:36:08 +01:00
Domen Kožar bca6feea00 Merge pull request #1872 from wkennington/cache.python
Add python paypalrestsdk and sorl_thumbnail
2014-03-03 19:32:30 +01:00
William A. Kennington III 347681ef74 sorl: Describe test failures 2014-03-03 12:30:58 -06:00
William A. Kennington III ea5d87fedf sorl_thumbnail: Add package 2014-03-03 10:36:49 -06:00
William A. Kennington III f0125f019e paypalrestsdk: Add package 2014-03-03 10:34:33 -06:00
Oliver Charles ef7a5deaee haskellPackages.stripe: New expression 2014-03-03 15:40:09 +00:00
Domen Kožar 6c12e8d2bd pythonPackages.mrbob: 0.1a9 -> 0.1.1 2014-03-03 14:58:34 +01:00
Domen Kožar 83771bd926 add python 3.4.0rc2 2014-03-03 14:21:28 +01:00
Eelco Dolstra 6a9168ad06 Get rid of services.mesa.* message 2014-03-03 13:57:08 +01:00
Eelco Dolstra 497997cc38 Move generation of coverage reports from nixos/lib/testing to releaseTools
Also, turn some stdenv adapters into setup hooks.
2014-03-03 13:57:08 +01:00
Eelco Dolstra ad7c518e45 Sync /tmp/xchg to ensure that the coverage data is flushed 2014-03-03 13:57:08 +01:00