Marco Maggesi
f2f1009d98
* Fix building of OCaml on Darwin. Gnu sed changed its behavior after version 4.2.1 (bug?), here we add a simple workaround
...
svn path=/nixpkgs/trunk/; revision=25330
2011-01-01 17:26:07 +00:00
Lluís Batlle i Rossell
b48b2a7bb4
Merging from trunk. I solved some trivial merge conflicts.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Marco Maggesi
86e19c4888
* Narrow ocaml platforms to linux and darwin
...
svn path=/nixpkgs/trunk/; revision=25062
2010-12-11 14:29:37 +00:00
Lluís Batlle i Rossell
ee04ffcb55
Updating from trunk. I resolved simple conflicts.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Marco Maggesi
9568a1bc80
* Enable hydra compilation for ocaml 3.11.1 (error in the previous commit)
...
svn path=/nixpkgs/trunk/; revision=25043
2010-12-09 15:44:05 +00:00
Lluís Batlle i Rossell
a95eb06e26
Updating the patch for ocaml on mips.
...
Reported by rixed@happyleptic.org
svn path=/nixpkgs/branches/stdenv-updates/; revision=24476
2010-10-25 21:13:05 +00:00
Lluís Batlle i Rossell
0c7429f8cc
My attempts to build mldonkey on the fuloong
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24034
2010-10-03 09:18:31 +00:00
Marco Maggesi
b508e9445b
Include directory for OCaml's C headers.
...
Make an include directory and symlinks ocaml's C header files into
that directory. By having an include directory it is automatically
propogated as to NIX_CFLAGS_COMPILE for anyone who uses ocaml as a
build input.
(Proposed on the mailing list by Russell O'Connor.)
svn path=/nixpkgs/trunk/; revision=23618
2010-09-03 13:48:35 +00:00
Eelco Dolstra
6609710409
* Get rid of many instances of "args: with args;", and other coding
...
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +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
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
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
Marc Weber
6bc07c8e68
fix my wrong opplication of the patch
...
svn path=/nixpkgs/trunk/; revision=16062
2009-06-26 17:00:02 +00:00
