cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
86758 commits 1 branch 0 tags 3.7 GiB
Commit graph

426 commits

Author SHA1 Message Date
Vincent Laporte
9a97c3c7ae ocaml-stringext: 1.3.0 -> 1.4.0 2015-07-01 20:23:19 +02:00
Vincent Laporte
dab57252b1 ocaml-qcheck: init at 0.4.0.1 2015-07-01 20:23:19 +02:00
Vincent Laporte
af7b23649a ocaml-re: 1.4.0 -> 1.4.1 2015-07-01 20:23:19 +02:00
Vincent Laporte
ee34bde5e5 ocaml-csv: 1.3.3 -> 1.4 2015-07-01 20:23:19 +02:00
Pascal Wittmann
512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
Matthew Maurer
a145a70f1a ocaml-bitstring: debug message removal 2015-06-28 21:12:10 +00:00
vbgl
742824bd78 Merge pull request #8291 from maurer/misc-ocaml 
Add miscellaneous OCaml Packages
 2015-06-27 18:52:03 +02:00
Matthew Maurer
9c0f1eefc6 piqi-ocaml: init at 0.7.4 2015-06-27 16:54:20 +00:00
Matthew Maurer
8c875e76f0 uuidm: init at 0.9.5 2015-06-27 16:54:20 +00:00
Matthew Maurer
289e2a10db ocaml-faillib: init at 111.17.00 2015-06-27 16:54:20 +00:00
Matthew Maurer
1d79d840b1 piqi: init at 0.6.12 2015-06-27 16:54:20 +00:00
Matthew Maurer
90a4de0f1b ocaml-bitstring: init at 2.0.4 and f1673f8 2015-06-27 16:54:10 +00:00
Vincent Laporte
e4d16dcc72 ocaml-io-page: 1.4.0 -> 1.5.1 2015-06-27 14:48:12 +02:00
Vincent Laporte
3105b66dbd lablgtk-2.14: fix build with OCaml-4.02 (needs camlp4) 2015-06-25 08:55:30 +02:00
Vincent Laporte
ca48e50946 bolt: fix build with OCaml 4.02 2015-06-25 08:55:29 +02:00
Vincent Laporte
8263cd2917 ocaml-mysql: fix build with OCaml-4.02 (needs camlp4) 2015-06-25 08:55:29 +02:00
Vincent Laporte
bce75f1d1a eliom: fix build with OCaml-4.02 2015-06-25 08:55:28 +02:00
Vincent Laporte
e63c1ea33e ocaml-ulex: fix build with OCaml-4.02 (depends on camlp4) 2015-06-25 08:55:28 +02:00
Vincent Laporte
8e7b1f2ac2 ocaml-herelib: works also with OCaml-4.0+ 2015-06-20 18:24:40 +02:00
Vincent Laporte
2205847614 ocaml-menhir: update from 20130116 to 20140422 2015-06-18 11:47:28 +02:00
Vincent Laporte
e32d6f6b52 ocaml-re: update from 1.3.1 to 1.4.0 2015-06-06 12:08:09 +02:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions 
fix: add missing versions
 2015-06-06 00:22:10 +03:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Vincent Laporte
b812e5f057 ocaml-uri: update from 1.7.2 to 1.9.0 2015-06-02 13:53:17 +02:00
Vincent Laporte
a36326d197 ocaml-asn1-combinators: update from 0.1.1 to 0.1.2 2015-06-02 13:53:17 +02:00
Vincent Laporte
b351009cca ocaml-hex: update from 0.1.0 to 0.2.0 2015-06-01 22:37:04 +02:00
Vincent Laporte
e361e700e1 ocaml-cstruct: assert minimal OCaml version (4.01) 2015-06-01 22:37:03 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Eric Merritt
c651e7ff61 ocaml-atdgen: add minimal version (1.6.0) to the system 2015-05-25 13:45:10 -07:00
Eric Merritt
7efe850b1d ocaml-atd: add initial version (1.1.2) to the system 2015-05-25 13:42:07 -07:00
Eric Merritt
27541f65f3 ocaml-async_find: add initial version (111.28.00) to the system 2015-05-25 10:16:44 -07:00
Eric Merritt
9c4bda2530 ocaml-async_shell: add initial version (109.28.03) to the system 2015-05-25 10:16:43 -07:00
Eric Merritt
96775f0402 ocaml-jingoo: add initial version (1.2.7) to the system 2015-05-25 10:16:43 -07:00
Eric Merritt
c7ba42a516 ocaml-core_extended: add initial version (112.24.00) to the system 2015-05-25 10:16:43 -07:00
Eric Merritt
da56bd3002 ocaml-textutils: add initial version (112.17.00) to the system 2015-05-25 10:16:42 -07:00
Eric Merritt
59b94c36f8 ocaml-re2: add initial version (112.06.00) to the system 2015-05-25 10:16:38 -07:00
Eric Merritt
b7ea979a75 ocaml-lwt: make sure libev propagates as a dependency 2015-05-24 12:33:24 -07:00
Eric Merritt
e0f3638fde ocaml-cohttp: add initial version (0.17.1) to the system 2015-05-24 12:33:23 -07:00
Eric Merritt
38cabebc8d ocaml-alcotest: add initial version (0.3.1) to the system 2015-05-24 12:33:21 -07:00
Eric Merritt
745bb72050 ocaml-conduit: add initial version (0.8.3) to the system 2015-05-24 12:33:20 -07:00
Eric Merritt
1c2fcf4115 ocaml-ipaddr: add version (2.6.1) to the system 2015-05-24 12:33:19 -07:00
Eric Merritt
ea41b6eec8 ocaml-cstruct: fix various build problems 2015-05-24 12:33:16 -07:00
Eric Merritt
09c6cc19f2 ocaml-async_ssl: add initial version (112.24.03) to the system 2015-05-24 12:33:14 -07:00
Eric Merritt
fbba3c1c33 ocaml-ctypes: add initial version (0.4.1) to the system 2015-05-24 12:33:13 -07:00
Eric Merritt
cd0836233a ocaml-async: add initial version (112.24.00) to the system 2015-05-24 12:33:13 -07:00
Eric Merritt
b20b270607 ocaml-async_extra: add initial version (112.24.00) to the system 2015-05-24 12:33:12 -07:00
Eric Merritt
6fe371a695 ocaml-async_unix: add initial version (112.24.00) to the system 2015-05-24 12:33:09 -07:00
Eric Merritt
a129ec1b9b ocaml-async_kernel: add initial version (112.24.00) to the system 2015-05-24 12:33:07 -07:00
Eric Merritt
ed2782db54 ocaml-core: add initial version (112.24.01) to the system 2015-05-24 12:33:03 -07:00
Eric Merritt
ee089a7f19 ocaml-core_kernel: add initial version (112.24.00) to the system 2015-05-24 12:32:58 -07:00
Eric Merritt
5dc0817b83 ocaml-variantslib: add initial version (109.15.03) to the system 2015-05-24 12:32:57 -07:00
Eric Merritt
e617429759 ocaml-typerep: add initial version (112.24.00) to the system 2015-05-24 12:32:56 -07:00
Eric Merritt
48c98e12d2 ocaml-pipebang: add initial version (110.01.00) to the system 2015-05-24 12:32:55 -07:00
Eric Merritt
74b9ccfe3f ocaml-pa_test: add initial version (112.24.00) to the system 2015-05-24 12:32:55 -07:00
Eric Merritt
6c2a3f35ea ocaml-pa_bench: add initial version (112.06.00) to the system 2015-05-24 12:32:54 -07:00
Eric Merritt
86e8c73d7b ocaml-herelib: add initial version (109.35.02) to the system 2015-05-24 12:32:54 -07:00
Eric Merritt
8a9d5637bc ocaml-custom_printf: add initial version (112.24.00) to the system 2015-05-24 12:32:53 -07:00
Eric Merritt
12c3b11bf4 ocaml-pa_ounit: add initial version (112.24.00) to the system 2015-05-24 12:32:52 -07:00
Eric Merritt
21fa39af2e ocaml-comparelib: add initial version (109.60.00) to the system 2015-05-24 12:32:52 -07:00
Eric Merritt
a88b7ed908 ocaml-bin_prot: add initial version (112.24.00) to the system 2015-05-24 12:32:51 -07:00
Eric Merritt
ea0d507935 sexplib: rename from ocaml_sexplib to sexplib 
There really isn't any need for it to be named ocaml_sexplib
 2015-05-24 12:32:50 -07:00
Eric Merritt
cac000d73a ocaml-sexplib: upgrade to 112.24.01 2015-05-24 12:32:46 -07: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
82e098fd93 ocaml-typeconv: upgrade to 112.01.01 2015-05-24 12:32:45 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Vincent Laporte
e64cd5feec Adds ocaml-magic-mime 
This OCaml library contains a database of MIME types that maps filename
extensions into MIME types suitable for use in many Internet protocols
such as HTTP or e-mail.

Homepage: https://github.com/mirage/ocaml-magic-mime
 2015-04-28 00:58:51 +02:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Vincent Laporte
0dcd94bf81 ocaml-pgocaml: update from 2.1 to 2.2 2015-04-10 17:45:37 +02:00
Vincent Laporte
8553d212c7 ocaml-stringext: update from 1.2.0 to 1.3.0 2015-04-06 10:14:48 +02:00
Vincent Laporte
5275d1e11e ounit: fix homepage URL 2015-04-02 15:45:13 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Vincent Laporte
71b04c5b3a ocaml-fileutils: also install the API documentation 2015-04-01 09:58:26 +02:00
Vincent Laporte
0f2509a52d ocaml-batteries: update from 2.2.0 to 2.3.1 2015-03-21 10:04:15 +01:00
Vincent Laporte
4c8681fea1 Adds ocaml-qtest-2.0.1 
Inline test extraction utility for OCaml, originally developed
internally for Batteries

Homepage: https://github.com/vincent-hugot/iTeML
 2015-03-21 10:04:14 +01:00
Vincent Laporte
20b150b26c Adds ocaml-dolog-1.0 
dolog is a minimalistic lazy logger in OCaml

Homepage: https://github.com/UnixJunkie/dolog
 2015-03-19 19:14:18 +01:00
Vincent Laporte
d52b6f1d3e ocaml-re: update from 1.3.0 to 1.3.1 2015-03-19 19:14:15 +01:00
vbgl
5dcedbb6e4 Merge pull request #6791 from romildo/xml-light 
Add ocaml-xml-light
 2015-03-13 22:52:58 +01:00
José Romildo Malaquias
7f07b33e4d Add ocaml-xml-light 2015-03-13 15:30:31 -03:00
Vincent Laporte
116ddda218 Adds ocaml-enumerate 
Quotation expanders for enumerating finite types in OCaml.
 2015-03-06 20:29:07 +01:00
Vincent Laporte
651a4c4e6e Adds ocaml-fileutils 
ocaml-fileutils is a library of pure OCaml functions to manipulate real
files and filenames.

Homepage: http://ocaml-fileutils.forge.ocamlcore.org/
 2015-03-04 13:15:53 +01:00
Vincent Laporte
c6d31ad722 Adds ocaml-base64 
Base64 encoding and decoding in OCaml

Homepage: https://github.com/mirage/ocaml-base64
 2015-03-03 17:10:49 +01:00
Vincent Laporte
7365907de5 Adds ocaml-io-page 
This OCaml library implements support for efficient handling of I/O
memory pages on Unix and Xen.

Homepage: https://github.com/mirage/io-page
 2015-03-02 11:26:03 +01:00
Vincent Laporte
d8912db092 ocsigen-deriving: update from 0.6.2 to 0.7 2015-03-01 17:53:51 +01:00
Vincent Laporte
f57163265b Adds ocaml-erm_xmpp 
OCaml based XMPP implementation

Homepage: https://github.com/ermine/xmpp
 2015-02-27 18:37:20 +01:00
Vincent Laporte
de3924a1a8 Adds ocaml-asn1-combinators 
An OCaml library of combinators for expressing ASN.1 grammars.

Homepage: https://github.com/mirleft/ocaml-asn1-combinators
 2015-02-26 08:35:05 +01:00
Vincent Laporte
176e38f6f2 Adds ocaml-cstruct 
Cstruct is a library and syntax extension to make it easier to access
C-like structures directly from OCaml. It supports both reading and
writing to these structures, and they are accessed via the Bigarray
module.

Homepage: https://github.com/mirage/ocaml-cstruct
 2015-02-23 09:57:31 +01:00
Vincent Laporte
49114dec1f Adds ocaml-ocplib-endian 
This OCaml library provides optimised functions to read and write
int16/32/64 from strings, bytes and bigarrays, based on primitives added
in version 4.01.

Homepage: https://github.com/OCamlPro/ocplib-endian
 2015-02-20 11:37:32 +01:00
Vincent Laporte
324324b024 Adds ocaml-erm_xml 
XML Parser for discrete data

Homepage: https://github.com/ermine/xml
 2015-02-18 22:21:53 +01:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
vbgl
0c4ac4b936 Merge pull request #6349 from gfxmonk/ounit2 
Update OUnit to version 2.0.0
 2015-02-16 15:15:04 +01:00
Vincent Laporte
9128cf6944 ocaml-lwt: update from 2.4.5 to 2.4.6 2015-02-16 13:31:13 +01:00
Tim Cuthbertson
65152acbae Update OUnit to version 2.0.0 
The existing URL looks like version 2.0.0, but actually
downloads the contents of ounit-1.2.0.tar.gz into a file named
ounit-2.0.0.tar.gz
 2015-02-15 14:44:35 +11:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Vincent Laporte
cbc58da3f0 ocaml-sqlite3: update from 2.0.8 to 2.0.9 2015-02-13 06:46:23 +01:00
Vincent Laporte
5cd15f8cc0 ocaml-cmdliner: update from 0.9.6 to 0.9.7 2015-02-11 17:51:38 +01:00
Vincent Laporte
1d137ebfdf ocaml-re: update from 1.2.2 to 1.3.0 2015-02-10 14:03:33 +01:00
Vincent Laporte
b73ce293fb ocaml-ezjsonm: update from 0.3.1 to 0.4.1 2015-02-10 14:03:32 +01:00
Vincent Laporte
8850692609 ocaml-sqlite3: update from 2.0.7 to 2.0.8 2015-02-10 14:03:32 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
Vincent Laporte
7ee3e777c3 ocaml-zed: update from 1.3 to 1.4 2015-02-02 15:43:42 +01:00
Vincent Laporte
0b9e2f8798 Adds ocaml-cpdf 
A range of tools to modify PDF files and a corresponding OCaml library

Homepage: http://www.coherentpdf.com/
 2015-01-30 20:04:42 +01:00
Vincent Laporte
a931de00b3 lambda-term: update from 1.6 to 1.8 2015-01-28 12:03:25 +01:00
Vincent Laporte
66e2f50416 cmdliner requires OCaml ≥ 4 2015-01-28 12:03:25 +01:00
Peter Simons
fc3dd0226d ocaml-ocurl: fix evaluation 2015-01-26 09:48:08 +01:00
Benno Fünfstück
be58ce4815 google-drive-ocamlfuse: new expression 2015-01-25 22:10:09 +01:00
Vincent Laporte
3532d658b5 Adds ocaml-ezjsonm 
An easy interface on top of the Jsonm library.

Homepage: https://github.com/mirage/ezjsonm
 2015-01-24 23:53:03 +01:00
Vincent Laporte
78f93c3de2 Adds ocaml-hex 
Mininal OCaml library providing hexadecimal converters.

Homepage: https://github.com/mirage/ocaml-hex
 2015-01-23 09:22:14 +01:00
Vincent Laporte
1df8208839 Adds ocaml-jsonm 
Jsonm is an OCaml non-blocking streaming codec to decode and encode the
JSON data format.

Homepage: http://erratique.ch/software/jsonm
 2015-01-20 18:02:51 +01:00
Vincent Laporte
547f11f015 tyxml: update from 3.3.0 to 3.4.0 2015-01-19 12:06:59 +01:00
Vincent Laporte
b094768e99 Adds ocaml-gtktop 
Gtktop is a small OCaml library to ease the creation of graphical
toplevels.

Homepage: http://zoggy.github.io/gtktop/
 2015-01-13 14:17:56 +01:00
Vincent Laporte
7169b87664 Adds ocaml-lablgtk-extras 
Lablgtk-extras is a collection of libraries and modules useful when
developing OCaml/LablGtk2 applications.

Homepage: http://gtk-extras.forge.ocamlcore.org/
 2015-01-13 11:14:28 +01:00
Vincent Laporte
81b57bb8ef Adds ocaml-config-file 
config-file is an OCaml library used to manage the configuration
file(s) of an application.

Homepage: http://config-file.forge.ocamlcore.org/
 2015-01-13 09:46:48 +01:00
Vincent Laporte
310623ad6c Addg ocaml-uri 
RFC3986 URI parsing library for OCaml

Homepage: https://github.com/mirage/ocaml-uri
 2015-01-09 10:28:36 +01:00
lethalman
174184ccc1 Merge pull request #5621 from prikhi/add-workrave 
Add Workrave, an RSI prevention app
 2015-01-08 14:41:29 +01:00
Vincent Laporte
b6f8d1f6d5 Adds ocaml-stringext 
Extra string functions for OCaml

Homepage: https://github.com/rgrinberg/stringext
 2015-01-08 11:23:19 +01:00
Vincent Laporte
4e382bce7e Adds ocaml-re 
Re is a regular expression library for OCaml.

Homepage: https://github.com/ocaml/ocaml-re
 2015-01-07 14:15:10 +01:00
Pavan Rikhi
5a228d4b4c ocaml lablgtkmathview: mark as broken 2015-01-07 02:15:26 -05:00
Vincent Laporte
8bc3314699 ocaml-lambda-term: adds dependency to camlp4 2015-01-06 11:05:30 +01:00
Vincent Laporte
502c545865 ocaml-camlpdf: update from 1.7.2 to 2.1.1 2014-12-31 15:48:39 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Vincent Laporte
a1822087e6 Adds ocaml-ojquery-0.1 
jQuery Binding for Eliom

Homepage: http://ocsigen.org/ojquery/
 2014-12-29 15:19:05 +01:00
Vincent Laporte
837b2abb2b Adds ocaml-magick-0.34 
This package aims to provide the ImageMagick methods to OCaml

Homepage: http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
 2014-12-29 15:15:04 +01:00
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 827a9bbd449ef5075876577ef30703f29f26e597)
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