Lluís Batlle i Rossell
67aa9243f0
Merge branch 'stdenv-updates' into pi-stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial.
2012-12-28 23:30:53 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell
87ec7b49b1
gcc47: Fixing the gcc.float cross parameters
2012-12-28 21:38:57 +01:00
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