Commit graph

628 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 4164de326a Making the cross-builds work with uclibc. There is no easy way of switching
between uclibc/glibc still.
I started the renaming from glibc to libc regarding the cross-toolchain, but I
still have to finish.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18801
2009-12-04 13:35:58 +00:00
Rob Vermaas 0b20c5c38f merged x86_64 changes back to trunk
svn path=/nixpkgs/trunk/; revision=18773
2009-12-02 21:03:02 +00:00
Lluís Batlle i Rossell 03fc55deeb Making the gcc 4.4 expression more friendly. Nevertheless it still cannot be
used to cross-compile, because of some bug in 4.4.2 I think. This bug does not
allow building a cross-compiler without libc:
http://archives.free.net.ph/message/20091119.140407.040d3c5b.en.html

Maybe we should wait for 4.4.3 or stay with 4.4.1 cross compiling. By now I
will keep 4.3.4 on cross compilation.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18730
2009-12-01 10:29:22 +00:00
Marc Weber 4a999a3811 adding neko
adding repository locations for haxe* and neko repositories

svn path=/nixpkgs/trunk/; revision=18709
2009-11-30 01:05:07 +00:00
Marc Weber c5b2c2c40a adding haxe
svn path=/nixpkgs/trunk/; revision=18708
2009-11-30 01:05:04 +00:00
Lluís Batlle i Rossell f4720cd5f9 Trying to get the gcc-4.4 cross-build also.
Fixing the glibc-2.10 expression on cross-builds (which should be ported to
the glibc-2.11 expression once we get "ports" there)

Making kde3 and cyrus-sasl use gcc-4.3, because the strictness in gcc-4.4 does
not allow them build.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18706
2009-11-29 23:27:35 +00:00
Rob Vermaas 48717cfa4f missing dep for strategoshell
svn path=/nixpkgs/trunk/; revision=18680
2009-11-27 20:31:12 +00:00
Rob Vermaas 56808c21ff typo
svn path=/nixpkgs/trunk/; revision=18679
2009-11-27 20:27:34 +00:00
Rob Vermaas 98f9ab70c0 stratego shell
svn path=/nixpkgs/trunk/; revision=18677
2009-11-27 20:22:43 +00:00
Rob Vermaas 746c502acc changes for x86_64-darwin support
svn path=/nixpkgs/trunk/; revision=18667
2009-11-27 10:56:07 +00:00
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
2009-11-26 21:34:53 +00:00
Lluís Batlle i Rossell c6b526495b Improving the crossStripping. A cross-glibc gets broken if stripped by the
native strip. So we now distinguish dontStrip and dontCrossStrip. I updated
the expressions for glibc-2.9 and glibc-2.11 accordingly.
I could get rid of the cross-glibc depending on the cross-gcc-stage-static.

Enabling nls in the final cross-gcc.

I still have problems on wint_t/wchar_t not working on cross build. Gettext
does not build.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18562
2009-11-23 17:06:57 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell a263cb814e Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build
- Fixing cross-linking, through --rpath-link (ld(1) explains well about it
- Made gcc call the linker and the assembler through the gcc wrapper instead of
  directly. I thought this was the source of missing -rpath's, but the source
  of the problem ended up being the lack of --rpath-link. But I think the
  native gcc calls the wrapped ld and as, so let's do the same cross
  compiling.
- Removed the binutilsCross from the glibc expressions. Now they are built
  using the gcc-cross-wrapper, and they were built with the direct gcc and
  binutils before this change.
- I think patchelf and strip don't break the cross-compiled binaries, so I
  reallow them on cross compilation.
- I disable the checkPhase on cross compilation. This made gmp and libtool
  fail when cross compiled, iirc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
2009-11-21 02:42:52 +00:00
Sander van der Burg f08928cfe6 Increased the heap size of the GWT compiler to 256 MiB
svn path=/nixpkgs/trunk/; revision=18481
2009-11-20 11:37:11 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 2c7fa189fb Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Nicolas Pierron 29384d43f2 * Update Go's version. Make 8g & 8l commands working with no need of
extra argument to locate the Go's libraries.

svn path=/nixpkgs/trunk/; revision=18376
2009-11-16 18:42:43 +00:00
Rob Vermaas ede5426070 name typo
svn path=/nixpkgs/trunk/; revision=18375
2009-11-16 13:57:11 +00:00
Rob Vermaas 30e6d32b33 update baseline for stratego related packages
svn path=/nixpkgs/trunk/; revision=18374
2009-11-16 13:21:12 +00:00
Lluís Batlle i Rossell 81f695899a I think I fixed the gcc builder for the usual stdenv, I broke in the commit
before.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18356
2009-11-15 17:48:10 +00:00
Lluís Batlle i Rossell 307cbd7b3b First attempt for the full stdenvCross. I think that it should work. The
toolchain for arm built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18355
2009-11-15 16:48:36 +00:00
Lluís Batlle i Rossell 9b977f5c60 Fixing many things related to the cross compilation in stdenvCross.
It still does not work, but I think I already get glibc cross compiled.
Next: gcc and g++, and set some setup script hooks on stdenvCross.

It took quite enough hours for this commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18351
2009-11-15 05:28:35 +00:00
Nicolas Pierron 66ef37d260 * Fix "cgo" binary be defining LC_ALL=C inside the binary.
svn path=/nixpkgs/trunk/; revision=18350
2009-11-14 23:39:53 +00:00
Nicolas Pierron a61a4bc4bc * Fix TimeZone in The Go Programming Language.
svn path=/nixpkgs/trunk/; revision=18349
2009-11-14 23:39:46 +00:00
Nicolas Pierron da1311b893 * Add the Go Programming Language compiler.
svn path=/nixpkgs/trunk/; revision=18348
2009-11-14 20:14:28 +00:00
Lluís Batlle i Rossell 2aba922d30 My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Marc Weber 173bdf6d2f fix ghc-get-packages
svn path=/nixpkgs/trunk/; revision=18331
2009-11-12 07:11:03 +00:00
Rob Vermaas a40d37b57b other location for tarball
svn path=/nixpkgs/trunk/; revision=18317
2009-11-10 13:58:22 +00:00
Rob Vermaas 0e1a687233 revert previous change
svn path=/nixpkgs/trunk/; revision=18314
2009-11-09 15:05:45 +00:00
Rob Vermaas 83c57ed434 trying to make static linking work on darwin
svn path=/nixpkgs/trunk/; revision=18313
2009-11-09 15:00:24 +00:00
Rob Vermaas 85ee8e90b7 make static sdf2bundle
svn path=/nixpkgs/trunk/; revision=18312
2009-11-09 14:43:01 +00:00
Rob Vermaas 0a56e71716 add static variant for sdf bundle
svn path=/nixpkgs/trunk/; revision=18306
2009-11-09 09:53:57 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin bc2ba3677b I think I rolled back to original sbcl-1.0.29 state
svn path=/nixpkgs/trunk/; revision=18223
2009-11-06 19:27:32 +00:00
Michael Raskin 1dce71822e Missed some added letters in SBCL version number..
svn path=/nixpkgs/trunk/; revision=18217
2009-11-06 18:36:16 +00:00
Michael Raskin 81f103f176 Roll back to 1.0.29
svn path=/nixpkgs/trunk/; revision=18197
2009-11-06 11:31:35 +00:00
Michael Raskin e78e88ffcf Blacklist more versions of SBCL?
svn path=/nixpkgs/trunk/; revision=18194
2009-11-06 11:23:06 +00:00
Michael Raskin fe775f8c71 Oops, forgot to use blacklist-enabled updater
svn path=/nixpkgs/trunk/; revision=18193
2009-11-06 10:57:42 +00:00
Michael Raskin 27e0421842 Fix SBCL URL..
svn path=/nixpkgs/trunk/; revision=18190
2009-11-06 10:28:46 +00:00
Michael Raskin 8334ad8b2a Roll back SBCL
svn path=/nixpkgs/trunk/; revision=18189
2009-11-06 10:13:00 +00:00
Michael Raskin 73933c7f9b Comment out gcl as broken
svn path=/nixpkgs/trunk/; revision=18188
2009-11-06 09:44:03 +00:00
Michael Raskin b50051494c goSrcDir unneeded for SBCL now
svn path=/nixpkgs/trunk/; revision=18183
2009-11-06 07:17:31 +00:00
Michael Raskin 0e608788c0 Update SBCL
svn path=/nixpkgs/trunk/; revision=18173
2009-11-05 23:30:23 +00:00
Michael Raskin 4d02c927e6 Fix ratpoison dependencies
svn path=/nixpkgs/trunk/; revision=18166
2009-11-05 21:53:37 +00:00
Ludovic Courtès 24c70760cd GCJ 4.4: Fix missing <X11/extensions/XInput.h> by adding `libXi'.
That header used to be provided by inputproto-1.4 but is no longer
provided by inputproto-2.0.

svn path=/nixpkgs/trunk/; revision=18164
2009-11-05 21:43:00 +00:00
Ludovic Courtès 0e02b4ccf9 GCC 4.4.2; new `update-gcc.sh' script.
svn path=/nixpkgs/trunk/; revision=18153
2009-11-05 18:46:52 +00:00
Eelco Dolstra f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00
Sander van der Burg d1eb60faef - Upgraded GWT to 1.7.1
- The JDK is now a runtime dependency of GWT
- Updated GWT-widgets library to 0.2.0


svn path=/nixpkgs/trunk/; revision=17882
2009-10-19 13:14:23 +00:00
Rob Vermaas a3902e186c * added -lgcc_s to NIX_LDFLAGS of mono
svn path=/nixpkgs/trunk/; revision=17875
2009-10-19 11:26:13 +00:00
Peter Simons 6b28b25453 ghc-6.10: fix build on Darwin
The initial MacOS X binaries have been linked to libgmp.dylib using some
mad path in /opt that's now hard-coded into the program. Consequently,
$DYLD_LIBRARY_PATH must contain the place where libgmp really is for
those binaries to run correctly. Tested on i386-apple-darwin9.7.0.

svn path=/nixpkgs/trunk/; revision=17873
2009-10-19 09:17:40 +00:00
Andres Löh 947c5029d7 Added ghc-6.12.1 release candidate.
svn path=/nixpkgs/trunk/; revision=17824
2009-10-15 12:49:37 +00:00
Eelco Dolstra f581d2a719 * Make all ocaml versions available in the proper way.
svn path=/nixpkgs/trunk/; revision=17805
2009-10-14 15:21:45 +00:00
Lluís Batlle i Rossell 507f7fb86e Updating sun java jdk. I expected some problems to be solved, but they work the same
way in this new version. But an update should not annoy.

svn path=/nixpkgs/trunk/; revision=17794
2009-10-13 21:45:20 +00:00
Sander van der Burg 9444b0f4a4 Increased the maximum heap size of GWT to prevent out of memory errors
svn path=/nixpkgs/trunk/; revision=17751
2009-10-12 10:42:36 +00:00
Sander van der Burg 49124816cc Upgraded GWT to 1.5.3
svn path=/nixpkgs/trunk/; revision=17698
2009-10-07 13:03:38 +00:00
Rob Vermaas 82447aa73e added openjdk for darwin (binaries) for testing
svn path=/nixpkgs/trunk/; revision=17596
2009-10-02 12:12:23 +00:00
Lennart Kats f20dc4d468 Bumped strategoxt baseline to bootstrapped pre20033 to fix absolute paths in ctrees.
svn path=/nixpkgs/trunk/; revision=17503
2009-09-29 14:15:40 +00:00
Lennart Kats d993292f2e Bumped strategoxt baseline to pre20033 to fix absolute paths in ctrees.
svn path=/nixpkgs/trunk/; revision=17498
2009-09-29 13:13:57 +00:00
Rob Vermaas 3c021b4a97 bumped version of java-front 0.9.1
svn path=/nixpkgs/trunk/; revision=17400
2009-09-24 14:28:25 +00:00
Rob Vermaas 32fad9e076 updated version of strategoxt-0.18pre
svn path=/nixpkgs/trunk/; revision=17399
2009-09-24 12:56:28 +00:00
Ludovic Courtès 03043bce33 ECJ: Merge the 2 expressions.
svn path=/nixpkgs/trunk/; revision=17354
2009-09-22 14:40:54 +00:00
Ludovic Courtès bf0f4deabb Add ECJ.
svn path=/nixpkgs/trunk/; revision=17352
2009-09-22 14:19:44 +00:00
Andres Löh ea843fa435 Added GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=17227
2009-09-17 11:45:20 +00:00
Ludovic Courtès ad14f6712c GCC 4.4: Restrict to GNU/Linux for now.
svn path=/nixpkgs/trunk/; revision=17203
2009-09-16 14:59:56 +00:00
Rob Vermaas 94642f08a6 update webdsl
svn path=/nixpkgs/trunk/; revision=17178
2009-09-16 09:34:36 +00:00
Rob Vermaas 0f02e39a6e added stratego 0.18 pre release
svn path=/nixpkgs/trunk/; revision=17157
2009-09-15 11:36:41 +00:00
Michael Raskin 9e58814536 Changing CLisp, FPC to new style of adding to hydra
svn path=/nixpkgs/trunk/; revision=16855
2009-08-25 09:00:19 +00:00
Michael Raskin 8e2daf1287 Account for strange naming in some SBCL tarballs
svn path=/nixpkgs/trunk/; revision=16636
2009-08-10 07:14:28 +00:00
Michael Raskin 41eba0d962 SBCL 1.0.30 fails to build even on CLisp 2.44.1
svn path=/nixpkgs/trunk/; revision=16634
2009-08-10 05:58:16 +00:00
Michael Raskin 19f4a84b09 Update SBCL
svn path=/nixpkgs/trunk/; revision=16630
2009-08-09 22:45:43 +00:00
Ludovic Courtès 69c23d6432 GCJ 4.4: Build with Antlr.
svn path=/nixpkgs/trunk/; revision=16522
2009-07-30 16:05:39 +00:00
Ludovic Courtès 89fa345b84 GCC 4.4: Make sure $PWD is not in $CPATH and $LIBRARY_PATH.
svn path=/nixpkgs/trunk/; revision=16520
2009-07-30 12:25:07 +00:00
Ludovic Courtès 33c6204f95 GCC 4.4: Don't expect zlib when `langJava' is false.
svn path=/nixpkgs/trunk/; revision=16518
2009-07-30 10:31:04 +00:00
Ludovic Courtès 0b46ac126b GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16516
2009-07-30 08:32:43 +00:00
Ludovic Courtès 2e8e54fbbc GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16513
2009-07-29 22:55:16 +00:00
Ludovic Courtès a2e9613540 GCJ 4.4: More X dependencies (soon it will be all over, well I hope soon).
svn path=/nixpkgs/trunk/; revision=16512
2009-07-29 20:47:12 +00:00
Ludovic Courtès 6e75b20d46 GCJ 4.4: More X dependencies (it's never enough).
svn path=/nixpkgs/trunk/; revision=16510
2009-07-29 19:33:45 +00:00
Ludovic Courtès cf229e4156 GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16503
2009-07-29 16:18:31 +00:00
Ludovic Courtès 9ddd85f356 GCJ 4.4: Add libXrender; work around glitches in the Java/AWT build system.
svn path=/nixpkgs/trunk/; revision=16502
2009-07-29 15:13:01 +00:00
Ludovic Courtès be4437bed0 GCJ 4.4: Provide xproto; move CPATH/LIBRARY_PATH compuation to `default.nix'.
svn path=/nixpkgs/trunk/; revision=16501
2009-07-29 13:57:11 +00:00
Ludovic Courtès 0b235f3ec5 GCJ 4.4: Tell GCC about the path to the X libs.
svn path=/nixpkgs/trunk/; revision=16500
2009-07-29 08:48:09 +00:00
Ludovic Courtès a63eefa27f GCJ 4.4: Require some more X libraries.
svn path=/nixpkgs/trunk/; revision=16493
2009-07-28 17:49:47 +00:00
Ludovic Courtès 992045830e GCJ 4.4: Require various X libraries.
svn path=/nixpkgs/trunk/; revision=16492
2009-07-28 12:02:51 +00:00
Ludovic Courtès 86ad964255 GCJ 4.4: Require libXtst.
svn path=/nixpkgs/trunk/; revision=16491
2009-07-28 10:29:18 +00:00
Ludovic Courtès a5a5cbe93d GCJ 4.4: Require libart.
svn path=/nixpkgs/trunk/; revision=16490
2009-07-28 09:23:40 +00:00
Ludovic Courtès 1228ff02b7 GCC 4.4: Improve `meta'.
svn path=/nixpkgs/trunk/; revision=16489
2009-07-28 08:44:41 +00:00
Ludovic Courtès f9f44ed564 GCJ 4.4: Build the GTK+ AWT peer.
svn path=/nixpkgs/trunk/; revision=16487
2009-07-28 08:11:10 +00:00
Ludovic Courtès 032c603c8b GCJ 4.4: Try to avoid FastJar since it appears to be broken.
svn path=/nixpkgs/trunk/; revision=16486
2009-07-27 23:09:04 +00:00
Marc Weber 58239ae82a ghc: add ghc-packages returning list of package databases so that you
can define GHC_PACKAGE_PATH=`ghc-packgaes` easily. Required for scion

svn path=/nixpkgs/trunk/; revision=16481
2009-07-27 16:05:44 +00:00
Marc Weber e932a5c6d6 jdk 1.5.0_19
svn path=/nixpkgs/trunk/; revision=16476
2009-07-27 16:05:20 +00:00
Ludovic Courtès 35b5686ad4 GCJ 4.4: Provide InfoZIP; remove FastJar hack; don't build C; provide which(1).
svn path=/nixpkgs/trunk/; revision=16475
2009-07-27 15:40:01 +00:00
Ludovic Courtès 7583ac7638 GCJ 4.4: Don't build the `configure-gcc' target; use FastJar; make zlib/BDW-GC visible.
Building the `configure-gcc' target early on (in `preConfigure') was a big mistake as
the build woud just go haywire after that (e.g., trying and failing to build `jvgenmain'
in stage 1).


svn path=/nixpkgs/trunk/; revision=16472
2009-07-27 13:50:19 +00:00
Ludovic Courtès 8feb395f42 GCJ 4.4: Depend on FastJar, needed during the bootstrap phase.
svn path=/nixpkgs/trunk/; revision=16470
2009-07-27 10:46:23 +00:00
Ludovic Courtès 292a191f70 GCC 4.4: Fewer $NIX_ variables.
svn path=/nixpkgs/trunk/; revision=16458
2009-07-24 21:56:58 +00:00
Ludovic Courtès fc6b794f33 GCC 4.4.1.
svn path=/nixpkgs/trunk/; revision=16454
2009-07-24 13:34:57 +00:00
Rob Vermaas b05906055a * gcc-apple fixes for darwin
svn path=/nixpkgs/trunk/; revision=16452
2009-07-24 12:28:39 +00:00
Rob Vermaas ab9eca5868 removed debug stuff
svn path=/nixpkgs/trunk/; revision=16444
2009-07-23 20:49:38 +00:00