Commit Graph

1688 Commits

Author SHA1 Message Date
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
86802e68ffd1981af92303a7a8a91a2723ca84ca 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
Domen Kožar
d1c1fce801 Merge pull request #1470 from iyzsong/vala
vala: update and cleanup
2014-01-08 09:51:47 -08:00
Song Wenwu
7a61edec6b vala: fix typo in license 2014-01-07 18:06:36 +08:00
Eelco Dolstra
c3d31749fb Remove gcc 4.7
There is really no reason to keep it around, given that it was never
the default in Nixpkgs.
2014-01-07 10:36:15 +01:00
Song Wenwu
4262c4bb9d vala: update to 0.23.1, remove old versions
set license to lgpl2Plus
add myself to maintainers
and some cleanup
2014-01-07 17:31:52 +08:00
Eelco Dolstra
f1efeb4b3c Get rid of tabs 2014-01-07 10:28:07 +01:00
Eelco Dolstra
bdf34e9059 gcc: Don't use attrByPath 2014-01-07 10:27:45 +01:00
Eelco Dolstra
90e533b685 openjre: Propagate setJavaClassPath
Thus, any package that has the JRE or JDK in its build inputs will
automatically have $CLASSPATH set up properly.
2014-01-06 14:36:14 +01:00
Peter Simons
74c4d15bf2 haskell-elm-server: update to version 0.10.1 2014-01-06 12:09:55 +01:00
Vladimír Čunát
0f3155f246 mlton: fix build by updating 2014-01-05 15:20:48 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Vladimír Čunát
f78534ca0f gcc-4.7: fix the parallel-bconfig patch
I'm sorry I forgot to test the 4.8 patch against 4.7. Now it's ported.
2014-01-04 12:37:17 +01:00
Eelco Dolstra
79675fad6e openjdk: Use multiple outputs
This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7f11ef6345 openjdk: Skip configurePhase
The build phase also runs "make sanity", so there is no need to do it
twice.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7edfe92f5f openjdk: Fix manpage cleanup 2014-01-03 11:56:40 +01:00
Eelco Dolstra
02f7e85d99 openjdk: Remove obsolete header file hack 2014-01-03 11:56:40 +01:00
Vladimír Čunát
86802e68ff gcc-4.{7,8}: hacky fix for parallel builds
The hash of stdenv is unchanged, as we use profiled compiler,
which has parallel builds disabled (conditional patch).
2014-01-03 10:42:46 +01:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Peter Simons
cc6331d0fe haskell-Elm: update to version 0.10.1 2013-12-30 20:49:29 +01:00
Rob Vermaas
96a51da082 Oraclejdk7: Fix hash and extracted path for jce_policy.zip. Add extra rpath. 2013-12-30 12:39:48 +01:00
Michael Raskin
d22106ab2d Update SBCL to 1.1.14 2013-12-30 02:30:55 +04:00
Domen Kožar
5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00