Commit graph

1369 commits

Author SHA1 Message Date
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Vincent Laporte ff392e8190 ocamlPackages.ocplib-json-typed: 0.5 -> 0.7.1 2019-09-03 05:31:11 +00:00
Vladimír Čunát f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Vincent Laporte 8d70f49cbd ocamlPackages.lablgtk: 2.18.6 -> 2.18.8
Ensures compatibility with OCaml 4.08.
2019-09-02 16:19:24 +00:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Vincent Laporte 81760f3235 ocamlPackages.cstruct: 3.1.1 -> 4.0.0
ocamlPackages.cstruct-sexp: init at 4.0.0

ocamlPackages.x509: 0.6.1 -> 0.7.1

ocamlPackages.tls: 0.9.0 -> 0.10.4

jackline: 2018-05-11 -> 2019-08-08
2019-08-31 06:55:26 +00:00
Vincent Laporte 10ffd51a96 ocamlPackages.bigarray-compat: init at 1.0.0 2019-08-31 06:55:26 +00:00
Vincent Laporte e9edc7537a ocamlPackages.gmap: init at 0.3.0 2019-08-31 06:55:26 +00:00
Vincent Laporte d33df05f50 ocamlPackages.domain-name: init at 0.3.0 2019-08-31 06:55:26 +00:00
Vincent Laporte 3f63225309 ocamlPackages.batteries: 2.9.0 -> 2.10.0
Ensures compatibility with OCaml 4.08.
2019-08-29 05:42:43 +00:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vincent Laporte f7387ad383 ocamlPackages.utop: 2.3.0 -> 2.4.1
ocamlPackages.zed: 1.6 -> 2.0.3

ocamlPackages.lambdaTerm: 1.13 -> 2.0.2
2019-08-28 06:36:57 +00:00
Vincent Laporte a86fe43558 ocamlPackages.lambdaTerm: remove at 1.6 2019-08-28 06:36:57 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Vincent Laporte 46b630efa9 ocamlPackages.mtime: 1.1.0 -> 1.2.0 2019-08-26 19:20:03 +00:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Mario Rodas 02388c07bd
ocamlPackages.ocurl: disable for ocaml<4.02 2019-08-25 03:30:00 -05:00
Mario Rodas 6d78972db9
Merge pull request #67010 from r-ryantm/auto-update/ocurl
ocamlPackages.ocurl: 0.8.1 -> 0.8.2
2019-08-24 14:06:23 -05:00
Mario Rodas 2ff3586200
Merge pull request #67007 from r-ryantm/auto-update/ocaml4.06.1-lwt_log
ocamlPackages.lwt_log: 1.1.0 -> 1.1.1
2019-08-24 11:57:19 -05:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Samuel Leathers 4aa6cc3de1
Merge pull request #67361 from vbgl/ocaml-ppx_tools_versioned-5.2.3
ocamlPackages.ppx_tools_versioned: 5.1 -> 5.2.3
2019-08-24 00:58:38 -04:00
Samuel Leathers 93c70cf07e
Merge pull request #67322 from vbgl/ocaml-otr-0.3.6
ocamlPackages.otr: 0.3.4 -> 0.3.6
2019-08-24 00:08:59 -04:00
Samuel Leathers 765a71f150
Merge pull request #67324 from vbgl/ocaml-vg-0.9.3
ocamlPackages.vg: 0.9.1 -> 0.9.3
2019-08-23 23:57:55 -04:00
Vincent Laporte c21c1e8f3f
ocamlPackages.ppx_tools_versioned: 5.1 -> 5.2.3
Ensures compatibility with OCaml 4.08
2019-08-23 17:51:53 +00:00
Vincent Laporte 7cca325b07
ocamlPackages.logs: disable for OCaml < 4.03 2019-08-23 17:51:41 +00:00
Vincent Laporte c02aa1b575 ocamlPackages.sedlex: 1.99.4 -> 1.99.5 2019-08-23 15:48:47 +00:00
Vincent Laporte 4b1e33a312
ocamlPackages.vg: 0.9.1 -> 0.9.3 2019-08-23 05:56:38 +00:00
Vincent Laporte 162266b972
ocamlPackages.otr: 0.3.4 -> 0.3.6 2019-08-23 05:27:34 +00:00
Vincent Laporte e1d3ea6836
ocamlPackages.cohttp: 2.0.0 -> 2.1.3 2019-08-21 21:12:52 +00:00
Vincent Laporte 136f739184
ocamlPackages.uri-sexp: init at 3.0.0 2019-08-21 21:12:37 +00:00
Vincent Laporte 59cf0772c2 ocamlPackages.charInfo_width: init at 1.1.0 2019-08-21 05:07:46 +00:00
Marek Mahut 23e67a6a0c
Merge pull request #67013 from r-ryantm/auto-update/ocaml4.06.1-ppxlib
ocamlPackages.ppxlib: 0.6.0 -> 0.8.1
2019-08-20 21:03:11 +02:00
Marek Mahut 13df6fdee7
Merge pull request #67015 from r-ryantm/auto-update/uuidm
ocamlPackages.uuidm: 0.9.6 -> 0.9.7
2019-08-20 21:01:30 +02:00
Marek Mahut dd2034d2a3
Merge pull request #67008 from r-ryantm/auto-update/ocaml4.06.1-uri
ocamlPackages.uri: 2.2.0 -> 3.0.0
2019-08-20 20:14:43 +02:00
Sarah Brofeldt a14b47b2ad
Merge pull request #67021 from vbgl/ocaml-javalib-3.1.1
ocamlPackages.javalib: 3.0 -> 3.1.1
2019-08-20 14:22:10 +02:00
Vincent Laporte 4c571a1e76 ocamlPackages.ppx_deriving: 4.2.1 -> 4.4 2019-08-20 04:55:45 +00:00
Vincent Laporte 4759568c6b ocamlPackages.ppxfind: do not strip with OCaml 4.04 2019-08-20 04:55:45 +00:00
Vincent Laporte ff6c982e5e ocamlPackages.ppx_tools: init at 5.3 for OCaml 4.08 2019-08-20 04:55:45 +00:00
Vincent Laporte b53f0980fe
ocamlPackages.javalib: 3.0 -> 3.1.1 2019-08-20 04:46:14 +00:00
R. RyanTM f80422fc01 ocamlPackages.uuidm: 0.9.6 -> 0.9.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/uuidm/versions
2019-08-19 20:32:53 -07:00
R. RyanTM 63bf4a7f17 ocamlPackages.ppxlib: 0.6.0 -> 0.8.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-ppxlib/versions
2019-08-19 20:18:55 -07:00
R. RyanTM fe3ac41368 ocamlPackages.ocurl: 0.8.1 -> 0.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocurl/versions
2019-08-19 19:45:34 -07:00
R. RyanTM 485c88a311 ocamlPackages.uri: 2.2.0 -> 3.0.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-uri/versions
2019-08-19 19:10:20 -07:00
R. RyanTM 66cd7aa947 ocamlPackages.lwt_log: 1.1.0 -> 1.1.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-lwt_log/versions
2019-08-19 19:07:38 -07:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Vincent Laporte 7d4c8fb9f7
Merge pull request #66467 from vbgl/ocaml-ocsigen-start-1.8.0
ocsigen-start: 1.5.0 -> 1.8.0; ocsigen-toolkit: 2.0.0 -> 2.2.0
2019-08-18 09:24:39 +00:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00