Commit Graph

1385 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Lluís Batlle i Rossell
f2f50c42d2 gcc47: adding --with-float option to gcc builder
Meant for cross-building. I need that for the raspberrypi
bootstrap-tools. Before this, its bootstrap-tools gcc built
for softfloat by default.
2012-12-28 21:12:57 +01:00
Lluís Batlle i Rossell
fde74242bf gcc47: Adding gcc mode, cross-building.
It's useful to build toolchains for armv7-m, to set thumb mode. It doesn't
support arm mode. chaoflow needed it.
2012-12-28 20:21:23 +01:00
Eelco Dolstra
88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
636303797f gcc47: moving the bootstrap logic into nix
It was in the builder.sh. Similar to the previous patch
to gcc46.
2012-12-27 15:08:17 +00:00
Lluís Batlle i Rossell
f94f53a54e gcc46: moving the bootstrap logic into nix
It was in the builder.sh.
2012-12-27 15:08:16 +00:00
Lluís Batlle i Rossell
d05b33653e gcc47: moving the bootstrap logic into nix
It was in the builder.sh. Similar to the previous patch
to gcc46.
2012-12-27 14:57:32 +00:00
Lluís Batlle i Rossell
e9365882c1 gcc46: moving the bootstrap logic into nix
It was in the builder.sh.
2012-12-27 14:54:44 +00:00
Lluís Batlle i Rossell
96b0de4c33 gcc4.7: making the cross-built gcc respect withAbi, withArch, ... 2012-12-26 22:01:51 +00:00
Lluís Batlle i Rossell
6c9002639d I forgot to undo a gcc46 unneeded change. 2012-12-26 22:01:17 +00:00
Lluís Batlle i Rossell
164a84f8f4 Restoring the gcc 4.6 builder. No need to change it. 2012-12-26 22:01:13 +00:00
Lluís Batlle i Rossell
a29b4228e9 Typo in 4.7 builder.sh 2012-12-26 22:00:53 +00:00
Lluís Batlle i Rossell
52ee2b99ee gcc47: fix on configureFlags, for cross-built gcc 2012-12-26 22:00:48 +00:00
Lluís Batlle i Rossell
43fac48f15 gcc47: trying to fix cross-building a gcc 2012-12-26 22:00:44 +00:00
Lluís Batlle i Rossell
651734b619 gcc/gcc-cross-wrapper: making gcc47 work with uclibc
It wants pthreads, and libpthreads wants libdl, and this can
only be found with -rpath-link when cross building.
2012-12-26 22:00:33 +00:00
Lluís Batlle i Rossell
2194b98565 Removing any cross-building kind of native build for the pi. 2012-12-26 22:00:29 +00:00
Lluís Batlle i Rossell
fc51895afe Get gccs understand 'fpu' 2012-12-26 22:00:20 +00:00
Lluís Batlle i Rossell
9fdd9d51bd Setting some kind of cross-compiler situation, for armv6l gnueabihf. 2012-12-26 22:00:15 +00:00
Lluís Batlle i Rossell
b520b4aeee Fixing my bash scripting of the previous commit 2012-12-26 22:00:11 +00:00
Lluís Batlle i Rossell
43fc5ae7cf Trying to fix the gcc builder; I added pi flags in the wrong if/else branch. 2012-12-26 22:00:07 +00:00
root
32c061146d Making gcc use some extra flags to build the proper hardfp gcc.
This commit breaks non-raspberrypi; just testing.
2012-12-26 22:00:02 +00:00
root
1b29d29c76 First movement to get the raspberrypi stdenv building. 2012-12-26 21:59:54 +00:00
Lluís Batlle i Rossell
1af2ada7d4 Fixing the patch in my prev commit
I thought the gcc patch from upstream would apply straight. False,
push-happy.
2012-12-26 19:29:55 +01:00
Lluís Batlle i Rossell
69f52a7916 gcc46: extending the gcc 4.6.3 patch about siginfo to other archs
I took the gcc commit as reference.
2012-12-26 19:18:29 +01:00
Andres Loeh
d068aa9861 Patch ghc-paths to interact better with ghcWithPackages.
When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).

But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.

As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.

This should at least partially solve issue #213.
2012-12-16 14:25:15 +01:00
Michael Raskin
215c5f0ff8 EQL: update to latest snapshot 2012-12-13 15:53:24 +04:00
Michael Raskin
f0997b9737 ECL: update to 12.12.1 2012-12-13 10:07:18 +04:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Michael Raskin
28d178521d Fix installation of Tk wrapper 2012-12-09 20:06:34 +04:00
Michael Raskin
47f0815655 Julia update; use Tcl/Tk 2012-12-09 11:30:44 +04:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Michael Raskin
2ace67c2bc Update SBCL to 1.1.2 2012-12-04 09:57:38 +04:00
Eelco Dolstra
bce3c6db7e openjdk: Fix typo in the version 2012-11-29 16:32:37 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Ludovic Courtès
1ac274784b gcc 4.7: don't pass `--with-native-system-header-dir' when cross-compiling 2012-11-29 10:58:41 +01:00
Ludovic Courtès
cd30b83fd8 gcc 4.7: when cross-building for GNU, patch gnu.h', not i386/gnu.h' 2012-11-29 10:58:41 +01:00
Ludovic Courtès
2aea62bd07 gcc 4.7: when cross-building for GNU, patch gnu-user.h', not gnu.h' 2012-11-29 10:07:21 +01:00
Michael Raskin
19b638f5c7 Update Julia / account for it now using patchelf 2012-11-28 16:19:26 +04:00
Michael Raskin
e72e74dad8 Update Julia to correspond to their changes 2012-11-22 17:30:33 +04:00
Rob Vermaas
ad928fee30 Update Oracle JDK to 1.6.0u38b04 2012-11-21 21:31:56 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Ludovic Courtès
eb08033e06 gcc 4.7: remove attempt to modify non-existent file 2012-11-17 20:54:29 +01:00
Ludovic Courtès
ebe07c644f gcc 4.7: remove now useless GNU/Hurd-related patch 2012-11-15 09:03:43 +01:00
Lluís Batlle i Rossell
77e983a7d4 ghdl: building the standard libs with -O2
That leads to faster simulations.
2012-11-13 15:16:32 +01:00
Peter Simons
fb1b425a74 Agda-executable: jailbreak to fix the build with recent versions of Agda 2012-11-12 12:48:27 +01:00
Shea Levy
e8cd81a055 openjdk: Install the unlimited crypto policy 2012-11-08 14:51:23 -05:00
Andres Loeh
8c4f5d02aa Updating ghc HEAD snapshot. 2012-11-07 14:45:32 +01:00
Michael Raskin
67bde8453f Update Julia and compensat for their specification of /bin/bash as SHELL 2012-11-06 22:35:51 +04:00
Michael Raskin
af2fd342cd Updating SBCL to freshest release 1.1.1.
Replacing SBCL upstream tracking expression with a new version in a new
format.

Minuses: gave up on defining everything in Nix language (now update
expression is a series of actions to do when downloading fresh release,
it is actually interpreted by shell), now Nix expression contains
meaningful whitespace (the area to regenerate is determined by the
line with a specific comment and the closing brace on the otherwise
empty line).

Plusses: only one extra file which could even be moved out-of-tree if
desired, clean semantics for traversing multiple links (it is not found
in either Debian uscan or Gentoo euscan), the main expression is in one
file and is less different from usual style.
2012-11-04 23:52:19 +04:00
Peter Simons
9d4aa6a6be haskell-idris: update to version 0.9.5.1 2012-11-01 10:09:22 +01:00
Michael Raskin
5e071cd74d OK, this version definitely builds both ways 2012-10-26 13:19:54 +04:00
Michael Raskin
e7493370bd Account for difference between JRE and JDK in build 2012-10-26 12:11:00 +04:00
Michael Raskin
e862c150f0 Trying to fix OpenJDK build 2012-10-26 11:06:25 +04:00
Shea Levy
a234280340 openjdk: Create a cacerts file from pkgs.cacerts 2012-10-25 23:33:09 -04:00
Michael Raskin
b2d0900e6e Update SBCL to 1.1.0 2012-10-24 23:09:29 +04:00
Peter Simons
59d7e94145 gprolog: disable parallel building to (hopefully) fix the weird error that occurred on Hydra 2012-10-24 20:30:04 +02:00
Peter Simons
b170bb0bf0 gprolog: update to version 1.4.1 2012-10-24 18:28:36 +02:00
Michael Raskin
cdb8f0dfe4 Update Lazarus 2012-10-17 22:24:39 +04:00
Michael Raskin
df2975f928 Update ECL to 12.7.1 2012-10-17 15:22:43 +04:00
Michael Raskin
3f0c47091c Update Clozure Common Lisp to version 1.8 2012-10-17 11:09:44 +04:00
Eelco Dolstra
e4a11b4d92 gcc: Get rid of lib64 2012-10-16 14:34:27 -04:00
Peter Simons
b1169e5509 ghc-*-binary: remove redundant assertion
Any attempt to instantiate these expressions on an unsupported platform is
going to 'throw' an error. The call to 'assert' doesn't add any value to
that (and generates less readable error messages, too). Further details are
available at <https://github.com/NixOS/nix/issues/56>.
2012-10-12 15:23:05 +02:00
Michael Raskin
4f8becaaa3 Merge pull request #139 from aforemny/jhc
Add jhc 0.8.0
2012-10-10 22:12:27 -07:00
Marco Maggesi
e32567bcf7 OCaml 4.00.1 2012-10-09 14:03:12 -04:00
Shea Levy
5150b55bf2 openjdk: Add lib{fontconfig,Xcursor,Xinerama} to rpaths. 2012-10-09 11:11:19 -04:00
Lluís Batlle i Rossell
85398493bf go: updating to 1.0.3 2012-10-09 17:02:11 +02:00
Peter Simons
0f54bd6130 haskell-idris: update to version 0.9.4.1 2012-10-08 11:25:23 +02:00
Shea Levy
4f178d1698 clang: Bump to 3.1 2012-10-08 01:57:39 -04:00
Shea Levy
5a6fd3d510 llvm: Bump to 3.1 2012-10-07 23:25:11 -04:00
aszlig
c6c7019091
haxe: Remove build files of haxelib/haxedoc early.
Previously, we installed std by omitting the tools directory. Now, there are
occasions where you actually want to use things like tools.haxelib from within
your project, for example to create something that interfaces with the haxelib
API. So we now just remove all files in there that were created during the main
build in postBuild.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 02:26:09 +02:00
Shea Levy
2f8ab5e651 Merge branch 'refind' into upstream 2012-10-07 17:54:30 -04:00
aszlig
c585be8619
neko: Correctly set 64bit mode in build.
Neko seems to think it is running in 32bit, even though it is compiled for
64bit. The fix is included in 1.8.3, which is not yet released as of now, so we
add a temporary fix until the release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-07 23:13:56 +02:00
Alexander Foremny
471ceb6dbb Merge remote-tracking branch 'upstream/master' into jhc 2012-10-07 17:58:43 +02:00
Alexander Foremny
f2e82a385e Add jhc 0.8.0 2012-10-07 17:52:43 +02:00
aszlig
064cf68281
haxe: Rewrite package from scratch, version 2.10.
As well as for neko, we now have way less cruft within the mkDerivation
attribute set. We also now use make to build haxe, which will include haxelib
and haxedoc as well.

The main reason why I was doing this was because the package didn't build and
still was referencing mawercer.de, which does not contain those tarballs
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-07 11:41:59 +02:00
aszlig
e5239b78bd
neko: Rewrite package from scratch, version 1.8.2.
This should simplify the input of the derivation builder significantly and of
course we don't need to rely on mawercer.de to supply the needed files. Also,
the derivation name doesn't include "-cvs" anymore, as we're building from the
release tarball.

In addition, we don't need the patch anymore, as it was so simple that it could
be done easily with sed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-07 11:41:19 +02:00
Shea Levy
af045b4ee1 edk2: Bump version 2012-10-04 20:11:47 -04:00
Shea Levy
c592992b14 Fix tarball 2012-10-04 19:53:10 -04:00
Shea Levy
a08ca4c04a openjdk: Don't use the official build system's boostrapping, do our own.
The openjdk BOOT_CYCLE bootstrap doesn't use the binaries built in the first stage for the second stage, so we get a bunch of errors like:
  /bin/sh: /nix/store/wdgl7xl9b72hn212l0672ad5sn7vh44y-openjdk-bootstrap/bin/native2ascii: No such file or directory
Instead, just build each stage as a separate derivation
2012-10-04 16:56:41 -04:00
Lluis Batlle
839f124ba1 ocaml: native code building for ARM on 3.12 and 4.00
I think it already works. I'll test more throughly tomorrow.
2012-09-25 19:38:06 +02:00
Peter Simons
3a34ac175f pkgs/development/compilers/ghc/with-packages.nix: include bash completion files in the generated environment 2012-09-25 15:05:49 +02:00
Lluís Batlle i Rossell
612ed601f2 gcc47: updating to 4.7.2 2012-09-24 15:24:01 +02:00
Michael Raskin
04cacaf628 Julia: fresher revision with a fresher dependency 2012-09-23 05:10:42 +04:00
Eelco Dolstra
6d27c9d5c3 gcc: Fix building on 32-bit Glibc 2.16
http://hydra.nixos.org/build/3046633
2012-09-21 10:53:56 -04:00
Peter Simons
0de6725105 haskell-idris: update to version 0.9.3.1 2012-09-21 16:36:24 +02:00
Peter Simons
8363515431 haskell-idris: update to version 0.9.3 2012-09-17 16:17:55 +02:00
Peter Simons
33e67e8394 ghc-head: update to version 7.7.20120912 2012-09-13 15:50:15 +02:00
Peter Simons
52454d7593 ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x 2012-09-13 15:49:42 +02:00
Peter Simons
eb288cf12e ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped 2012-09-13 15:13:00 +02:00
Peter Simons
13be1ff86e ghc-wrapper.nix: cosmetic 2012-09-13 15:12:43 +02:00
Peter Simons
7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Peter Simons
15df3d131a ghc-7.6.1: parallel builds of this package fail
I got the following error in 4 consecutive attempts:

  building rts/dist/build/AutoApply.debug_o
  building rts/dist/build/AutoApply.thr_o
    rts_dist_HC rts/dist/build/AutoApply.debug_o
  /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
  collect2: ld returned 1 exit status
  make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
2012-09-10 12:28:25 +02:00
Peter Simons
64c0d7a490 ghc: bump 7.6.1-rc1 to version 7.6.1 2012-09-10 11:30:12 +02:00
Peter Simons
ef649da119 polyml: fix bogus license attribute 2012-09-06 18:46:54 +02:00
Marco Maggesi
264c528154 Upgrade PolyML to version 5.4.1 2012-09-04 12:02:18 +02:00
Michael Raskin
da01cdaa82 Update Julia to latest revision, include zlib in dependencies 2012-09-04 09:32:59 +04:00