Commit graph

1716 commits

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