mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 23:55:23 +00:00
Code Issues Wiki Activity
119356 commits 200 branches 125 tags 8.3 GiB
Commit graph

233 commits

Author SHA1 Message Date
Vincent Laporte 64674d24c3 utop: 1.17 -> 1.19.2 2016-06-06 19:13:18 +02:00
Florent Becker 527c1cba37 js_of_ocaml: 2.6 -> 2.7 2016-05-31 19:10:07 +02:00
Vincent Laporte ce147f9a0d cppo: 1.1.2 -> 1.3.2 2016-05-22 17:22:25 +02:00
vbgl 2c021bdbba ocaml-oasis: 0.4.5 -> 0.4.6 (#15209) 2016-05-04 19:12:20 +02:00
Vincent Laporte 3a6c85da65 camlp5: 6.14 -> 6.16 2016-05-01 16:10:10 +02:00
Nicolas B. Pierron 72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
vbgl b05708ba0e Merge pull request #12741 from regnat/ocamlUpdates 
ocamlPackages.findlib: 1.5.3 -> 1.6.1
 2016-02-24 12:00:25 +01:00
Valérian Galliat 2678f36884 Fix OMake source URL 
Current source is 404, moving to pkgs.fedoraproject.org mirror.

Should fix current aborted jobs on Hydra: http://hydra.nixos.org/eval/1237311#tabs-aborted
 2016-02-16 10:34:21 -05:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Théophane Hufschmitt 5b28d3f1eb ocamlPackages.findlib: 1.5.3 -> 1.6.1 2016-02-01 09:12:40 +01:00
vbgl c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42 
Eliom42
 2016-01-18 09:32:48 +01:00
Florent Becker a14c867d62 js_of_ocaml: Allow caml >= 4.02 to find camlp4 2016-01-08 16:06:00 +01:00
Benjamin Staffin 4a69e5ae85 omake: Fix broken download URL 
All the download links on http://omake.metaprl.org/ seem to be dead.
 2016-01-02 18:21:48 +01:00
Florent Becker 44931d4293 js_of_ocaml: 2.5 -> 2.6 2016-01-01 19:04:40 +01:00
Vincent Laporte 6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Vincent Laporte 7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00
Vincent Laporte 37d731790b ocp-index: requires OCaml >= 4 2015-10-14 19:27:33 +02:00
Vincent Laporte 92e2e18fbb ocaml-ocp-indent: 1.4.2b -> 1.5.2 2015-10-14 19:26:38 +02:00
Vincent Laporte 621b66c3df js_of_ocaml: fix for OCaml < 4.0 2015-10-14 19:25:58 +02:00
Vincent Laporte de84782ded ocaml-deriving: drop legacy package 2015-10-03 08:26:42 +02:00
Vincent Laporte 399a9da2ae camlp5: 6.12 -> 6.14 2015-09-23 19:05:02 +02:00
ts468 054be41e04 Revert "ocaml-modules: fix naming: "_" -> "-"" 2015-09-06 21:15:10 +02:00
Thomas Strobel 616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Samuel Rivas 37d0d8ac74 utop: 1.15 -> 1.17 
Version 1.18 doesn't compile cleanly currently, I need to debug what is going on
there
 2015-08-06 08:06:51 +02:00
Samuel Rivas d516f12dba camlp4: 4.02.0+1 -> 4.02+6 
* Remove unneeded substitution in postConfigure
   This was fixed here: 81ed5cf2e8

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
 2015-08-06 08:06:16 +02:00
Vincent Laporte 2663f24a48 ocp-index: 1.1.1 -> 1.1.2 2015-07-01 20:23:19 +02:00
Vincent Laporte 2727ecec37 js_of_ocaml: propagate camlp4 dependency 2015-06-25 08:55:30 +02:00
Eric Merritt dcffd28527 ocp-build: upgrade to 1.99.9-beta 
This also allows ocp-build to build for ocaml 4.02 and greater
 2015-06-14 13:33:18 -07:00
Vincent Laporte 142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
Eric Merritt 8751d1ea1a rename ocaml_typeconv to type_conv 
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
 2015-05-24 12:32:45 -07:00
Eric Merritt 56627d5444 ocaml-opam: the sha hash of 1.2.2 changed 
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
 2015-05-24 12:31:44 -07:00
Vincent Laporte 1c19f91dd7 opam: update from 1.2.1 to 1.2.2 2015-05-14 09:32:32 +02:00
Joachim Fasting bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Henry Till a5fb20d65a opam: update to 1.2.1 2015-03-22 16:33:15 -04:00
Vincent Laporte 07536bd1fe merlin: update from 2.1.1 to 2.1.2 2015-03-09 12:07:08 +01:00
Vincent Laporte f31d4b6adb Adds ocaml-top 
OCaml-Top is a simple cross-platform OCaml code editor built for
top-level evaluation.

Homepage: http://www.typerex.org/ocaml-top.html
 2015-02-16 13:31:13 +01:00
Vincent Laporte 3a17654b71 ocp-build: update source and website URLs 2015-02-12 06:59:28 +01:00
Vincent Laporte db75b5d052 merlin: update from 2.1 to 2.1.1 2015-01-29 08:43:15 +01:00
Vincent Laporte 54c8a82818 utop: wrap all installed programs 2015-01-29 08:43:15 +01:00
Vincent Laporte 8e77300cc1 Adds ocp-index 
ocp-index is a simple and light-weight documentation extractor for OCaml.

Homepage: http://typerex.ocamlpro.com/ocp-index.html
 2015-01-28 12:03:25 +01:00
Benno Fünfstück be58ce4815 google-drive-ocamlfuse: new expression 2015-01-25 22:10:09 +01:00
Vincent Laporte 763b2a7718 merlin: update from 2.0 to 2.1 2015-01-19 12:07:00 +01:00
Vincent Laporte 0a0b46a9b0 ocp-indent: fix installation 2015-01-14 10:22:35 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Vincent Laporte cb3f9bf160 omake: add meta.platforms 2014-12-11 09:19:30 +01:00
Vincent Laporte 54d206e5cc cppo: update from 1.0.1 to 1.1.2 2014-11-23 17:34:07 +00:00
Vincent Laporte 1be6e7c60f js_of_ocaml: propagate lwt dependency 2014-11-23 12:37:00 +00:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vincent Laporte ff86c33f1d Fixes camlp4 2014-11-09 01:49:37 +00: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 aa2fd47e9d Fixes ocamlscript 2014-11-08 14:28:38 +00:00
Vincent Laporte 3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Michael Raskin c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom 
ocsigen 2014-10
 2014-11-04 12:41:59 +03:00
Vincent Laporte be8209b93f ocaml-oasis: update from 0.4.4 to 0.4.5 2014-11-04 00:08:58 +00:00
Arseniy Seroka 0c7a0f31f9 Merge pull request #4810 from vbgl/merlin 
merlin: update from 1.7.1 to 2.0
 2014-11-03 20:04:10 +03:00
Henry Till 5f2e7c71a4 opam: update to 1.2.0 2014-11-03 11:55:33 -05:00
Vincent Laporte 68b959d655 merlin: update from 1.7.1 to 2.0 
Also adds an option to compile the emacs mode at install time.
 2014-11-03 13:41:46 +00:00
Vincent Laporte 16150e1f1e ocamlscript: new derivation 
Ocamlscript compiles scripts, i.e. one-file programs, into
natively-compiled binaries, and executes them.

Homepage: http://mjambon.com/ocamlscript.html
 2014-11-02 21:41:24 +00:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Vincent Laporte 58101991f7 cppo: update from 0.9.4 to 1.0.1 2014-10-29 17:43:05 +00:00
Jirka Marsik 0f1ada577c Added ocp-indent-1.4.2b 2014-10-28 18:09:42 +01:00
Jirka Marsik 0de41a6871 Added ocp-build-1.99.8-beta 2014-10-28 18:05:53 +01:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Florent Becker 91fe0ddc62 Build js_of_ocaml with tyxml support 2014-10-15 11:13:58 +02:00
Florent Becker bb2a9941e5 add version number to the name of the js_of_ocaml package 2014-10-14 13:10:08 +02:00
Florent Becker 9c441c41d7 update js_of_ocaml to 2.5 2014-10-14 13:05:53 +02:00
Vincent Laporte 4f0bc8e060 ocaml-oasis: adds missing dependency to caml4 2014-10-10 17:00:30 +01:00
Florent Becker e7f712e2a2 Update ocamlfind to version 1.5.3 2014-10-08 20:37:30 +02:00
Aristid Breitkreuz 3f2a64d132 ocamlPackages.utop: update from 1.14 to 1.15 2014-10-08 20:23:29 +02:00
Aristid Breitkreuz 7476b76d1d ocamlPackages.ocaml_oasis: update from 0.4.1 to 0.4.4 2014-10-08 20:23:29 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Vincent Laporte a6af1e96de Updates camlp5 6.11 -> 6.12 2014-10-01 00:44:15 +01:00
Vincent Laporte d274ee3f80 Adds camlp4 
Camlp4 is a software system for writing extensible parsers for
programming languages.

Camlp4 was part of the official OCaml distribution until its version
4.01.0.

Homepage: https://github.com/ocaml/camlp4
 2014-09-23 09:34:13 +01:00
Vincent Laporte 857c13e1af Minor modifications of some ocaml packages: 
adds myself as a maintainer
adds assertions to have evaluation errors rather than build errors
moves opam out of ocamlPackages, as it does not provide a library
 2014-09-21 11:02:55 +01:00
Domen Kožar 9cad5e755f Merge pull request #4170 from vbgl/ocaml-sexplib-camlp5 
Updates ocaml-sexplib and ocaml-typeconv
 2014-09-19 20:45:14 +02:00
Vincent Laporte 8febae5dfd Updates ocaml-sexplib and ocaml-typeconv 
Fixes OCaml / camlp5 version mismatch
 2014-09-19 19:09:37 +01:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging 
Hydra nixpkgs: ?compare=1151601
 2014-09-13 21:48:29 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Mateusz Kowalczyk 7e5d0ee0c3 s/dependancy/dependency/ 2014-09-10 00:28:49 +01:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00
Florent Becker 02a4e40474 Reexport ocaml data notation in the ocaml-oasis derivation 2014-09-06 12:44:33 +04:00
Florent Becker 3245b97000 Add a derivation for js_of_ocaml 2014-09-06 12:44:32 +04:00
Michael Raskin 4e3ee27060 Merge pull request #3681 from vbgl/merlin-1.7 
Merlin: update to 1.7
 2014-09-02 02:07:27 +04:00
Florent Becker d7b67d8cfa add utop (improved ocaml toplevel) 2014-08-30 19:37:15 +04: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
Vincent Laporte e2db82874c Updates merlin to 1.7.1 2014-08-22 14:56:33 +02:00
Vincent Laporte e8d2f8f109 merlin: update to 1.7 2014-08-19 18:43:41 +02:00
Eelco Dolstra e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Pascal Wittmann 0baac649aa Merge pull request #3188 from vbgl/merlin 
Adds merlin
 2014-08-01 13:39:27 +02:00
Vincent Laporte 81f258e7bf merlin: some cleaning of the derivation 2014-08-01 09:42:37 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vincent Laporte f16124d521 Adds merlin 
Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
 2014-07-05 17:33:55 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Vincent Laporte e7df430d91 Adds cppo 2014-06-25 10:25:14 +02:00
Vincent Bernardoff ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
Shea Levy 80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs 
Ocaml oasis
 2014-03-15 13:14:14 -04:00
Malcolm Matalka 83c5d12d4c Add opam 1.1.1 2014-02-22 19:08:54 +01:00
Marco Maggesi f3a49abf08 Add OCaml Oasis 
OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
 2014-01-31 12:01:32 +01:00
Marco Maggesi 389da8b64c Update camlp5 to version 6.11 2014-01-18 20:56:44 +00:00
Marco Maggesi cf6ac40585 Update OCaml findlib to version 1.4 2014-01-18 20:56:44 +00:00
Moritz Ulrich e87515e519 Opam 1.1: Constrain supported ocaml versions. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-25 14:43:23 +01:00
Malcolm Matalka 545216ee02 Opam: Update to 1.1.0 
Also keeps 1.0 for backwards compatibility.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-25 14:18:28 +01:00
Evgeny Egorochkin f5f76e6446 ocamlPackages.deriving: fix version 2013-06-19 03:20:00 +03:00
Marc Weber d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Christophe Raffalli 356983074e Forgotten to add wanr.patch for omake. 2013-06-07 21:58:19 +02:00
Christophe Raffalli 87e1089498 Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1. 
This is necessary to compile the latest camlimages
 2013-06-07 21:40:37 +02:00
Malcolm Matalka 27e2fb6895 Upgrade to 1.0.0 2013-03-15 12:41:01 +01:00
Shea Levy b634efe63c ocamlPackages.opam: Fix indentation 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:12:56 -05:00
orbitz 55be059467 Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me 2013-03-08 22:59:54 +01:00
orbitz 98a6759bc7 Delete 0.9.4 2013-03-08 22:48:58 +01:00
orbitz fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
orbitz 6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +01:00
Malcolm Matalka 5ff6be9224 Support installing findlib 2012-11-16 11:43:43 +01:00
Malcolm Matalka 6299baeb88 Support installing topfind now 2012-11-16 11:43:32 +01:00
Marco Maggesi 2221bf0593 Update camlp5 to 6.06. 2012-10-09 14:03:12 -04: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
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
Marco Maggesi 82fabd6262 Update ocaml-findlib to version 1.2.7 
svn path=/nixpkgs/trunk/; revision=30925
 2011-12-16 09:22:31 +00:00
Marco Maggesi 8d4b5bcd0c Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor). 
Keep the old version 5.15 to allow a smooth migration.


svn path=/nixpkgs/trunk/; revision=30575
 2011-11-26 19:39:14 +00:00
Russell O'Connor 8c40562197 New package for CamlIDL 1.05 
svn path=/nixpkgs/trunk/; revision=29619
 2011-10-04 01:40:45 +00:00
Marco Maggesi 51d6c8df91 * Handle variable createFindlibDestdir correctly in ocaml-findlib 
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
 2010-12-23 19:28:06 +00:00
Marco Maggesi eb33e01ac7 * Add variable createFindlibDestdir to the setupHook of findlib 
* Set createFindlibDestdir to various ocaml packages.

svn path=/nixpkgs/trunk/; revision=25220
 2010-12-21 09:37:35 +00:00
Marco Maggesi 2c85e4b96f * Remove the automatic creation of a directory from the setupHook of findlib since this can silently produce empty paths in derivations 
svn path=/nixpkgs/trunk/; revision=25219
 2010-12-21 08:33:37 +00:00
Marco Maggesi e7accaf8d3 * Update camlp5 
svn path=/nixpkgs/trunk/; revision=25206
 2010-12-20 10:32:22 +00:00
Marco Maggesi d3f00b9cf5 * Add findlib to hydra 
svn path=/nixpkgs/trunk/; revision=25205
 2010-12-20 09:53:41 +00:00
Marco Maggesi ac457478e3 * Add ocaml packages findlib, camlzip, ocaml-ssl, ocaml-batteries, menhir, camomile, ocaml-lwt, cryptokit, ocaml-cryptgps, ounit, ocaml-react 
svn path=/nixpkgs/trunk/; revision=25041
 2010-12-09 15:40:04 +00:00
David Guibert b0859969a5 omake: version 0.9.8.5 
svn path=/nixpkgs/trunk/; revision=22019
 2010-05-27 19:44:03 +00:00
Marco Maggesi a0207b3dc7 Updated Coq to version 8.2pl1 
svn path=/nixpkgs/trunk/; revision=18069
 2009-11-02 11:44:27 +00:00
Marco Maggesi c4533b8d24 Added camlp5 the preprocessor-pretty-printer for OCaml 
svn path=/nixpkgs/trunk/; revision=18068
 2009-11-02 10:47:24 +00:00