jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,547 Commits 266 Branches 122 Tags 5.3 GiB
b97362989f
Commit Graph

78 Commits

Author SHA1 Message Date
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Maciek Starzyk
f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Vincent Laporte
3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Vincent Bernardoff
259bbdd5e4 Added OCaml release 4.02.0. 
Closes #4197
 2014-09-22 20:13:32 +01:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Vladimír Čunát
08f5932729 ocaml: refactor the useX11 check to actually work 2014-08-12 21:53:02 +02:00
Vladimír Čunát
141b5d961f Merge master into PR 
Conflicts:
	pkgs/development/compilers/ocaml/4.01.0.nix
 2014-08-12 21:52:20 +02:00
drozv
33fec9d04d ocaml: fix x11 include and lib parameters for configure script 
Close #2923, fixes #2922.
 2014-08-12 21:41:37 +02:00
Florent Becker
c59819311c Make x11 optionnal for ocaml 2014-07-21 11:27:09 +02:00
drozv
29d5629074 Fix x11 include and lib parameters for configure script. 2014-07-21 11:13:45 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
 2014-06-30 14:56:10 +02:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Malcolm Matalka
ab744d2053 Add Ocaml 4.01.0. 
Close #1065.
 2013-10-19 18:07:20 +03:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Marco Maggesi
e32567bcf7 OCaml 4.00.1 2012-10-09 14:03:12 -04:00
Lluis Batlle
839f124ba1 ocaml: native code building for ARM on 3.12 and 4.00 
I think it already works. I'll test more throughly tomorrow.
 2012-09-25 19:38:06 +02:00
Arie Middelkoop
5bc99bc883 Adds Ocaml 4.00.0 (first attempt) 
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
 2012-07-31 14:09:27 +02:00
Lluís Batlle i Rossell
c0832627c4 ocaml, unison: make them build on mips (native compilers) 
I switch off the build of ocaml compilers to native code, and add
a 'passthru' that unison can use to see if it needs to call the native
or the bytecode compiler.
 2012-07-27 22:43:40 +02:00
Marco Maggesi
cadc02cb2b Fix build of ocaml 3.12.1 on darwin 
svn path=/nixpkgs/trunk/; revision=34373
 2012-06-06 20:44:11 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Arie Middelkoop
797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker. 
svn path=/nixpkgs/trunk/; revision=33399
 2012-03-24 22:59:08 +00:00
Eelco Dolstra
0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
 2012-02-19 17:12:37 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Russell O'Connor
83452ba0ab adding two versions of metaocaml 
svn path=/nixpkgs/trunk/; revision=31026
 2011-12-21 21:51:35 +00:00
Marco Maggesi
9819d7b26a Update OCaml 3.12.0 to 3.12.1 
svn path=/nixpkgs/trunk/; revision=30923
 2011-12-16 08:11:19 +00:00
Marco Maggesi
a3b617c8e3 Add platforms to OCaml 3.12.0 
svn path=/nixpkgs/trunk/; revision=27298
 2011-05-24 18:05:05 +00:00
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
Marco Maggesi
7b49a49cbb * Enable hydra compilation for ocaml 3.11.1 
svn path=/nixpkgs/trunk/; revision=25042
 2010-12-09 15:41:14 +00:00
Marco Maggesi
114fa21c48 * Add ocaml 3.12.0 
svn path=/nixpkgs/trunk/; revision=25040
 2010-12-09 14:03:13 +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
86d8c5385e Adding a patch for ocaml I forgot (mips related) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24159
 2010-10-07 22:10:37 +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
1df4ff6aae Remove configure file for OCaml 3.09.1 which is not used anymore. 
svn path=/nixpkgs/trunk/; revision=23619
 2010-09-03 14:05:49 +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
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