Commit graph

871 commits

Author SHA1 Message Date
Ludovic Courtès 29ee6afbea GCC 4.5: Patch the right header file for pthread on GNU.
svn path=/nixpkgs/trunk/; revision=22593
2010-07-13 23:42:25 +00:00
Ludovic Courtès 83335bda50 GCC 4.5: Add `-L${libpthread}/lib' unconditionally on GNU.
svn path=/nixpkgs/trunk/; revision=22585
2010-07-13 18:06:17 +00:00
Ludovic Courtès 97ab4c05b2 GCC 4.5: Fix pthread support for GNU.
svn path=/nixpkgs/trunk/; revision=22583
2010-07-13 16:32:26 +00:00
Lluís Batlle i Rossell a8c5534849 Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
2010-07-10 08:45:44 +00:00
David Guibert 74b7818349 vala - Compiler for the GObject type system
svn path=/nixpkgs/trunk/; revision=22546
2010-07-09 13:15:40 +00:00
Michael Raskin 522d4f9d85 GCL at the ansi level
svn path=/nixpkgs/trunk/; revision=22541
2010-07-09 03:34:29 +00:00
Andres Löh eb2cb9afd4 Added ghc-6.12.3. Does not build yet for me -- still have to figure out why.
svn path=/nixpkgs/trunk/; revision=22525
2010-07-08 11:43:06 +00:00
Michael Raskin 40fb98d671 Fix a typo; thanks to viric for showing me my being silly.
svn path=/nixpkgs/trunk/; revision=22517
2010-07-07 20:19:48 +00:00
Michael Raskin c009e9d2f0 Assert the stdenv requirements of the expression for now
svn path=/nixpkgs/trunk/; revision=22516
2010-07-07 18:44:57 +00:00
Michael Raskin af34f7a80a Request a larger version
svn path=/nixpkgs/trunk/; revision=22500
2010-07-06 20:27:48 +00:00
Michael Raskin ce2f4992f1 Work around a gcl bug related to temporary directories - bug report sent upstream
svn path=/nixpkgs/trunk/; revision=22499
2010-07-06 19:59:10 +00:00
Michael Raskin 058ccd7714 Apparently fixed GCL build
svn path=/nixpkgs/trunk/; revision=22498
2010-07-06 16:48:03 +00:00
Lluís Batlle i Rossell cf30574d4e Quite fixing the path64 compiler. It builds programs in C even finding the libc header files.
Nevertheless, although all stages work, pathcc keeps on saying "INTERNAL ERROR happened",
but resultign binaries work fine.

It needs some upstream fixing - they have all too much hardcoded to /usr, for example.

svn path=/nixpkgs/trunk/; revision=22449
2010-07-04 11:10:58 +00:00
Lluís Batlle i Rossell 6aa4b636dc Adding a skeleton for the path64 compiler.
It builds, but it needs some reworks as running it lookes at /usr/bin/ld and things like that.
I leave that for another day.

svn path=/nixpkgs/trunk/; revision=22442
2010-07-02 21:44:31 +00:00
Peter Simons 70240d36ac Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
2010-06-23 14:35:18 +00:00
Marc Weber f3e7f0fdf0 reverting my patch series adding -j -l support for make
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
2010-06-19 15:52:28 +00:00
Lluís Batlle i Rossell da9e4402ee Pinta still does not build (xbuild pkgconfig problems), but mono and gtk-sharp-2 build fine.
svn path=/nixpkgs/trunk/; revision=22322
2010-06-18 08:16:21 +00:00
Ludovic Courtès c930debb54 GCC 4.5: Remove unnecessary `configure' flags.
The `--enable-lto' and `--enable-plugin' flags are automatically implied
when all their prerequisites are satisfied.  However, passing them
explicitly breaks cases where some of the prerequisites are not met,
such as static (`--without-headers') cross-compilers.

svn path=/nixpkgs/trunk/; revision=22316
2010-06-17 21:23:22 +00:00
Marc Weber 2dafd54743 opt-out some failing phases
svn path=/nixpkgs/branches/stdenv-updates/; revision=22285
2010-06-15 19:00:58 +00:00
Sander van der Burg cc6acb3e40 Added my very experimental Visual Studio build stuff. You should be even more brave to use this
svn path=/nixpkgs/trunk/; revision=22273
2010-06-15 11:32:19 +00:00
Marc Weber 02adc9484b adobe_flex_sdk, use - instead of _ in name
svn path=/nixpkgs/trunk/; revision=22269
2010-06-14 22:35:40 +00:00
Marc Weber 88d7d68c77 update Adobe Flex SDK
svn path=/nixpkgs/trunk/; revision=22260
2010-06-14 16:52:15 +00:00
Lluís Batlle i Rossell 86345919c2 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00
Lluís Batlle i Rossell 9eb2cf4906 I forgot the licenses for llvm. Here they are.
svn path=/nixpkgs/trunk/; revision=22241
2010-06-12 22:30:09 +00:00
Lluís Batlle i Rossell 8db2f399d1 Changing clang derivation name from llvm-2.7 to clang-2.7. Clearer, I think.
svn path=/nixpkgs/trunk/; revision=22240
2010-06-12 22:14:43 +00:00
Lluís Batlle i Rossell 6bc2fcd511 Fixing the nixpkgs tarball build
Fixing the clang fetchsvn hash. I don't know why it does not match that given by nix-prefetch-svn, but
I set that given by nix-build.

svn path=/nixpkgs/trunk/; revision=22239
2010-06-12 22:01:41 +00:00
Lluís Batlle i Rossell a4a34dd6e4 Moving dragonegg (gcc shared object plugin) into the llvm directory,
as I think it fits better there than in 'libraries'.

svn path=/nixpkgs/trunk/; revision=22238
2010-06-12 21:52:50 +00:00
Lluís Batlle i Rossell 684aa4b043 Removing llvm-gcc (gcc-4.2 only), because I think dragonegg outdates it (gcc-4.5.0 plugin).
svn path=/nixpkgs/trunk/; revision=22237
2010-06-12 21:52:45 +00:00
Lluís Batlle i Rossell 22a839c86d Making clang build for llvm 2.7
(I've not tested the usage of c++ headers though, but it builds c and c++ simple programs)

svn path=/nixpkgs/trunk/; revision=22236
2010-06-12 21:52:39 +00:00
Lluís Batlle i Rossell 1babf6ea14 Cleaning a bit what I commited about llvm, and making dragonegg build.
If passing to gcc4.5 the compile flag: "-fplugin=dragonegg.so" it will use the llvm optimizers and
code generators.

In that previous commit I enabled link time optimization and plugin support in gcc 4.5.0

svn path=/nixpkgs/trunk/; revision=22235
2010-06-12 20:54:35 +00:00
Lluís Batlle i Rossell e6ad625902 llvm update attempt + dragonegg
svn path=/nixpkgs/trunk/; revision=22234
2010-06-12 17:42:33 +00:00
Lluís Batlle i Rossell 22b3336161 I had also to disable the tests for 'net' in go for it to build in chroot.
(I thought I had chroots enabled in my computer - I did not, hence so much commits)

svn path=/nixpkgs/trunk/; revision=22232
2010-06-12 11:45:30 +00:00
Lluís Batlle i Rossell 2ba5bba371 Disabling the http tests on go (fail on hydra)
svn path=/nixpkgs/trunk/; revision=22231
2010-06-12 11:31:39 +00:00
Lluís Batlle i Rossell 0530f43655 Updating go, and making the go expression work in both i686-linux and x86_64-linux.
svn path=/nixpkgs/trunk/; revision=22230
2010-06-12 11:21:20 +00:00
Marc Weber 603fd4f206 HaXe and Neko update, C backend does work on NixOS
haxelib install hxcpp; Maybe export HXCPP_M64=1 then take off :)

svn path=/nixpkgs/trunk/; revision=22055
2010-05-29 18:26:45 +00:00
Michael Raskin 90c859d0c7 Add Gambit Scheme compiler
svn path=/nixpkgs/trunk/; revision=22026
2010-05-28 06:01:35 +00:00
Rob Vermaas 41aa02a8b4 inital try with jdk6 on cygwin
svn path=/nixpkgs/trunk/; revision=22000
2010-05-27 11:04:45 +00:00
Ludovic Courtès caf8fe39cf GCJ 4.5: Fix `java.home'.
svn path=/nixpkgs/trunk/; revision=21999
2010-05-27 10:23:42 +00:00
Ludovic Courtès 7132072986 GCJ 4.5: Fix value of the `java.home' property.
svn path=/nixpkgs/trunk/; revision=21988
2010-05-26 14:53:04 +00:00
Lluís Batlle i Rossell fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
2010-05-25 20:38:18 +00:00
Ludovic Courtès fc6b345f94 GCJ 4.5: Build with `--enable-java-home' & co.
svn path=/nixpkgs/trunk/; revision=21973
2010-05-25 19:38:13 +00:00
Ludovic Courtès 000c2c51fd GCC 4.5: Patch the spec string for GNU/Hurd to add the right `-I' flags.
svn path=/nixpkgs/trunk/; revision=21934
2010-05-21 13:46:46 +00:00
Ludovic Courtès 882ff5a41b GCC 4.5: Handle cross-glibc's propagated build inputs.
svn path=/nixpkgs/trunk/; revision=21907
2010-05-19 21:32:31 +00:00
Ludovic Courtès 63abc2ed86 GCC 4.5: Add support for a separate libpthread; rearrange target flags handling.
svn path=/nixpkgs/trunk/; revision=21905
2010-05-19 21:32:19 +00:00
Ludovic Courtès 91e3147622 GCC 4.5: Unset $CPATH and $LIBRARY_PATH if and only if they are empty.
svn path=/nixpkgs/trunk/; revision=21904
2010-05-19 21:31:49 +00:00
Ludovic Courtès aa26710b44 GCC 4.5: Add patch to fix GNU/Hurd builds.
svn path=/nixpkgs/trunk/; revision=21903
2010-05-19 21:31:21 +00:00
Lluís Batlle i Rossell 6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
2010-05-19 15:26:00 +00:00
Lluís Batlle i Rossell 4547dffb5d Fixing gcc-4.5 related to the patch for ultrasparc. The patch should not be
needed anymore

svn path=/nixpkgs/trunk/; revision=21633
2010-05-06 19:19:02 +00:00
Lluís Batlle i Rossell c548c084bb Making gcc-4.5 cross-build to mingw32 too (set by the proper config and libc = "msvcrt"
in the crossSystem)

svn path=/nixpkgs/trunk/; revision=21630
2010-05-06 18:22:51 +00:00
Ludovic Courtès 8da4605505 GCC 4.5: Remove redundant `--disable-multilib'.
svn path=/nixpkgs/trunk/; revision=21553
2010-05-02 09:27:39 +00:00
Lluís Batlle i Rossell 1ae5a63425 Fixing the yasm 'name'
svn path=/nixpkgs/trunk/; revision=21471
2010-04-30 22:25:25 +00:00
Lluís Batlle i Rossell 1215f3a7a4 Adding yasm, and making x264 and xvid codecs be compiled with their assembly code
svn path=/nixpkgs/trunk/; revision=21470
2010-04-30 21:58:47 +00:00
Lluís Batlle i Rossell fa6c22b5c6 Adding the expressions for gcc 4.5 for cross building.
Although I still have set gcc 4.4 for that, I tested with the 4.5 expression
and it cross built perfectly bison for the sheevaplug.

svn path=/nixpkgs/trunk/; revision=21463
2010-04-30 19:12:59 +00:00
Andres Löh b3224edee3 Updated the expression for EHC/UHC.
This is not yet properly tested, but it should be an improvement over
what was there before ...

svn path=/nixpkgs/trunk/; revision=21435
2010-04-29 17:35:09 +00:00
Andres Löh 7d2ae46bce Add missing binaries to the GHC wrapper.
svn path=/nixpkgs/trunk/; revision=21434
2010-04-29 17:35:05 +00:00
Ludovic Courtès 5929f9d3bd GCC 4.5.0.
svn path=/nixpkgs/trunk/; revision=21403
2010-04-28 12:37:11 +00:00
Ludovic Courtès 689914a5b2 update-gcc.sh: Add support for Ada.
svn path=/nixpkgs/trunk/; revision=21401
2010-04-28 12:37:02 +00:00
Andres Löh 8bf3f76256 Let GHC wrapper inherit meta from the wrapped expression.
svn path=/nixpkgs/trunk/; revision=21330
2010-04-26 20:39:51 +00:00
Andres Löh b48dfda990 Added ghc-6.12.2.
svn path=/nixpkgs/trunk/; revision=21303
2010-04-25 17:27:21 +00:00
Ludovic Courtès a89f709a91 GNU/MIT Scheme: Restrict to GNU/* and FreeBSD.
svn path=/nixpkgs/trunk/; revision=21302
2010-04-24 21:03:00 +00:00
Ludovic Courtès 805d99ffc7 Reverting "GNU/MIT Scheme: Attempt to fix Cygwin builds."
svn path=/nixpkgs/trunk/; revision=21301
2010-04-24 21:02:52 +00:00
Ludovic Courtès 4f9ffa5e59 GNU/MIT Scheme: Attempt to fix Cygwin builds.
svn path=/nixpkgs/trunk/; revision=21295
2010-04-24 16:02:08 +00:00
Ludovic Courtès 4fcbad8476 GNU/MIT Scheme: Build from the binary distributions when available.
svn path=/nixpkgs/trunk/; revision=21293
2010-04-24 11:09:53 +00:00
Andres Löh 776d8267c6 Added a couple of comments to ghc expression and myself as maintainer,
in preparation for adding ghc-6.12.2 ...

svn path=/nixpkgs/trunk/; revision=21268
2010-04-23 12:38:34 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +00:00
Sander van der Burg 3921737991 Upgraded jdk to 1.6.0_20
svn path=/nixpkgs/trunk/; revision=21180
2010-04-20 11:29:40 +00:00
Marc Weber b8fc0df586 updating HaXe and Neko
svn path=/nixpkgs/trunk/; revision=21150
2010-04-18 22:01:50 +00:00
Lluís Batlle i Rossell d6f653770b Updating the 'ecl' url (new version, and updated sourceforge url scheme)
svn path=/nixpkgs/trunk/; revision=21134
2010-04-16 17:35:26 +00:00
Ludovic Courtès 7f6b1e9abd GCC 4.4: Fix shared library support of sparc64-linux-gnu cross-compiler.
svn path=/nixpkgs/trunk/; revision=20975
2010-04-07 15:53:34 +00:00
Marc Weber 01b602c7f4 update Scala 2.7.7
patch provided by Francois Perrad
I readded license line

svn path=/nixpkgs/trunk/; revision=20861
2010-03-29 23:36:25 +00:00
Michael Raskin 96eba79858 Update SBCL
svn path=/nixpkgs/trunk/; revision=20750
2010-03-18 21:12:45 +00:00
Ludovic Courtès 6574a35e56 Add MIT/GNU Scheme.
svn path=/nixpkgs/trunk/; revision=20719
2010-03-17 15:32:12 +00:00
Ludovic Courtès d5c0333db8 Stalin: Add dependency on ncompress.
svn path=/nixpkgs/trunk/; revision=20713
2010-03-17 14:44:46 +00:00
Ludovic Courtès 9e16b812e0 Mono: Don't strip binaries.
svn path=/nixpkgs/trunk/; revision=20708
2010-03-17 13:56:40 +00:00
Ludovic Courtès 2dfbcfcc7c Stalin: Add maintainer.
svn path=/nixpkgs/trunk/; revision=20707
2010-03-17 13:56:36 +00:00
Lluís Batlle i Rossell 4824ecbb62 Trying to remove more hydra evaluation errors related to gcc.
svn path=/nixpkgs/trunk/; revision=20687
2010-03-17 10:17:32 +00:00
Marc Weber 19f0cd20fd HaXe: support nekotools boot - add haxelib
svn path=/nixpkgs/trunk/; revision=20674
2010-03-16 23:34:56 +00:00
Lluís Batlle i Rossell 9b1d5353a9 Making the gcc cross-compiler a bit more flexible.
svn path=/nixpkgs/trunk/; revision=20614
2010-03-14 14:05:08 +00:00
Lluís Batlle i Rossell f36f99e368 Making gcc cross-buildable, at least for glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20454
2010-03-06 21:41:01 +00:00
Ludovic Courtès 06944c9e13 Ikarus: Update URLs.
svn path=/nixpkgs/trunk/; revision=20316
2010-03-01 17:08:21 +00:00
Ludovic Courtès ee2eb5b98a Bigloo: Add meta.maintainers' and meta.platforms'.
svn path=/nixpkgs/trunk/; revision=20315
2010-03-01 17:08:16 +00:00
Rob Vermaas 9308f0465f set meta.platforms to get rid of hydra evaluation errors (assertions)
svn path=/nixpkgs/trunk/; revision=20300
2010-03-01 12:21:12 +00:00
Lluís Batlle i Rossell b1b7266aa3 After some testing with an ultrasparc cross-compiler:
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.

For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix   # The root nixpkgs default.nix
{
    crossSystem = {
        config = "sparc64-unknown-linux";
        bigEndian = true;
        arch = "sparc64";
        float = "soft";
        withTLS = true;
        cpu = "ultrasparc";
    };

    config = pkgs: {
      packageOverrides = pkgs : {
        platform = {
            name = "sparc64";
            kernelHeadersBaseConfig = "sparc64_defconfig";
            kernelBaseConfig = "sparc64_defconfig";
            kernelArch = "sparc";
            kernelAutoModules = false;
            kernelTarget = "zImage";
            uboot = null;
        };
      };
    };
}

Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004

svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Michael Raskin df0922aab7 Fix argument retrieval
svn path=/nixpkgs/trunk/; revision=20263
2010-02-26 07:14:11 +00:00
Michael Raskin 98c282d12b Make Unicode support optional
svn path=/nixpkgs/trunk/; revision=20261
2010-02-26 07:02:18 +00:00
Michael Raskin 5b4f9b1e56 Update ECL
svn path=/nixpkgs/trunk/; revision=20247
2010-02-25 12:54:46 +00:00
Michael Raskin 7ec7268649 Added Clozure CL
svn path=/nixpkgs/trunk/; revision=20211
2010-02-24 09:04:29 +00:00
Rob Vermaas 1ed9b2e7a4 update strategoxt 0.18pre version
svn path=/nixpkgs/trunk/; revision=20210
2010-02-24 08:50:59 +00:00
Michael Raskin 24614bdffe Manually fix ecl-config. Not that we really care what it says, but it should not give unsuable flag set
svn path=/nixpkgs/trunk/; revision=20203
2010-02-23 21:32:16 +00:00
Michael Raskin a3282d5e3e Nuke networking tests for SBCL
svn path=/nixpkgs/trunk/; revision=20074
2010-02-17 10:40:25 +00:00
Michael Raskin c8dd2f9891 Give up on /etc/passwd-requiring tests
svn path=/nixpkgs/trunk/; revision=20069
2010-02-17 08:24:02 +00:00
Michael Raskin 6a51d0465d Try updating SBCL
svn path=/nixpkgs/trunk/; revision=20066
2010-02-17 06:50:45 +00:00
Ludovic Courtès 471184bb38 GCC: Try to build on `i686-darwin'.
svn path=/nixpkgs/trunk/; revision=20004
2010-02-15 09:36:23 +00:00
Lluís Batlle i Rossell a21df5e172 I'll try to remove the hydra evaluation errors (throws) about ghc bootstrapping.
svn path=/nixpkgs/trunk/; revision=19981
2010-02-13 16:48:12 +00:00
Michael Raskin 357a19ec4e Add some configure options for ECL
svn path=/nixpkgs/trunk/; revision=19885
2010-02-09 13:54:29 +00:00
Eelco Dolstra d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra 631ea03875 * Fix / disable some packages that give evaluation errors in Hydra.
svn path=/nixpkgs/trunk/; revision=19833
2010-02-05 14:13:25 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Michael Raskin 0c13a20803 Update ECL
svn path=/nixpkgs/trunk/; revision=19725
2010-01-29 06:13:22 +00:00
Lluís Batlle i Rossell 64f0d74319 Fixing the gcc/gcc-wrapper so 'ghdl' gets the proper wrapper (langVhdl = true,
from gcc).


svn path=/nixpkgs/branches/stdenv-updates/; revision=19714
2010-01-27 16:29:11 +00:00
Lluís Batlle i Rossell b2fed75484 2nd attempt at fixing the gnat44 build
svn path=/nixpkgs/branches/stdenv-updates/; revision=19709
2010-01-27 13:43:23 +00:00
Lluís Batlle i Rossell c85ae25a34 Adapting the gcc-ada patch for gcc-4.4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19701
2010-01-27 08:30:56 +00:00
Lluís Batlle i Rossell 07cdd0fbb1 Updating gcc to 4.4.3
svn path=/nixpkgs/branches/stdenv-updates/; revision=19679
2010-01-26 16:25:30 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell 7ef8d2474b Fixing the cross-compiler build on i686-linux
svn path=/nixpkgs/branches/stdenv-updates/; revision=19626
2010-01-23 00:24:52 +00:00
Michael Raskin 99a54b362e Adding ECL
svn path=/nixpkgs/trunk/; revision=19555
2010-01-20 05:40:46 +00:00
Lluís Batlle i Rossell 5968b490d6 The fix in r19516 made evident an error in the gnatboot expression, about
library paths. Fixing this, to get gnat properly built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19531
2010-01-18 23:28:58 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell 1f86f426ef Fixing the ghdl patch for gcc 4.4 (I missed a part in my last commit)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19476
2010-01-15 23:31:05 +00:00
Lluís Batlle i Rossell 61be82ffd0 Updating the ghdl related expressions:
- Adding ghdl with gcc 4.4 (with a patch I built for it to work)
- Adding me as maintainer to both gccs and ghdl


svn path=/nixpkgs/branches/stdenv-updates/; revision=19475
2010-01-15 23:22:28 +00:00
Michael Raskin 36f6b1873d Also fix ppc* copying in source fpc builder
svn path=/nixpkgs/trunk/; revision=19462
2010-01-15 10:43:21 +00:00
Michael Raskin 164bb7e1d7 Copy ppc* independently of architecture
svn path=/nixpkgs/trunk/; revision=19461
2010-01-15 10:05:29 +00:00
Michael Raskin 25a0d5e5a0 FPC on x86-64 seems to need fpcmake invocation
svn path=/nixpkgs/trunk/; revision=19459
2010-01-15 09:37:03 +00:00
Lluís Batlle i Rossell aaa4eafcbf Moving most of the ghdl logic outside the middle of the gcc expression.
Agreed on a final naming logic for the ghdl package: ghdl-wrapper-0.29


svn path=/nixpkgs/branches/stdenv-updates/; revision=19450
2010-01-14 23:03:31 +00:00
Michael Raskin f573c32327 Make fpc binary builder more explicit and more verbose
svn path=/nixpkgs/trunk/; revision=19445
2010-01-14 20:35:04 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Michael Raskin 555eff3a08 Updating Lazarus
svn path=/nixpkgs/trunk/; revision=19422
2010-01-14 08:39:41 +00:00
Michael Raskin 8706bd4591 Update FPC
svn path=/nixpkgs/trunk/; revision=19420
2010-01-14 08:00:50 +00:00
Lluís Batlle i Rossell 33618e21c5 Updating ghdl to 0.29.
I feel impelled to write nicer expressions for it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19395
2010-01-13 13:50:32 +00:00
Marc Weber 2eb0633c5f fix ghc package versions
svn path=/nixpkgs/trunk/; revision=19367
2010-01-12 10:34:14 +00:00
Peter Simons ad0b6441f8 pkgs/development/compilers/ghc/ghc-get-packages.sh: append global "package.conf" to the list of package config files
The wrapper script for ghc-pkg changes the command's default behavior such that
global packages -- i.e. packages that are part of GHC itself -- are no longer
found:

  $ ghc-pkg describe base
  ghc-pkg: cannot find package base

This patch remedies the problem.

svn path=/nixpkgs/trunk/; revision=19256
2010-01-06 12:55:25 +00:00
Rob Vermaas a6fae68ca9 update strategoxt 0.18 to r20449
svn path=/nixpkgs/trunk/; revision=19233
2010-01-05 13:44:13 +00:00
Marc Weber c62430f6a6 ghc version bump to latest stable release 6.12.1
make cabal expression add etxra library paths only if they exist.
Adding myself as maintainer so that the buildfarm builds ghc.

svn path=/nixpkgs/trunk/; revision=19198
2010-01-04 07:44:32 +00:00
Marc Weber 568a6e56eb enable fcsh (Adobe Flex compiler shell) - result: faster (flex / as3) compilation using mxmlc
flex sdk version bump

svn path=/nixpkgs/trunk/; revision=19196
2010-01-04 07:44:27 +00:00
Andres Löh bc7ba3994c Added mozart system (compiles, but untested).
svn path=/nixpkgs/trunk/; revision=19146
2009-12-29 14:57:01 +00:00
Lluís Batlle i Rossell 7ee537f955 Getting a new gcc-wrapper on the way. After gnat-wrapper, I introduce
ghdl-wrapper.
I made the gcc-4.3.4 expression allow the 'vhdl' language through ghdl.
The ghdl developer recommends this gcc version; maybe it would work with
gcc-4.4. If not this ghdl version, maybe next versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19071
2009-12-21 23:02:06 +00:00
Lluís Batlle i Rossell 7ab9bff48a I forgot a gcc flag in the last commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19061
2009-12-21 07:49:59 +00:00
Lluís Batlle i Rossell fb82bac2fc Adding first built version of the gnat compiler for gcc 4.4.
Some things don't work:
- The ghdl expression (it still needs the gcc 4.3.4 src, ...)
- The gnat wrappers need to be more generic - now they work only for the
  given gnatboot (taken from gentoo) and gnats installed to their $out
  store path.
- Using the cloogppl and ppl. We will need our own gnatboot built with c++
  libraries for that.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19060
2009-12-21 07:49:31 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Marc Weber 78a1418e6d ghcs: provide list of core packages. Required by solver of thE haskell-nix-overlay
svn path=/nixpkgs/trunk/; revision=18896
2009-12-11 13:58:29 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Ludovic Courtès 164eb9c699 Typo.
svn path=/nixpkgs/trunk/; revision=18883
2009-12-10 21:39:02 +00:00
Ludovic Courtès 19d02b6ca4 ocaml: Add description.
svn path=/nixpkgs/trunk/; revision=18882
2009-12-10 21:27:19 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Marco Maggesi adbaa14548 Add expression for PolyML
svn path=/nixpkgs/trunk/; revision=18875
2009-12-10 13:16:06 +00:00
Peter Simons abebc10cf1 pkgs/development/compilers/swi-prolog/default.nix: updated to version 5.6.64 and enabled GUI support
svn path=/nixpkgs/trunk/; revision=18853
2009-12-09 14:07:09 +00:00
Lluís Batlle i Rossell 48bb7745e7 gcc 4.4.2 is also affected by the wrong CPP passed to the configure script of
the target libraries, as 4.3.4
I trigger the breaking build using uclibc, instead of glibc, and then the
mixture of CPP getting the build glibc headers, and CC getting the uclibc
headers, makes the problem evident.
In 4.3.4 it only affected libmudflap. In 4.4.2, it affects libmudflap and
libstdc++.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18850
2009-12-09 10:05:47 +00:00
Lluís Batlle i Rossell 916896e252 I took away the patch about the -Bxxx not being passed to target libraries
through libtool.
I found a make variable holding flags that will not be trimmed by libtool:
FLAGS_FOR_TARGET.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18846
2009-12-08 19:46:32 +00:00
Lluís Batlle i Rossell d0ae140f69 Renamed some old glibcCross to libcCross (we can use uclibc in cross builds already).
Dealt with the gcc 4.4 expression for it to work well for a native and a cross
compiler, adding a pair of patches to get the job done without much side
effects. One (libtool problems on -B) comes from the gcc 4.3 expression, while
the other fixes a bug already fixed in gcc 4.4.3.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18833
2009-12-08 09:36:19 +00:00
Rob Vermaas 86fa4600dc aspectj front for strategoxt 0.18
svn path=/nixpkgs/trunk/; revision=18831
2009-12-07 14:57:10 +00:00
Rob Vermaas 506c2f37c0 strategoshell based on strategoxt 0.18
svn path=/nixpkgs/trunk/; revision=18828
2009-12-07 14:19:23 +00:00
Lluís Batlle i Rossell 917760a425 Adding the patch for gcc-4.3 I should have commited in already two recent commit attempts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18814
2009-12-04 21:35:47 +00:00
Lluís Batlle i Rossell 9651069240 Adding a gcc patch I forgot to add in the proper commit, while it is already
referenced in the gcc 4.3 expression.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18813
2009-12-04 18:42:44 +00:00
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