about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/gcc-8' into staging-nextFrederik Rietdijk2019-09-08
|\ | | | | | | Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
| * Merge remote-tracking branch 'origin/master' into gcc-8Franz Pletz2019-09-03
| |\
| * | bap: build with llvm_8Franz Pletz2019-09-03
| | |
| * | ocamlPackages.llvm: build with llvm_8Franz Pletz2019-09-03
| | |
* | | Merge master into staging-nextFrederik Rietdijk2019-09-06
|\ \ \
| * | | ocamlPackages.ocaml_lwt: 4.1.0 -> 4.2.1Vincent Laporte2019-09-06
| | | | | | | | | | | | | | | | Ensures compatibility with OCaml 4.08
* | | | Merge branch 'master' into staging-nextJan Tojnar2019-09-06
|\| | | | | | | | | | | | | | | Fixed trivial conflicts caused by removing rec.
| * | | tree-wide: s/GTK+/GTK/gJan Tojnar2019-09-06
| | |/ | |/| | | | | | | GTK was renamed.
* | | Merge branch 'master' into staging-nextVladimír Čunát2019-09-04
|\| |
| * | ocamlPackages.ocplib-json-typed: 0.5 -> 0.7.1Vincent Laporte2019-09-03
| | |
* | | Merge branch 'master' into stagingVladimír Čunát2019-09-02
|\| |
| * | ocamlPackages.lablgtk: 2.18.6 -> 2.18.8Vincent Laporte2019-09-02
| | | | | | | | | | | | Ensures compatibility with OCaml 4.08.
* | | Merge staging-next into stagingFrederik Rietdijk2019-08-31
|\| |
| * | Merge master into staging-nextFrederik Rietdijk2019-08-31
| |\ \
| | * | ocamlPackages.cstruct: 3.1.1 -> 4.0.0Vincent Laporte2019-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | ocamlPackages.bigarray-compat: init at 1.0.0Vincent Laporte2019-08-31
| | | |
| | * | ocamlPackages.gmap: init at 0.3.0Vincent Laporte2019-08-31
| | | |
| | * | ocamlPackages.domain-name: init at 0.3.0Vincent Laporte2019-08-31
| | | |
| | * | ocamlPackages.batteries: 2.9.0 -> 2.10.0Vincent Laporte2019-08-29
| | | | | | | | | | | | | | | | Ensures compatibility with OCaml 4.08.
| | * | ocamlPackages.utop: 2.3.0 -> 2.4.1Vincent Laporte2019-08-28
| | | | | | | | | | | | | | | | | | | | | | | | ocamlPackages.zed: 1.6 -> 2.0.3 ocamlPackages.lambdaTerm: 1.13 -> 2.0.2
| | * | ocamlPackages.lambdaTerm: remove at 1.6Vincent Laporte2019-08-28
| | | |
* | | | treewide: remove redundant recvolth2019-08-28
| | | |
* | | | Merge staging-next into stagingFrederik Rietdijk2019-08-28
|\| | |
| * | | Merge master into staging-nextFrederik Rietdijk2019-08-27
| |\| |
| | * | ocamlPackages.mtime: 1.1.0 -> 1.2.0Vincent Laporte2019-08-26
| | |/
| | * ocamlPackages.ocurl: disable for ocaml<4.02Mario Rodas2019-08-25
| | |
| * | Merge branch 'master' into staging-nextVladimír Čunát2019-08-25
| |\| | | | | | | | | | | | | | | | | | | There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
| | * Merge pull request #67010 from r-ryantm/auto-update/ocurlMario Rodas2019-08-24
| | |\ | | | | | | | | ocamlPackages.ocurl: 0.8.1 -> 0.8.2
| | | * ocamlPackages.ocurl: 0.8.1 -> 0.8.2R. RyanTM2019-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge pull request #67007 from r-ryantm/auto-update/ocaml4.06.1-lwt_logMario Rodas2019-08-24
| | |\ \ | | | | | | | | | | ocamlPackages.lwt_log: 1.1.0 -> 1.1.1
| | | * | ocamlPackages.lwt_log: 1.1.0 -> 1.1.1R. RyanTM2019-08-19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge pull request #67361 from vbgl/ocaml-ppx_tools_versioned-5.2.3Samuel Leathers2019-08-24
| | |\ \ | | | | | | | | | | ocamlPackages.ppx_tools_versioned: 5.1 -> 5.2.3
| | | * | ocamlPackages.ppx_tools_versioned: 5.1 -> 5.2.3Vincent Laporte2019-08-23
| | | | | | | | | | | | | | | | | | | | Ensures compatibility with OCaml 4.08
| | | * | ocamlPackages.logs: disable for OCaml < 4.03Vincent Laporte2019-08-23
| | | | |
| | * | | Merge pull request #67322 from vbgl/ocaml-otr-0.3.6Samuel Leathers2019-08-24
| | |\ \ \ | | | | | | | | | | | | ocamlPackages.otr: 0.3.4 -> 0.3.6
| | | * | | ocamlPackages.otr: 0.3.4 -> 0.3.6Vincent Laporte2019-08-23
| | | | | |
| | * | | | Merge pull request #67324 from vbgl/ocaml-vg-0.9.3Samuel Leathers2019-08-23
| | |\ \ \ \ | | | |_|/ / | | |/| | | ocamlPackages.vg: 0.9.1 -> 0.9.3
| | | * | | ocamlPackages.vg: 0.9.1 -> 0.9.3Vincent Laporte2019-08-23
| | | |/ /
| * | | | Merge branch 'master' into staging-nextVladimír Čunát2019-08-24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | ocamlPackages.sedlex: 1.99.4 -> 1.99.5Vincent Laporte2019-08-23
| | |/ /
| | * | ocamlPackages.cohttp: 2.0.0 -> 2.1.3Vincent Laporte2019-08-21
| | | |
| | * | ocamlPackages.uri-sexp: init at 3.0.0Vincent Laporte2019-08-21
| | | |
| | * | ocamlPackages.charInfo_width: init at 1.1.0Vincent Laporte2019-08-21
| | | |
| | * | Merge pull request #67013 from r-ryantm/auto-update/ocaml4.06.1-ppxlibMarek Mahut2019-08-20
| | |\ \ | | | | | | | | | | ocamlPackages.ppxlib: 0.6.0 -> 0.8.1
| | | * | ocamlPackages.ppxlib: 0.6.0 -> 0.8.1R. RyanTM2019-08-19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge pull request #67015 from r-ryantm/auto-update/uuidmMarek Mahut2019-08-20
| | |\ \ | | | | | | | | | | ocamlPackages.uuidm: 0.9.6 -> 0.9.7
| | | * | ocamlPackages.uuidm: 0.9.6 -> 0.9.7R. RyanTM2019-08-19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge pull request #67008 from r-ryantm/auto-update/ocaml4.06.1-uriMarek Mahut2019-08-20
| | |\ \ | | | | | | | | | | ocamlPackages.uri: 2.2.0 -> 3.0.0
| | | * | ocamlPackages.uri: 2.2.0 -> 3.0.0R. RyanTM2019-08-19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge pull request #67021 from vbgl/ocaml-javalib-3.1.1Sarah Brofeldt2019-08-20
| | |\ \ | | | | | | | | | | ocamlPackages.javalib: 3.0 -> 3.1.1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-17 20:44:17 +0000