philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

720 commits

Author SHA1 Message Date
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
Rob Vermaas ded5f74bc4 svn path=/nixpkgs/trunk/; revision=16443 2009-07-23 19:32:53 +00:00
Rob Vermaas ac67112c3f * first try to fix darwin gcc +libstdcxx 
svn path=/nixpkgs/trunk/; revision=16441
 2009-07-23 19:13:34 +00:00
Ludovic Courtès 279a94a637 GCJ 4.4: Pass ecj.jar' using --with-ecj-jar'. 
svn path=/nixpkgs/trunk/; revision=16434
 2009-07-20 15:34:10 +00:00
Andres Löh 8c6bef0bb0 Version bump to ghc-6.10.4. 
svn path=/nixpkgs/trunk/; revision=16430
 2009-07-20 13:02:56 +00:00
Ludovic Courtès 34bd10567b GCC 4.4: Enable Graphite by building against PPL and GLooG. 
svn path=/nixpkgs/trunk/; revision=16424
 2009-07-18 21:37:23 +00:00
Ludovic Courtès 161c18b075 GCC 4.4: Use GCC documented variables instead of $NIX_EXTRA_CFLAGS and $NIX_EXTRA_LDFLAGS. 
svn path=/nixpkgs/trunk/; revision=16418
 2009-07-18 12:37:48 +00:00
Ludovic Courtès 8cbb8848a9 GCJ 4.4: Move ecj.jar' out of the src' attribute. 
svn path=/nixpkgs/trunk/; revision=16417
 2009-07-17 18:06:28 +00:00
Ludovic Courtès 1dfef78633 GCJ 4.4: Provide `ecj.jar' (Eclipse Java Compiler). 
svn path=/nixpkgs/trunk/; revision=16416
 2009-07-17 17:20:07 +00:00
Ludovic Courtès deb63071d7 GCC 4.4: Don't use the included Gettext. 
svn path=/nixpkgs/trunk/; revision=16415
 2009-07-17 16:14:28 +00:00
Marc Weber eccd5d5a41 ghc-get-packages.sh no array at all: roughly 20% faster 
svn path=/nixpkgs/trunk/; revision=16399
 2009-07-16 15:18:21 +00:00
Michael Raskin 81d09cd1f3 Use GTK2 for Lazarus and get Unicode support 
svn path=/nixpkgs/trunk/; revision=16363
 2009-07-14 20:31:11 +00:00
Michael Raskin cf03c27fb7 Update FPC and Lazarus 
svn path=/nixpkgs/trunk/; revision=16343
 2009-07-14 09:08:05 +00:00
Andres Löh 059b912b27 Efficiency fix for ghc-get-packages script. 
svn path=/nixpkgs/trunk/; revision=16326
 2009-07-10 19:36:50 +00:00
Peter Simons 356791ea62 The ghc binary distribution contains a 'pwd' binary that's broken on systems running a Red Hat kernel and causes the build to fail. To remedy that problem, we replace that binary with Nix's 'pwd' program before running configure. 
Unfortunately, the same problem occurs again with 'installPackage', so as of
now, GHC cannot be installed on Red Hat.

svn path=/nixpkgs/trunk/; revision=16314
 2009-07-10 12:26:18 +00:00
Rob Vermaas 22557d5e1f update mono to 2.4.2.1 
svn path=/nixpkgs/trunk/; revision=16311
 2009-07-10 11:49:32 +00:00
Rob Vermaas 471518d65b typo 
svn path=/nixpkgs/trunk/; revision=16302
 2009-07-10 08:40:04 +00:00
Rob Vermaas 297f0127aa java-front 0.9, compile with -O2 for cygwin 
svn path=/nixpkgs/trunk/; revision=16301
 2009-07-10 08:05:23 +00:00
Rob Vermaas 99afadc21f java-front 0.9 
svn path=/nixpkgs/trunk/; revision=16300
 2009-07-10 07:57:26 +00:00
Marc Weber 25a1533d9a removing old haskell stuff. I was using my own branch for a long time. 
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)

svn path=/nixpkgs/trunk/; revision=16298
 2009-07-09 22:24:08 +00:00
Rob Vermaas ccc059b201 * changed stacksize for sdf2-bundle on cygwin 
svn path=/nixpkgs/trunk/; revision=16277
 2009-07-09 14:15:36 +00:00
Michael Raskin dd89941fb2 Added myself as the maintainer of some packages 
svn path=/nixpkgs/trunk/; revision=16221
 2009-07-07 15:05:15 +00:00
Michael Raskin b02a08a022 SBCL now works fine. added hacks and workarounds for store mono-timestamp handling 
svn path=/nixpkgs/trunk/; revision=16219
 2009-07-07 14:50:37 +00:00
Rob Vermaas 0aeeaafa55 * going even further back for gcc darwin 
svn path=/nixpkgs/trunk/; revision=16189
 2009-07-06 12:00:06 +00:00
Rob Vermaas a30efafa57 * back to old gcc version for darwin, will make new version in different tree 
svn path=/nixpkgs/trunk/; revision=16182
 2009-07-06 07:39:38 +00:00
Ludovic Courtès 63393ce174 GCC 4.4.0: Fix compilation (for C and C++, at least). 
svn path=/nixpkgs/trunk/; revision=16177
 2009-07-05 14:15:44 +00:00
Ludovic Courtès 85d950b8fb Add GCC 4.4.0 (and hope for the best). 
svn path=/nixpkgs/trunk/; revision=16168
 2009-07-03 18:54:28 +00:00
Ludovic Courtès 5ed15d55ba GCJ 4.3: Fix the Java patch. 
svn path=/nixpkgs/trunk/; revision=16164
 2009-07-03 14:13:58 +00:00
Ludovic Courtès 5964e20243 GCJ 4.3: Try to incrementally fix things. 
svn path=/nixpkgs/trunk/; revision=16163
 2009-07-03 13:30:25 +00:00
Rob Vermaas 7d5a3a1933 * strategoxt-0.17 
svn path=/nixpkgs/trunk/; revision=16154
 2009-07-03 05:01:04 +00:00
Rob Vermaas d2419bccee * bumped gcc 4.2.1 build 5531 for apple again 
svn path=/nixpkgs/trunk/; revision=16092
 2009-06-30 09:24:53 +00:00
Marc Weber 6bc07c8e68 fix my wrong opplication of the patch 
svn path=/nixpkgs/trunk/; revision=16062
 2009-06-26 17:00:02 +00:00
Marc Weber f316832e3a update default ocmal to 3.11.1. patch provided by olegfink 
svn path=/nixpkgs/trunk/; revision=16061
 2009-06-26 16:53:02 +00:00
Rob Vermaas 1c3f49e06f * Changed version of gcc to 4.0.1 - 5484 on darwin 
* Added dsymutil to gcc wrapper env on darwin
 * turned off make check for gnugrep on darwin
 * added --enable-bsd=libs configure flag for gnugrep on darwin 


svn path=/nixpkgs/trunk/; revision=16014
 2009-06-21 18:37:54 +00:00
Rob Vermaas ee88032be9 * bumped gcc to 4.2.1 build 5531 on darwin 
svn path=/nixpkgs/trunk/; revision=15920
 2009-06-10 11:08:57 +00:00
Michael Raskin e9eea90443 Compile SBCL with sb-thread enabled.. 
svn path=/nixpkgs/trunk/; revision=15835
 2009-06-03 07:07:01 +00:00
Michael Raskin 526f6f63c7 Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version 
svn path=/nixpkgs/trunk/; revision=15806
 2009-05-31 06:07:25 +00:00
Andres Löh 2c096bf75f Fix the ghc-wrapper in order to enable runghc/runhaskell. 
svn path=/nixpkgs/trunk/; revision=15774
 2009-05-28 19:06:29 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Eelco Dolstra 6b611bc0f1 svn path=/nixpkgs/trunk/; revision=15605 2009-05-14 14:43:50 +00:00
Eelco Dolstra 120a82d7b9 * NASM: updated to the latest version. 
* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
 2009-05-14 14:42:20 +00:00
Andres Löh 677f91a6d1 Added Idris and updated fetchdarcs. 
svn path=/nixpkgs/trunk/; revision=15595
 2009-05-13 19:02:23 +00:00
Andres Löh 61a000b056 Added ghc-6.10.3. 
svn path=/nixpkgs/trunk/; revision=15541
 2009-05-10 21:04:58 +00:00
Michael Raskin 2a82c141ec An attempt to add gcj-4.3. It fails not finding some GC-related symbols. I failed to understand the reason - for now 
svn path=/nixpkgs/trunk/; revision=15523
 2009-05-10 09:11:41 +00:00
Marc Weber 75244dffaf update jdk because jdk-1.6.0_13 provides a mozilla plugin for x86_64 
svn path=/nixpkgs/trunk/; revision=15422
 2009-05-01 19:34:56 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back 
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
 2009-04-29 16:19:57 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
 2009-04-25 22:45:32 +00:00
Andres Löh 66f3af0bdd ghc-wrapper now detects installed pkgs automatically. 
svn path=/nixpkgs/trunk/; revision=15301
 2009-04-25 14:23:00 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Rob Vermaas a00ef2d247 updated strategoxt 0.17pre to bootstrap build 
svn path=/nixpkgs/trunk/; revision=15188
 2009-04-20 14:49:51 +00:00
Eelco Dolstra 35e42d3e5c * Fix missing description errors. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
 2009-04-19 16:00:46 +00:00
Eelco Dolstra 5cfba3ac68 * Added GHC 6.10.1. 
svn path=/nixpkgs/trunk/; revision=15147
 2009-04-19 11:43:38 +00:00
Eelco Dolstra 1c1967a9a1 * Call the wrapper "ghc-wrapper". 
svn path=/nixpkgs/trunk/; revision=15143
 2009-04-19 10:26:45 +00:00
Andres Löh 1643888f80 Added cabalized darcs-2 and associated Haskell libs. 
svn path=/nixpkgs/trunk/; revision=15141
 2009-04-19 10:07:41 +00:00
Eelco Dolstra ffcd38403e * Install the package config files under 
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
  $out/nix-support/ghc-package.conf.  This makes them visible in the
  user's profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
 2009-04-18 20:24:36 +00:00
Eelco Dolstra 4ce5419f17 * Remove bad backslashes. 
svn path=/nixpkgs/trunk/; revision=15134
 2009-04-18 20:22:47 +00:00
Eelco Dolstra ca8b45d441 * Cabal builder: put the GHC version in the default name attribute to 
disambiguate between package instances built with different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
 2009-04-18 16:21:59 +00:00
Eelco Dolstra baad5d7cb4 * GHC setup hook: don't generate wrappers around ghc etc., instead 
set GHC_PACKAGE_PATH.
* Let Cabal generate a package configuration file
  ($out/nix-support/ghc-package.conf) instead of a registration
  script.

svn path=/nixpkgs/trunk/; revision=15127
 2009-04-18 15:23:00 +00:00
Eelco Dolstra cee387e845 * Move the composition of Haskell packages out of all-packages.nix 
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
 2009-04-18 12:47:11 +00:00
Eelco Dolstra 95a472cd55 * Doh. 
svn path=/nixpkgs/trunk/; revision=15121
 2009-04-17 19:46:28 +00:00
Eelco Dolstra 6f2da398be * Revert to GHC 6.10.1 binary for bootstrapping GHC 6.10.2 at Andres' 
suggestion.  It's good to use an older GHC for bootstrapping because
  old versions can build newer versions but not vice versa.

svn path=/nixpkgs/trunk/; revision=15120
 2009-04-17 19:43:05 +00:00
Eelco Dolstra ad07109bba * Added GHC 6.10.2. 
svn path=/nixpkgs/trunk/; revision=15106
 2009-04-16 22:00:41 +00:00
Eelco Dolstra dae40d9c62 * GHC apparently works with Perl 5.10 now. 
svn path=/nixpkgs/trunk/; revision=15101
 2009-04-16 19:59:41 +00:00
Eelco Dolstra 902cf75ca6 * The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but 
the package.conf fixup is).

svn path=/nixpkgs/trunk/; revision=15100
 2009-04-16 19:48:11 +00:00
Eelco Dolstra 7bb9c71aee * Doh. 
svn path=/nixpkgs/trunk/; revision=15096
 2009-04-16 19:27:14 +00:00
Eelco Dolstra 79cb8d11a6 * editline: renamed to libedit (which seems to be the proper name for 
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
  (They *can* be used for other things than bootstrapping a GHC
  source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.

svn path=/nixpkgs/trunk/; revision=15095
 2009-04-16 19:25:22 +00:00
Eelco Dolstra d182df5526 * Disable the GHC setup hook. It's kind of annoying to have to 
rebuild all of GHC every time the setup hook changes.  Thus its
  better to factor it out.  (After all, the setup hook doesn't have to
  be provided by the GHC package proper; it can also be provided by
  some helper package.)

svn path=/nixpkgs/trunk/; revision=15094
 2009-04-16 18:38:41 +00:00
Eelco Dolstra 405f746280 * More GHC cleanup. 
svn path=/nixpkgs/trunk/; revision=15093
 2009-04-16 18:21:03 +00:00
Eelco Dolstra 27855da0d9 * Put all the GHCs in one directory. 
svn path=/nixpkgs/trunk/; revision=15092
 2009-04-16 18:12:59 +00:00
Eelco Dolstra 49e5575268 * Started cleaning up the GHC support. 
svn path=/nixpkgs/trunk/; revision=15091
 2009-04-16 18:08:09 +00:00
Lluís Batlle i Rossell 3569572ce4 Fixing the name of iasl. 
svn path=/nixpkgs/trunk/; revision=15072
 2009-04-16 07:19:31 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
 2009-04-15 13:25:01 +00:00
Sander van der Burg 96010823a7 Stole a patch from the cross-lfs project in order to compile dev86 on x86-64 linux 
svn path=/nixpkgs/trunk/; revision=15056
 2009-04-15 09:36:17 +00:00
Eelco Dolstra eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate 
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
 2009-04-09 15:24:33 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Rob Vermaas d4646914ce removed metaBuildEnvTrunk, not necessary any more 
svn path=/nixpkgs/trunk/; revision=14910
 2009-04-07 13:57:26 +00:00
Marc Weber c22abb7c2a adding open source adobe flex sdk 
svn path=/nixpkgs/trunk/; revision=14902
 2009-04-06 13:07:21 +00:00
Rob Vermaas bbeaa60535 meta-build-env prerelease 
svn path=/nixpkgs/trunk/; revision=14882
 2009-04-04 15:10:42 +00:00
Rob Vermaas 6a469ac20a meta-build-env 
svn path=/nixpkgs/trunk/; revision=14851
 2009-04-03 09:34:49 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
 2009-03-20 16:49:02 +00:00
Eelco Dolstra 84b78f7489 * Work around a bug in java-front. 
svn path=/nixpkgs/trunk/; revision=14620
 2009-03-19 17:34:59 +00:00
Eelco Dolstra bbf6b46178 * Updated WebDSL. 
svn path=/nixpkgs/trunk/; revision=14614
 2009-03-19 16:04:32 +00:00
Eelco Dolstra e0b48bbdec * Added javafront & dryad. 
svn path=/nixpkgs/trunk/; revision=14611
 2009-03-19 14:46:38 +00:00
Eelco Dolstra 5986a4d175 * More cleanup. Updated to the latest Stratego/XT 0.17. 
svn path=/nixpkgs/trunk/; revision=14610
 2009-03-19 14:34:16 +00:00
Eelco Dolstra 399ee394d4 * Cleaned up some Stratego-related stuff. 
svn path=/nixpkgs/trunk/; revision=14603
 2009-03-19 12:21:28 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Eelco Dolstra 2ae9a1c947 * Doh. 
svn path=/nixpkgs/trunk/; revision=14498
 2009-03-10 20:04:08 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs 
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
 2009-03-06 23:21:28 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Michael Raskin 9d06868cda Updated Lazarus 
svn path=/nixpkgs/trunk/; revision=14263
 2009-02-26 15:49:55 +00:00
Michael Raskin d6682c9514 Updated FPC. Patch partially by Felix Breuer 
svn path=/nixpkgs/trunk/; revision=14261
 2009-02-26 15:14:17 +00:00
Ludovic Courtès 4373d12cb4 Add GNU Prolog. 
svn path=/nixpkgs/trunk/; revision=14122
 2009-02-19 13:32:07 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
 2009-02-12 21:16:55 +00:00
Eelco Dolstra 599015e8b0 * Split lib/default.nix into several files, as it had become a big 
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
 2009-02-09 16:51:03 +00:00
Eelco Dolstra 37b9b420cb * Sync with trunk. Back to gtkLibs214. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
 2009-02-02 15:44:04 +00:00
Eelco Dolstra 79a039080c svn path=/nixpkgs/trunk/; revision=13951 2009-02-02 12:44:20 +00:00
Michael Raskin 9dcefd67ec Fix hash for JDK: was duplicate 
svn path=/nixpkgs/trunk/; revision=13950
 2009-02-02 12:42:00 +00:00
Marc Weber f47649b3db update jre/jdk to 1.6.0_11 cause _6 has known bugs (-> Eclipse FAQ) 
svn path=/nixpkgs/trunk/; revision=13924
 2009-01-31 22:03:18 +00:00
Eelco Dolstra c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Eelco Dolstra 112c86e719 * Typo in the URLs. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13891
 2009-01-28 13:44:44 +00:00
Eelco Dolstra cfda61c7c6 * GCC 4.3.3, just in time too :-) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13877
 2009-01-27 11:53:35 +00:00
Lluís Batlle i Rossell 6c2c6d7fe4 Fixing commits I did, which didn't follow well the writing rules. 
svn path=/nixpkgs/trunk/; revision=13868
 2009-01-25 21:03:07 +00:00
Lluís Batlle i Rossell fb1fd1115f Adding Intel ACPI Compiler (trying to build virtualbox) 
svn path=/nixpkgs/trunk/; revision=13845
 2009-01-25 14:31:42 +00:00
Lluís Batlle i Rossell e44ec52b45 Adding dev86 (I'll try to get virtualbox built) 
svn path=/nixpkgs/trunk/; revision=13844
 2009-01-25 14:31:24 +00:00
Andres Löh 8a1fb2e075 Updated URIs of old ghc-6.8.2. 
svn path=/nixpkgs/trunk/; revision=13802
 2009-01-18 14:04:34 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Ludovic Courtès 1ef61a2580 Bigloo 3.2a. 
svn path=/nixpkgs/trunk/; revision=13738
 2009-01-11 22:49:44 +00:00