3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2355 commits

Author SHA1 Message Date
Vincent Laporte 1b21d00de8
ocamlPackages.spacetime_lib: use Dune 2 2021-03-30 08:32:05 +02:00
Vincent Laporte 25a75128d3
ocamlPackages.spelll: use Dune 2 2021-03-29 22:05:45 +02:00
Vincent Laporte 768bbabf0c
ocamlPackages.cpuid: use Dune 2 2021-03-28 22:29:40 +02:00
Vincent Laporte 43846a5834
ocamlPackages.wtf8: use Dune 2 2021-03-28 22:05:32 +02:00
Vincent Laporte cf86741d99
ocamlPackages.ocaml-version: use Dune 2 2021-03-28 17:47:05 +02:00
sternenseemann b2eb2c8b4f Revert "ocamlPackages.tcpip: 6.0.0 -> 6.1.0"
This reverts commit 988f5a5910.

The release process for many OCaml packages and in extension mirage
related packages usually entails creating a release in the respective
own repository so a release tarball becomes available and then opening a
PR against ocaml/opam-repository to finalize the release. During this
new issues can be discovered which push the release back.

This happened for mirage-tcpip 6.1.0 several times:
https://github.com/ocaml/opam-repository/pull/18357
Prompting in total 3 different 6.1.0 releases with different hashes
respectively (the hash for ocamlPackages.tcpip.src shouldn't be
reproducible anymore, but we probably have cached the tarball already).
Ultimately the PR to opam-repository was closed to investigate some
failures on opam-repository's CI and the release postponed:
https://github.com/ocaml/opam-repository/pull/18357#issuecomment-808434285

I jumped the gun with the release and updated tcpip in nixpkgs before
tcpip was “properly” released in opam. I usually watch the github
repository of package I maintain for releases and can react pretty
quickly to a release as a result. Most of the time I also check
opam-repository's PRs nowadays for extra context or information, but
when everything seems fine and tests succeed I deem the update alright
to PR to nixpkgs. Being faster than opam was achievable in these cases
and actually seems kind of tantalizing.

In the light of this experience however, we should wait for the opam
PR getting merged at least for some packages that exhibit this behavior
of rereleasing the same version number multiple times to get the release
just right (afaik the 6.1.0 tag pointed to three different revisions for
tcpip). To me this is questionable upstream behavior we just have to deal
with in some way.
2021-03-27 14:33:49 +01:00
sternenseemann 13a8519b4b ocamlPackages.ocaml-freestanding: init at 0.6.4
Contains vendored in patches from https://github.com/mirage/ocaml-freestanding/pull/93
to make building within nixpkgs simpler. These serve as a makeshift
solution until ocaml-freestanding is released with its overhauled dune
based build system which will also support cross compiling. Upstream has
indicated that they are interested in making it work well with nix as
well.
2021-03-26 12:24:42 +01:00
sternenseemann cf83099225 ocamlPackages.js_of_ocaml: 3.8.0 -> 3.9.1
Apply patch from eliom's master to fix build with the new js_of_ocaml
version.
2021-03-26 08:43:14 +01:00
sternenseemann 6aac9b563f ocamlPackages.git: 3.3.2 -> 3.3.3
Fixes a stack-overflow for very large trees.

https://github.com/mirage/ocaml-git/releases/tag/3.3.3
2021-03-25 20:04:23 +01:00
Vincent Laporte 92a1b57bb1 ocamlPackages.ppxlib: default to 0.22.0
ocamlPackages.base_quickcheck 0.14.0 → 0.14.1

ocamlPackages.ppx_custom_printf: 0.14.0 → 0.14.1

ocamlPackages.ppx_expect: 0.14.0 → 0.14.1

ocamlPackages.ppx_optcomp: 0.14.0 → 0.14.1

ocamlPackages.ppx_sexp_conv: 0.14.1 → 0.14.3

ocamlPackages.ppx_sexp_message: 0.14.1 → 0.14.2

ocamlPackages.ppx_typerep_conv: 0.14.1 → 0.14.2

ocamlPackages.visitors: 20210127 → 20210316

ocamlPackages.pgocaml: 4.2.2 → 4.2.2-dev-20210111
2021-03-25 17:36:51 +01:00
Vincent Laporte 53a56c9887 ocamlPackages.ppxlib: disable versions 0.15 and 0.18 for OCaml ≥ 4.12 2021-03-25 17:36:51 +01:00
Antonio Nuno Monteiro 70c22f694b ocamlPackages.ocaml_extlib: 1.7.7 -> 1.7.8
1.7.8 changed the behavior of the minimal build type (which we are
keeping as the default because opam-repository does it as well): It now
excludes the Base64 module which is prone to namespacing problems.

Since google-drive-ocamlfuse still uses the Base64 module, we need to
override it to use extlib without the minimal build type. 1.7.9 (?)
should make this obsolete as it is planned to split the Base64 module
into a separate package.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-03-23 08:36:25 +01:00
Antonio Nuno Monteiro 6a0b9d6992 faraday-{lwt,lwt-unix,async}: add Faraday runtimes
Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2021-03-22 18:54:04 +01:00
Vincent Laporte a1b2b1225c ocamlPackages.npy: unstable-2019-04-02 → 0.0.9 2021-03-22 10:01:13 +01:00
Symphorien Gibol d08e1d78e7 ocamlPackages.ocaml-lsp: wrap with dot-merlin-reader
this requires that dot-merlin-reader be built with the same ocaml version as
ocaml-lsp
2021-03-21 22:09:52 +01:00
Antonio Nuno Monteiro 669cfc195f ocaml-lsp, lsp, jsonrpc: allow overriding the source globally
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-21 12:17:08 -07:00
Sandro 4fdc2111b2
Merge pull request #111999 from r-ryantm/auto-update/ocaml4.10.0-graphics
ocamlPackages.graphics: 5.1.0 -> 5.1.1
2021-03-21 05:10:24 +01:00
Frederik Rietdijk 1ecb97eae9 Merge master into staging-next 2021-03-19 18:17:01 +01:00
Vincent Laporte 14edfb4cd7
ocamlPackages.psq: use Dune 2
And enable tests
2021-03-19 17:26:04 +01:00
github-actions[bot] c804f22a81
Merge master into staging-next 2021-03-19 12:26:52 +00:00
Vincent Laporte b68839485d ocamlPackages.bitstring: 4.0.1 → 4.1.0 2021-03-19 11:47:03 +01:00
Vincent Laporte 1bb03d47cd ocamlPackages.ppx_import: 1.7.1 → 1.8.0 2021-03-19 08:17:03 +01:00
github-actions[bot] 6ffd2fe000
Merge master into staging-next 2021-03-19 06:17:55 +00:00
Mario Rodas 30467aa9dd
Merge pull request #116490 from sternenseemann/luv-0.5.7
ocamlPackages.luv: init at 0.5.7
2021-03-18 21:29:18 -05:00
Jan Tojnar 2445e9a681
Merge branch 'master' into staging-next 2021-03-18 19:24:39 +01:00
Jan Tojnar 0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
sternenseemann 544b9d298f ocamlPackages.labltk: add version 8.06.10 for OCaml 4.12 2021-03-18 13:22:47 +01:00
Vincent Laporte 4307699fdb
ocamlPackages.lru: use Dune 2
And enable tests
2021-03-18 05:56:36 +01:00
sternenseemann 42110fb5b8 ocamlPackages.encore: 0.7 -> 0.8 2021-03-18 05:43:38 +01:00
sternenseemann 988f5a5910 ocamlPackages.tcpip: 6.0.0 -> 6.1.0
https://github.com/mirage/mirage-tcpip/releases/tag/v6.1.0
2021-03-18 05:29:09 +01:00
Mario Rodas 61dc1a6bd0 ocamlPackages.ocaml-lsp: add marsam to maintainers 2021-03-17 09:42:28 +01:00
Mario Rodas 9e970977b5 ocamlPackages.ocaml-lsp: 1.4.0 -> 1.4.1
https://github.com/ocaml/ocaml-lsp/releases/tag/1.4.1
2021-03-17 09:42:28 +01:00
github-actions[bot] e0a6159fc6
Merge master into staging-next 2021-03-16 18:18:29 +00:00
sternenseemann 5b3290333a ocamlPackages.ocaml_extlib: add support for OCaml 4.12
Pull in patches from https://github.com/ygrek/ocaml-extlib/pull/55
which add support for OCaml 4.12. These patches are also included in
extlib 1.7.8, however extlib 1.7.8 includes some API changes which break
for example google-drive-ocamlfuse.

Therefore we follow the opam repository and patch our default extlib
version: https://github.com/ocaml/opam-repository/pull/18041
2021-03-16 19:10:29 +01:00
sternenseemann 7015e86ece ocamlPackages.cohttp*: 2.5.4 -> 2.5.5 2021-03-16 15:36:11 +01:00
github-actions[bot] 974e83db9a
Merge master into staging-next 2021-03-16 12:25:48 +00:00
sterni f0b078ef9d
ocamlPackages.git: 3.3.0 -> 3.3.2; decompress: 1.2.0 -> 1.3.0; duff: 0.3 -> 0.4; and related updates (#116486)
* ocamlPackages.hxd: 0.2.0 -> 0.3.1

ocamlPackages.hxd: disable lwt by default on OCaml 4.06 (syntax error)

* ocamlPackages.duff: 0.3 -> 0.4

* ocamlPackages.decompress: 1.2.0 -> 1.3.0

Keep decompress 1.2.0 around as decompress-1-2 until imagelib supports
decompress 1.3.0: https://github.com/rlepigre/ocaml-imagelib/issues/49

* ocamlPackages.carton*: 0.2.0 -> 0.4.0

* ocamlPackages.git: 3.3.0 -> 3.3.2
2021-03-16 13:07:17 +01:00
sternenseemann 176ab26cce ocamlPackages.luv: init at 0.5.7
Enabling tests is not feasible as the test suite takes > 45min (haven't
even run it to completion yet) which is not a good idea in ocamlPackages
where you often have to build from source. Additionally it would require
fetching the git repository since the test suite is not contained in the
release tarball.

Co-authored-by: locallycompact <dan.firth@homotopic.tech>
2021-03-16 12:38:03 +01:00
sternenseemann ebee209dcf ocamlPackages.owl{,-base}: 1.0.0 -> 1.0.1
https://github.com/owlbarn/owl/releases/tag/1.0.1

Fixes test failure on nixpkgs master.
2021-03-16 10:30:55 +01:00
Vincent Laporte d0cb67f669 ocamlPackages.core: 0.14.0 → 0.14.1 2021-03-16 08:18:56 +01:00
github-actions[bot] f72d4dfbe1
Merge master into staging-next 2021-03-16 06:18:21 +00:00
Mario Rodas 499539e0f0
Merge pull request #116025 from r-ryantm/auto-update/ocaml4.10.0-csexp
ocamlPackages.csexp: 1.3.2 -> 1.4.0
2021-03-15 20:20:33 -05:00
github-actions[bot] 4915d2cb4c
Merge master into staging-next 2021-03-15 18:16:46 +00:00
Vincent Laporte 2a56da2235 ocamlPackages.torch: 0.11 → 0.12 2021-03-15 15:16:12 +01:00
github-actions[bot] c2eb9a753a
Merge master into staging-next 2021-03-12 12:25:52 +00:00
Vincent Laporte b20bc9eeb6 ocamlPackages.zarith: 1.11 → 1.12 2021-03-12 08:51:50 +01:00
R. RyanTM 908984c0ce ocamlPackages.csexp: 1.3.2 -> 1.4.0 2021-03-12 05:20:52 +00:00
github-actions[bot] b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Ozan Sener 28c7e68e99 ocamlPackages.ppx_cstubs : Init at 0.6.1.1 2021-03-11 08:28:04 +01:00
Ozan Sener 806b9d0343 ocamlPackages.ppx_deriving : Add 5.2.1 2021-03-11 08:28:04 +01:00
Ozan Sener 65716fe501 ocamlPackages.ppxlib : Add 0.22.0 2021-03-11 08:28:04 +01:00
github-actions[bot] 6a3a358b0d
Merge master into staging-next 2021-03-10 18:23:15 +00:00
sternenseemann 1979284362 ocamlPackages.ctypes: 0.17.1 -> 0.18.0
https://github.com/ocamllabs/ocaml-ctypes/blob/0.18.0/CHANGES.md#ctypes-0180

* ocamlPackages.async_ssl: fix compatibility with ctypes 0.18.0 by using
  ctypes.foreign instead of ctypes.foreign.threaded since the distinction
  between threaded and unthreaded has been removed in this release.
* libbap: link with -thread so linking ctypes.foreign doesn't fail
  https://github.com/BinaryAnalysisPlatform/bap-bindings/issues/18
* ocaml-ng.ocamlPackages_4_07.sodium: patch lib_gen/_tags to also add
  the `package(bigarray)` directive since `ctypes.stubs` no longer
  propgates that, leading to module not found error.
* ocaml-ng.ocamlPackages_4_{04,05,06,07}.async_ssl: mark as broken: due to
  the bigarray-compat dependency, we need dune 2 for ctypes which breaks
  compilation of the legacy async_ssl 0.11 version since we can't
  upgrade to dune 2 for it since that version doesn't support the legacy
  jbuild files.
2021-03-10 16:12:03 +01:00
sternenseemann 336ac16838 ocamlPackages.janePackage: don't delete meta set in args
A bit of a pitfall of // is that it doesn't merge recursively which
often leads to unintended deletion in meta sets: If meta is in args it
is also present in the set right of the // operator which means the
right value is used to replace the left value completely. This throws
away anything extra we've set in the meta set in args.

This is fixed by this comment, allowing the descriptions and broken =
true; set in janestreet/old.nix to propagate to the output meta sets.
2021-03-10 16:12:03 +01:00
github-actions[bot] 149a81c88d
Merge master into staging-next 2021-03-10 00:39:07 +00:00
Vincent Laporte 857ac90e8c ocamlPackages.core_kernel: 0.14.0 → 0.14.1 2021-03-09 21:09:58 +01:00
github-actions[bot] 5d13702776
Merge master into staging-next 2021-03-09 12:25:54 +00:00
Vincent Laporte 5a34902915 ocamlPackages.batteries: 3.2.0 → 3.3.0 2021-03-09 08:27:37 +01:00
Frederik Rietdijk 277d488026 Merge staging into staging-next 2021-03-08 19:20:18 +01:00
sternenseemann 8b10d91d0c ocamlPackages.optint: use dune 2
Necessary for compatibility with OCaml 4.12 and all packages depending
on it use it anyways.
2021-03-08 09:08:23 +01:00
sternenseemann ba8d4a5c86 ocamlPackages.ca-certs: 0.1.3. -> 0.2.0 2021-03-08 08:55:33 +01:00
sternenseemann f43497da9d ocamlPackages.asn1-combinators: 0.2.4 -> 0.2.5
Contains a single bug fix, resolving an integer overflow.
2021-03-07 20:30:39 +01:00
github-actions[bot] dcea8212b5
Merge staging-next into staging 2021-03-07 12:20:40 +00:00
Vincent Laporte 5dc759afec ocamlPackages.rope: use Dune 2 2021-03-07 12:07:14 +01:00
Jan Tojnar 6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Vincent Laporte 0e7add8190
ocamlPackages.biniou: use Dune 2 2021-03-04 22:00:10 +01:00
Robert Hensing 89aa0173ca
Merge pull request #115075 from siraben/stdenv-cleanup
treewide: remove stdenv where not needed
2021-03-04 15:51:04 +01:00
Ben Siraphob 98f26993f2 treewide: remove stdenv where not needed 2021-03-04 19:54:50 +07:00
Vincent Laporte aae6ddcb70
ocamlPackages.bigarray-compat: use Dune 2 2021-03-04 09:20:14 +01:00
Vincent Laporte 6f204e9c42
ocamlPackages.integers: use Dune 2 2021-03-03 10:10:20 +01:00
Aaron L. Zeng 2517018ac2 ocamlPackages.directories: init at 0.2 2021-03-03 08:41:55 +01:00
Vincent Laporte 8efa14a5cb ocamlPackages.digestif: 0.9.0 → 1.0.0 2021-03-03 08:14:59 +01:00
github-actions[bot] eef2c4e401
Merge staging-next into staging 2021-03-03 00:38:15 +00:00
Vincent Laporte cc8f96f8c5
ocamlPackages.mirage-clock: use Dune 2 2021-03-02 20:50:55 +01:00
github-actions[bot] f5bb0053a6
Merge staging-next into staging 2021-03-02 18:17:42 +00:00
Vincent Laporte b0ed0b8a62 ocamlPackages.base: 0.14.0 → 0.14.1 2021-03-02 12:02:12 -05:00
github-actions[bot] b9b22451f0
Merge staging-next into staging 2021-03-02 06:17:20 +00:00
Mario Rodas a21a43a9c4
Merge pull request #114773 from r-ryantm/auto-update/ocaml4.10.0-parmap
ocamlPackages.parmap: 1.1.1 -> 1.2
2021-03-01 20:22:19 -05:00
github-actions[bot] 5863e72037
Merge staging-next into staging 2021-03-02 00:32:18 +00:00
Mario Rodas 8ea1ce7592
Merge pull request #113395 from r-ryantm/auto-update/ocaml4.10.0-qtest
ocamlPackages.qtest: 2.11.1 -> 2.11.2
2021-03-01 18:34:40 -05:00
R. RyanTM d44b7831f5 ocamlPackages.parmap: 1.1.1 -> 1.2 2021-03-01 18:48:09 +00:00
Jan Tojnar 913394a1d9
Merge branch 'staging-next' into staging 2021-03-01 19:30:56 +01:00
Vincent Laporte 25947abcf1
ocamlPackages.ppx_derivers: use Dune 2 2021-03-01 10:07:44 +01:00
github-actions[bot] 02e03be2bf
Merge staging-next into staging 2021-02-28 12:20:13 +00:00
Vincent Laporte d0328678e9
ocamlPackages.ocaml-migrate-parsetree-2-1: use Dune 2 2021-02-28 11:28:04 +01:00
github-actions[bot] 0d421066dd
Merge staging-next into staging 2021-02-28 00:40:17 +00:00
Vincent Laporte caa23be256
ocamlPackages.camomile: use Dune 2 2021-02-27 21:19:06 +01:00
github-actions[bot] 5267db2989
Merge staging-next into staging 2021-02-27 18:16:44 +00:00
Vincent Laporte 10652db906
ocamlPackages.mmap: use Dune 2 2021-02-27 17:59:54 +01:00
Vincent Laporte 1c26497371
ocamlPackages.result: use Dune 2 2021-02-27 13:31:01 +01:00
github-actions[bot] 9c4f09aaef
Merge staging-next into staging 2021-02-26 12:25:50 +00:00
Vincent Laporte 02b4f95f78
ocamlPackages.stdlib-shims: 0.1.0 → 0.3.0 2021-02-26 11:40:38 +01:00
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Vincent Laporte 554827b5a7 ocamlPackages.bap: 2.1.0 → 2.2.0
libbap: 2019-11-15 → 2020-11-25
2021-02-26 07:09:22 +01:00
Vincent Laporte 36aa10c0ea ocamlPackages.ppx_bap: init at 0.14 2021-02-26 07:09:22 +01:00
Vincent Laporte 73487ea05e
ocamlPackages.yojson: use Dune 2 2021-02-25 11:02:25 +01:00
Vincent Laporte 74c0acd1c8
ocamlPackages.ppx_yojson_conv_lib: use Dune 2 2021-02-25 08:20:25 +01:00
Vincent Laporte 128a43a1e8 ocamlPackages.atd: 2.0.0 → 2.2.1 2021-02-25 08:04:35 +01:00
Vincent Laporte a2ae262635
ocamlPackages.linenoise: use Dune 2 2021-02-24 21:02:25 +01:00