Commit graph

254 commits

Author SHA1 Message Date
Vincent Laporte
9fc35ed766 Adds ocaml-safepass-1.3
OCaml-safepass is a library offering facilities for the safe storage of
user passwords. By "safe" we mean that passwords are salted and hashed
using the Bcrypt algorithm. Salting prevents rainbow-table based
attacks, whereas hashing by a very time-consuming algorithm such as
Bcrypt renders brute-force password cracking impractical.

Homepage: http://ocaml-safepass.forge.ocamlcore.org/
2014-12-29 15:15:04 +01:00
Vincent Laporte
2335ec0b40 Adds ocaml-uuseg
Uuseg is an OCaml library for segmenting Unicode text. It implements the
locale independent Unicode text segmentation algorithms to detect
grapheme cluster, word and sentence boundaries and the Unicode line
breaking algorithm to detect line break opportunities.

Homepage: http://erratique.ch/software/uuseg
2014-12-28 14:30:12 +01:00
Vincent Laporte
3ccd6509ad ocaml-uucp: update from 0.9.0 to 0.9.1 2014-12-27 09:17:09 +01:00
Domen Kožar
3cb1ce8577 ulex: set platforms
(cherry picked from commit 827a9bbd44)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 10:01:50 +01:00
Vincent Laporte
c99c8c3e43 dypgen: adds meta.platforms 2014-12-11 16:15:02 +01:00
Vincent Laporte
ef5c48326a Adds ocaml-fieldslib
This library defines a syntax extension for OCaml using Camlp4 that
can be used to define first class values representing record fields,
and additional routines, to get and set record fields, iterate and
fold over all fields of a record and create new record values.

Homepage: https://ocaml.janestreet.com/
2014-12-09 19:37:48 +01:00
Pascal Wittmann
f063a0a245 lablgl: place libs correctly 2014-11-29 14:21:16 +01:00
Vincent Laporte
0f4e9835d7 Adds ocaml-uucp
Uucp is an OCaml library providing efficient access to a selection of
character properties of the Unicode character database.

Homepage: http://erratique.ch/software/uucp
2014-11-27 06:53:43 +00:00
Vincent Laporte
9f82cc2684 ocaml-cil: update from 1.3.2 to 1.7.3 2014-11-22 22:51:04 +00:00
Vincent Laporte
f9432af1e2 ocaml-cmdliner: update from 0.9.5 to 0.9.6 2014-11-18 14:34:08 +00:00
Vincent Laporte
099d145590 Adds ocaml-camlpdf-1.7.2
OCaml library for reading, writing and modifying PDF files

Homepage: https://github.com/johnwhitington/camlpdf
2014-11-16 08:42:55 +00:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Vincent Laporte
9bfa208621 ocaml-sqlite3: update from 2.0.4 to 2.0.7 2014-11-11 20:08:37 +00:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vincent Laporte
83e376e4bb ocsigen-deriving: adds dependency to camlp4 2014-11-09 01:49:37 +00:00
Vincent Laporte
cac51e4e09 ocaml-optcomp: adds dependency to 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
f895d68c90 ocaml-http: update from 0.1.3 to 0.1.5 2014-11-08 07:26:03 +00:00
Vincent Laporte
2f38372f73 ocamlnet: update from 3.7.6 to 3.7.7 2014-11-08 07:19:40 +00:00
Vincent Laporte
fbbd88017f zarith: propagate build input gmp 2014-11-07 09:50:39 +00: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
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
Vincent Laporte
ca9097335d lablgtk: update from 2.18.2 to 2.18.3 2014-11-04 16:58:29 +00:00
Michael Raskin
c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom
ocsigen 2014-10
2014-11-04 12:41:59 +03:00
Vincent Laporte
e4655f0b45 ocaml-lwt: fixes build with OCaml 3.12 and 4.02 2014-11-03 21:55:35 +00:00
cillianderoiste
926cffa400 Merge pull request #4731 from jirkamarsik/vg
Added ocaml-vg-0.8.1 and deps ocaml-otfm-0.2.0 and ocaml-gg-0.9.0
2014-11-03 13:59:26 +01:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Vincent Laporte
c216448075 camlimages: update from 4.0.1 to 4.1.2
Previous version 4.0.1 is kept for OCaml 3.12
2014-11-01 08:37:40 +00:00
cillianderoiste
b73816d26b Merge pull request #4751 from jirkamarsik/ocaml-cairo2
Added ocaml-cairo2-0.4.6
2014-10-31 14:33:23 +01:00
Jirka Marsik
257f629c1e Added ocaml-cairo2-0.4.6 2014-10-31 14:14:17 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Jirka Marsik
d9f0e16883 Added ocaml-vg-0.8.1 2014-10-29 21:15:50 +01:00
Jirka Marsik
0832152742 ocaml-uutf as propagatedBuildInput of ocaml-otfm 2014-10-29 20:50:27 +01:00
Jirka Marsik
d48dd17c5e Added gg-0.9.0 2014-10-29 20:15:39 +01:00
Jirka Marsik
fc43239c56 Added ocaml-otfm-0.2.0 2014-10-29 19:35:23 +01:00
Jiri Marsik
50fccd0347 Added bolt-1.4 2014-10-28 14:03:14 +01:00
Jiri Marsik
c6fa8d0fd3 Added ansiterminal-0.6.5 2014-10-28 14:00:48 +01:00
Florent Becker
10eb4786fd Use propagatedBuildInputs in eliom 2014-10-19 18:48:40 +02:00
Florent Becker
8c9bbe00ac Use opam to actually install eliom 2014-10-19 18:47:18 +02: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
cfeb42b8eb Adapt the derivation for the update of eliom to 4.1 2014-10-15 11:14:34 +02:00
Florent Becker
407c762f18 Make uutf a *propagated*BuildInput of ocamlPackages.tyxml 2014-10-15 11:13:04 +02:00
Florent Becker
bd8ce96ccb Update eliom to 4.1.0 2014-10-14 13:18:08 +02:00
Florent Becker
cf5e915bde Updgrade ocsigen-server to 2.5 2014-10-14 13:14:57 +02:00
Florent Becker
e8b24eb63e update tyxml to version 3.3.0 2014-10-14 13:09:53 +02:00
Vincent Laporte
8320bbaaa3 ocaml-macaque: new package
MaCaQue (or macaque) is a DSL for SQL Queries in Caml.

Homepage: https://github.com/ocsigen/macaque
2014-10-11 00:54:35 +01:00
Vincent Laporte
33bba5f0b3 ocaml-pgocaml: new package
PG'OCaml provides an interface to PostgreSQL databases for OCaml
applications.

Homepage: http://pgocaml.forge.ocamlcore.org/
2014-10-11 00:49:50 +01:00
Vincent Laporte
cdf3dc2793 ocaml-reactivedata: new package
reactiveData is an OCaml module for functional reactive programming
(FRP) based on React.

Homepage: https://github.com/hhugo/reactiveData
2014-10-11 00:49:34 +01:00
Aristid Breitkreuz
26dd5dd6a4 Merge pull request #4460 from vbgl/zarith
zarith: update from 1.2.1 to 1.3
2014-10-10 22:51:08 +02:00
Vincent Laporte
977f172fee ocaml-lablgl: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte
35c92ec1ac ocaml-http: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte
7bfe6144c6 ocaml-data-notation: adds missing dependency to camlp4 2014-10-10 17:00:29 +01:00
Vincent Laporte
d99ea69225 zarith: update from 1.2.1 to 1.3 2014-10-10 14:47:33 +01:00
Aristid Breitkreuz
a01a64e5a4 Revert "ocamlPackages.twt: update from 0.93.2 to 0.931"
This reverts commit 684a9e22a1.
2014-10-08 20:44:22 +02:00
Vincent Laporte
59a184824f lablgtk: update 2.16.0 -> 2.18.2 2014-10-08 20:24:41 +02:00
Vincent Laporte
ef169ca69d camlimages: fixes the spelling of propagatedBuildInputs 2014-10-08 20:23:30 +02:00
Vincent Laporte
7fd487018c ocaml-lablgl: fixes the META file 2014-10-08 20:23:30 +02:00
Aristid Breitkreuz
684a9e22a1 ocamlPackages.twt: update from 0.93.2 to 0.931 2014-10-08 20:23:29 +02:00
Aristid Breitkreuz
e105c818c6 ocamlPackages.ocaml_ssl: update from 0.4.4 to 0.4.7 2014-10-08 20:23:29 +02:00
Aristid Breitkreuz
b9487dcd00 ocamlPackages.calendar: update from 2.03.2 to 2.5 2014-10-08 20:23:28 +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
7adab7e25e ocaml-tyxml: update 3.0.0 -> 3.1.1 2014-09-30 06:25:31 +02:00
Vincent Laporte
e9304fe039 ocaml-ipaddr: update 2.4.0 -> 2.5.0 2014-09-30 06:02:53 +02:00
Vincent Laporte
a97cf72a27 ocaml-sexplib: propagate the dependency to typeconv
And requires camlp4
2014-09-30 00:13:47 +02:00
Vincent Laporte
5e4cf92121 ocamlnet: update 3.7.3 -> 3.7.6
Closes #4216
2014-09-27 01:09:53 +01:00
Vincent Laporte
b9741719fa Fixes ocamlgraph (depends on camlp4) and prooftree (not ready for
OCaml4.02)
2014-09-23 20:48:50 +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
Mateusz Kowalczyk
3d0832dbc8 ocaml-cairo: inherit platforms 2014-09-23 06:24:34 +01:00
Mateusz Kowalczyk
a21d58515b ocaml-cairo: fix sha256
Seems that the original sha was just wrong but because Hydra doesn't
build this and we appear to have had no OCaml users until very recently,
no one noticed.
2014-09-23 06:23:14 +01:00
Florent Becker
8e4a1aebdd meta for ocamlPackages.eliom 2014-09-22 11:00:51 +02: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
Mateusz Kowalczyk
1e5452865b Merge pull request #4061 from vbgl/mezzo
Adds mezzo and its dependencies
2014-09-20 23:38:47 +01:00
roconnor
bbd58db13a Merge pull request #4133 from vbgl/coq-8-3
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
2014-09-20 16:24:10 -04:00
Vincent Laporte
40e79043b0 mkOcamlPackages: simpler rule for lablgtk 2014-09-20 18:53:43 +01:00
Vladimír Čunát
c1c8d561b1 fix evaluation (bogus licenses in ocaml-modules) 2014-09-20 10:34:47 +02: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
Michael Raskin
a87e5507c0 More specific Ocsigen license checked by FlorentBecker 2014-09-18 14:42:54 +04:00
Vincent Laporte
d67588a5f1 Fixes coq-8.3: requires OCaml 3.12 2014-09-17 23:52:27 +01:00
Vincent Laporte
cc387fa886 Adds ocaml-functory
Functory is a distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion. Further, it is
polymorphic, incorporates a robust fault-tolerant mechanism and is already being deployed in real-world applications.

Homepage: https://www.lri.fr/~filliatr/functory/
2014-09-13 12:26:07 +02:00
Vincent Laporte
ed72590004 Adds ocaml-pprint
Pprint is an OCaml adaptation of Wadler’s and Leijen’s prettier printer.

Homepage: http://gallium.inria.fr/~fpottier/pprint/
2014-09-13 12:26:07 +02:00
Vincent Laporte
2f0994010a Adds ocaml-fix
Fix is a simple OCaml module for computing the least solution of a system of monotone equations.

Homepage: http://gallium.inria.fr/~fpottier/fix/
2014-09-13 12:26:07 +02: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
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Aristid Breitkreuz
8f30cabb83 fix ocsigen expression 2014-09-06 12:45:20 +02:00
Michael Raskin
9a9ecbf32d A description cleanup after merge 2014-09-06 12:44:33 +04:00
Florent Becker
2709d32274 Add a derivation for eliom (ocaml web framework) 2014-09-06 12:44:33 +04:00
Florent Becker
e8250dd94a Add a derivation for the ocsigen server (ocaml webserver) 2014-09-06 12:44:33 +04:00
Florent Becker
da6859722d Add tyxml (XML library for ocaml) 2014-09-06 12:44:33 +04:00
Florent Becker
b5c621062d add ocaml-ipaddr 2014-09-06 12:44:32 +04:00
Florent Becker
ffe02360dc Add a derivation for deriving (ocaml instance derivation à la Haskell) 2014-09-06 12:44:32 +04:00
Florent Becker
6863dfeccc Add a derivation for ocaml-optcomp 2014-09-06 12:44:32 +04:00
Florent Becker
2ca3c23ddc Add a derivation for ocaml-calendar 2014-09-06 12:44:32 +04:00
Michael Raskin
316a4981b3 Merge pull request #3920 from vbgl/javalib-fix
ocaml-javalib, ocaml-sawja: removes wrong path to bash in configure scripts
2014-09-04 21:05:03 +04:00
Vincent Laporte
ebbd54e9f0 ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches 2014-09-03 21:59:29 +02:00
Vincent Laporte
b33b05a878 ocaml-twt: some fixes 2014-09-03 12:07:33 +02:00