Commit graph

1810 commits

Author SHA1 Message Date
Shea Levy 2d97dd3fb7 Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs
fsharp: Upgrade to fsharp-3.0

[ Shea: I'm merging thoughtpolice's commits without further testing
beyond code inspection, as I believe their work has proven itself ]
2014-03-20 20:07:44 -04:00
Shea Levy 1150fa67eb Merge branch 'mono-3.2' of git://github.com/thoughtpolice/nixpkgs
upgrade Mono -> 3.2.8 + LLVM support

[ Shea: I'm merging thoughtpolice's commits without further testing
beyond code inspection, as I believe their work has proven itself ]
2014-03-20 20:05:04 -04:00
Peter Simons 4d03052c9c ghc: update HEAD snapshot to 7.9.20140313 2014-03-15 09:11:47 +01:00
Shea Levy 7939ca1e99 Merge branch 'update-java7' of git://github.com/bennofs/nixpkgs
oraclejdk7: add missing dependencies
2014-03-14 20:04:22 -04:00
aszlig 23b43c6a9b
gcc-4.8: Use --with-as/ld for MinGW-w64 as well.
On MinGW, we're passing these programs to the configure script, but this
obviously won't work for non-autoconf-based projects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:55:51 +01:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
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 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
Andres Loeh b2b4e46198 Add GHC-7.8.1-rc2. 2014-03-11 20:14:24 +01:00
Austin Seipp f277d6f4a0 fsharp: specify exact mono path, install fsi/fsc binaries
fsc/fsi are just symlinks for backwards compatibility.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-08 15:45:55 -06:00
Austin Seipp 6eb7a3078c mono: add LLVM support (3.4svn build)
This adds LLVM support in Mono using their custom fork, based on LLVM
3.4svn upstream. Somehow, it's gone for a while without a patch to fix
the CMakeLists.txt in the fork...

The upstream commit is based on the mono3 branch.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-08 14:57:49 -06:00
Michael Raskin 8b83156598 Update SBCL 2014-03-08 21:13:00 +04:00
Austin Seipp 429c536ddd fsharp: update to 3.0
Also, add myself to the maintainer list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-08 09:01:00 -06:00
Austin Seipp 3b69f4b109 mono: add myself to maintainer list.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:53:12 -06:00
Austin Seipp 09f0d1f661 mono: 2.11.4 -> 3.2.8
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:23:52 -06:00
Peter Simons 7b898a1d6a yap: revert update from 6.2.2 to 6.3.3
This reverts commit 41c662dcf6. The update
doesn't compile in i686, and I don't have time to investigate at the moment.
2014-03-07 23:16:33 +01:00
Peter Simons a1439ae0c2 swiProlog: update from 6.6.1 to 6.6.2 2014-03-05 15:32:15 +01:00
Peter Simons 41c662dcf6 yap: update from 6.2.2 to 6.3.3 2014-03-05 15:32:15 +01:00
aszlig e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
Vladimír Čunát a78f47917a go: don't assume sse2 on i686 (maybe fixes build) 2014-02-26 15:57:13 +01:00
Peter Simons 65aaf865a7 nasm: update from 2.10 to 2.11.01 2014-02-24 22:04:40 +01:00
Peter Simons 57e4d68025 haskell-idris: update to version 0.9.11.2 2014-02-13 10:57:43 +01:00
Domen Kožar 76a67c571a Merge pull request #1717 from linquize/vala
vala: Update to 0.23.2
2014-02-12 21:19:34 +01:00
Linquize 8cf797b1b5 vala: Update to 0.23.2 2014-02-11 23:35:00 +08:00
Peter Simons 96756095b7 haskell-idris: update to version 0.9.11.1 2014-02-10 20:54:53 +01:00
Artyom Shalkhakov 52e99bc723 Bumping ATS/Postiats version to 0.0.5. 2014-02-09 16:26:46 +01:00
Benno Fünfstück 303c418035 Workaround for relocation error
This works around "java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference"
2014-02-07 15:07:12 +01:00
Mathijs Kwik fc30e8e9b5 llvm: remove duplicate ncurses buildInput 2014-02-06 10:01:13 +01:00
Karn Kallio 19027ca0a6 pakcs: advance version to 1.11.3, which is compatible with SWI Prolog 6.6 2014-02-05 23:06:51 +01:00
Eelco Dolstra c3d84d15ce Apply makeOverridable to stdenv
This removes the need for hacks like stdenv.regenerate.  It also
ensures that overrideGCC is now stackable (so ‘stdenv = useGoldLinker
clangStdenv’ works).
2014-02-05 19:18:33 +01:00
Lluís Batlle i Rossell 627c82b991 gcc 4.8: no need for the arm eabi patch. 2014-02-04 10:18:27 +01:00
Shea Levy 72b5403ee8 edk2/OVMF: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:32:21 -05:00
Shea Levy eb4e04c24f gcc-4.6: unmaintain
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:14:52 -05:00
Shea Levy b47609410b ats: unmaintain
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:14:27 -05:00
Shea Levy 9cf29b7039 llvm: Propagate ncurses and zlib
Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:11:00 -05:00
Karn Kallio b572051882 mlton: fix build with latest version. 2014-02-03 23:30:18 +01:00
Shea Levy 134546bca2 clang: Fix linking with -flto
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 20:39:16 -05:00
Shea Levy 86c587134b llvm-3.4: Try to fix build on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 19:47:59 -05:00
Michael Raskin 177b0a0e8b Update GCL source to latest release 2014-02-02 21:36:22 +04:00
Michael Raskin 6b0769ef90 Use dynamical libbfd because static one is searched in strange places 2014-02-02 21:14:55 +04:00
Domen Kožar 7c70ef4dee Merge pull request #1638 from wkennington/cache.mumble
Add more configurable options to mumble
2014-01-31 00:03:20 -08:00
William A. Kennington III 4dae2621e3 mcpp: Add package 2014-01-30 21:56:17 -06:00
Benno Fünfstück 264dcdddf1 Fixes 2014-01-30 19:40:42 +01:00
Benno Fünfstück 5d6fdd8abb oraclejdk7: add missing dependencies 2014-01-30 18:24:58 +01:00
Eelco Dolstra e8a401a0c9 llvm-3.4: Only build on Linux
It doesn't build on Darwin because it depends on Valgrind:
http://hydra.nixos.org/build/8616143/nixlog/1/raw
2014-01-30 13:49:17 +01:00
Eelco Dolstra 8893f10d6a ghc: Fix building on Darwin
http://hydra.nixos.org/build/8598783
2014-01-30 13:45:48 +01:00
Petr Rockai 7c24880b4c Merge branch 'pr/cuda-sdk' of git://github.com/dguibert/nixpkgs 2014-01-29 18:36:15 +01:00
David Guibert 42911b1903 cuda: install the SDK using multiple-outputs support 2014-01-29 15:48:55 +01:00
Eelco Dolstra 5150dbfdbe openjdk-darwin: Behave the same as openjdk-linux 2014-01-28 12:10:27 +01:00
Shea Levy 1cb628c2e7 clang: the --sysroot purity trick doesn't take care of the -dynamic-linker setting
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-27 12:50:21 -05:00
Peter Simons 666cfebff1 idris: re-generate with cabal2nix 2014-01-27 11:49:20 +01:00
Shea Levy c0e93ca39d Unmaintain old llvm versions
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-26 21:01:13 -05:00
Petr Rockai 81598537a7 Merge branch 'vlstill-llvm-multivers' 2014-01-26 23:48:54 +01:00
Vladimir Still 3209170626 LLVM: Allow building gold plugins together with llvm 3.{1,2}. 2014-01-26 22:53:27 +01:00
Vladimir Still 69af3f4a78 clang_31: Allow clang to find system includes in gcc dirs.
Backported fix.
2014-01-26 22:51:58 +01:00
Shea Levy 3901d21c80 Idris: Build with llvm backend and libffi support
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-26 13:54:11 -05:00
Vladimir Still 11a7520928 llvm: Bring back old expressions for llvm & clang 3.[123]. 2014-01-26 19:16:50 +01:00
Peter Simons ea288d47bd haskell-Elm: update to version 0.11 2014-01-26 00:02:33 +01:00
Eelco Dolstra 981cac8e10 openjdk: Hackery to ensure that tools.jar is found
HotSpot uses the absolute path of libjvm.so to determine the java.home
property (ignoring $JAVA_HOME), which is in turn used by
ToolProvider.getSystemJavaCompiler() to load tools.jar.  So we need to
do some trickery to ensure that if java gets invoked from the jdk
output (ratherthan the jre output), it finds libjvm.so in the jdk output.
2014-01-25 03:04:46 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Shea Levy 3b20a10ae9 Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-22 15:54:40 -05:00
Michael Raskin 77fa75b1ba Merge pull request #1572 from bennofs/update-java7
java: Update to version 7u51
2014-01-22 12:29:23 -08:00
Benno Fünfstück 42fb68d6a9 java: Update to version 7u51 2014-01-22 21:22:18 +01:00
Georges Dubus f8afc745bf rust: fixed i686 build 2014-01-22 19:29:20 +01:00
Georges Dubus 49dd0867a7 rust: Fixed build 2014-01-22 16:36:05 +01:00
Georges Dubus 6eed023894 rust: patched the source to hardcode gcc path
to avoid using a wrapper.
2014-01-22 13:33:04 +01:00
Georges Dubus 35aa131371 rust: fixed build for i686 and maybe darwin 2014-01-22 13:33:04 +01:00
Shea Levy d18bc25b95 Rename linuxManualConfig to buildLinux
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 20:05:55 -05:00
Shea Levy 6bdafbad9b Build static libs with gcc
This was the behavior pre stdenv-updates and is needed by some users

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 16:11:29 -05:00
Peter Simons cb21683794 ghc: disable parallel building
It sucks, I know, but GHC just doesn't compile reliably when built with
some -j<n> option. :-( We have build errors because of apparent race
conditions all over the place on Hydra. This causes so much trouble for
users that it's not worth keeping this option enabled, IMHO.
2014-01-21 20:35:49 +01:00
Peter Simons 95934138bc gprolog: patch hard-coded path to the temporary file /tmp/make.log 2014-01-21 20:07:26 +01:00
Eelco Dolstra f5773e1f02 gcc-4.8: Enable Darwin and FreeBSD 2014-01-21 14:23:27 +01:00
Shea Levy 407c60fdf9 Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Shea Levy fea2266290 llvm: Split llvmFull into separate derivations
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Shea Levy 55e6303d6a Add full llvm build, update libc++ and dragonegg
Some packages in the llvm suite (e.g. compiler-rt) cannot be built
separate from the build of llvm, and while some others (e.g. clang) can
the combined build is much better tested (we've had to work around
annoying issues before). So this puts llvm, clang, clang-tools-extra,
compiler-rt, lld, lldb, and polly all into one big build (llvmFull).
This build includes a static llvm, as dynamic is similarly less tested
and has known failures.

This also updates libc++ and dragonegg. libc++ now builds against
libc++abi as a separate package rather than building it during the
libc++ build.

The clang purity patch is gone. Instead, we simply set --sysroot to
/var/empty for pure builds, as all impure paths are either looked up in
the gcc prefix (which we hard-code at compile time) or in the sysroot.
This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in
the normal Linux paths by default, which is the proper behavior IMO.

polly required an updated isl. When stdenv-updates is merged, perhaps we
can update the isl used by gcc and avoid having two versions.

Since llvm on its own is now separate from the llvm used by clang, I've
removed myself as maintainer from llvm and will leave maintenance of
that to those who are interested in llvm separate from clang.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 05:42:38 -05:00
Shea Levy 0e74c9f4dc Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-19 13:38:37 -05:00
Shea Levy cb24530135 Fix whitespace
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-19 12:40:31 -05:00
Shea Levy 4b9da6697b Merge branch 'master' of git://github.com/madjar/nixpkgs
rust: Add

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-19 12:39:17 -05:00
Georges Dubus 2a0f1cd6f1 rust: Add 2014-01-19 17:30:36 +01:00
Mathijs Kwik 6072a289fc llvm: no-rule-aarch64.patch is only needed on 3.3
the fix just missed 3.3 but it's in 3.4
see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625
2014-01-18 19:13:29 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Vladimír Čunát 2848336491 ghc-7.6.3: disable parallel building (fails on Hydra) 2014-01-17 21:57:30 +01:00
Peter Simons a3f00d61f8 Merge pull request #1521 from maggesi/marginal-updates
Update Io lang to version 2013.12.04
2014-01-17 02:47:04 -08:00
Marco Maggesi e9e2e8ace6 PolyML expression: Factorize version number in a separate variable 2014-01-15 15:58:27 +01:00
Shea Levy c056a69fdd darwin openjdk: set jre attribute.
Fixes tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-15 01:06:04 -05:00
Marco Maggesi aa8f36e238 Update PolyML to version 5.5.1 2014-01-14 15:27:10 +01:00
Peter Simons 67e3917864 gfortran-4.8: re-enable parallel building
86802e68ff added a patch that fixes the
race condition with bconfig.h.
2014-01-14 13:36:25 +01:00
Peter Simons 4fc64ac741 Merge pull request #1518 from wizeman/u/gcc_47_bconfig
gcc 4.7 build fix attempt
2014-01-14 04:30:33 -08:00
Eelco Dolstra cda63e94c3 openjdk: Fix setting $JAVA_HOME 2014-01-14 10:47:08 +01:00
Ricardo M. Correia bf3476c7d2 gcc: Fix build error on gcc 4.7
Specifically, we are trying to fix the following error seen on Hydra:

../../gcc-4.7.3/gcc/gengtype-lex.c:1:21: fatal error: bconfig.h: No such file or directory

The patch is taken from gcc's SVN revision 193691.
2014-01-14 01:33:34 +01:00
Vladimír Čunát ae0c9b626f llvm: add 3.4, urge for versioned usage
The 3.4 code was tested preliminary in x-updates,
described by 2e4eab1228.

Updates to llvm break builds of dependent packages (in all cases I've seen),
and often upstream isn't too fast in porting to the newest version.
Consequently, it seems better to keep more versions (two ATM),
both in one file to share eventual changes.
Also, using versioned llvm_* attributes is proposed because of this.
2014-01-13 21:53:50 +01:00
Eelco Dolstra 033374d601 gcc: Fix building 4.5 and 4.6 2014-01-13 20:53:06 +01:00
Peter Simons 471f0e7b36 swi-prolog: update to version 6.6.1 2014-01-13 17:10:11 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Vladimir Still 4918c1436b rdmd: Add (D language compiler helper). 2014-01-11 19:08:40 +01:00
Vladimir Still b78871efa6 dmd: Add (D language compiler). 2014-01-11 19:08:40 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Eelco Dolstra 4775dee8b9 openjdk: Set JAVA_HOME in a setup-hook 2014-01-09 12:50:38 +01:00