Commit graph

2520 commits

Author SHA1 Message Date
John Ericson a86418ac62
Merge pull request #118066 from sternenseemann/mirage-xen
ocamlPackages: init a bunch of libraries for the MirageOS xen target
2021-04-25 10:13:11 -04:00
sternenseemann 4f7a6610f7 ocamlPackages.mirage-bootvar-xen: init at 0.8.0 2021-04-25 13:15:10 +02:00
sternenseemann 2fe8239172 ocamlPackages.{mirage-net-xen,netchannel}: init at 2.0.0 2021-04-25 13:15:10 +02:00
sternenseemann 980a2bed3b ocamlPackages.mirage-xen: init at 6.0.0
Unfortunately this requires a bit of trickery with pkg-config to get to
work. The root issue is that the mirage-xen assumes that we use the
default libdir of dune ($out/lib) whereas we install to an OCaml
version-specific site-lib directory. Thus the manually created
pkg-config file makes wrong assumptions (which warrants a patch) and the
.pc file is installed to the wrong location (which is fixed with a mv
invocation).
2021-04-25 13:13:23 +02:00
sternenseemann b5f7ed7cc8 ocamlPackages.shared-memory-ring(-lwt): init at 3.1.0 2021-04-25 13:08:25 +02:00
Jan Tojnar c1f851b2ee
Merge branch 'staging-next' into staging 2021-04-25 08:22:13 +02:00
Mario Rodas 53a3fc2856 ocamlPackages.sedlex_2: 2.2 -> 2.3 2021-04-24 17:04:32 +02:00
sternenseemann 31014c4a28 ocamlPackages.mirage-crypto*: 0.9.2 -> 0.10.0
https://github.com/mirage/mirage-crypto/releases/tag/v0.10.0
2021-04-24 09:56:10 +02:00
Alyssa Ross 892d3fd7a0 ocamlPackages.camlimages_4_1: fix meta
I should have changed meta.branch in 70e33e3ae3 ("glsurf: use current giflib"),
but I overlooked it.

The bitbucket URL doesn't seem to exist any more, so I've updated the
homepage to the GitLab repository we fetch the sources from.

Fixes: 70e33e3ae3 ("glsurf: use current giflib")
2021-04-23 00:00:20 +02:00
github-actions[bot] b28a233fef
Merge staging-next into staging 2021-04-22 00:16:19 +00:00
sternenseemann fb8c527586 ocamlPackages.irmin: 2.5.2 -> 2.5.3
https://github.com/mirage/irmin/releases/tag/2.5.3
2021-04-21 22:32:06 +02:00
github-actions[bot] a260b67879
Merge staging-next into staging 2021-04-21 12:06:26 +00:00
Vincent Laporte 1f1a77bdb7 ocamlPackages.labltk: fix ocamlbrowser by wrapping
Also remove legacy versions
2021-04-21 13:56:54 +02:00
github-actions[bot] 5fe3cbef9a
Merge staging-next into staging 2021-04-20 00:15:41 +00:00
Vincent Laporte d2caa11ce0 ocamlPackages.earlybird: 0.1.5 → 1.1.0 2021-04-19 22:12:38 +02:00
Vincent Laporte 95341f082c ocamlPackages.path_glob: init at 0.2 2021-04-19 22:12:38 +02:00
Vincent Laporte cdff996ed3 ocamlPackages.dap: init at 1.0.6 2021-04-19 22:12:38 +02:00
github-actions[bot] ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00:00
sternenseemann 5252b4bd1b ocamlPackages.ocaml_extlib-1-7-7: init at 1.7.7
Unfortunately there's no way to get Haxe 4.0 and 4.1 to work with extlib
1.7.8 (not even without the minimal install), so we need to package
1.7.7 again, at least until 1.7.9 (?) brings backwards compatibility
packages, hopefully.
2021-04-19 14:42:42 +02:00
github-actions[bot] c577e0ee09
Merge staging-next into staging 2021-04-19 00:15:24 +00:00
Ulrik 1a2c0d2213 ocamlPackages.x509: 0.11.2 -> 0.12.0
Adds support for EC DSA from mirage-crypto

Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2021-04-18 21:07:26 +02:00
github-actions[bot] 5478217883
Merge staging-next into staging 2021-04-18 06:05:34 +00:00
Enrico Tassi 5594aa424c elpi: 1.13.0 -> 1.13.1 2021-04-18 06:09:28 +02:00
github-actions[bot] 33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
Pavol Rusnak 29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
Vincent Laporte 8db8975228 ocamlPackages.ezxmlm: 1.0.2 → 1.1.0 2021-04-17 13:17:07 +02:00
Alyssa Ross 70e33e3ae3 glsurf: use current giflib
This requires bumping the version of camlimages used by glsurf to a
version that supports current giflib.  The most recent versions of
camlimages (even of 4.x) don't support ocaml 4.01 any more, so I've
upgraded to 4.1.2 here, the last version that supports ocaml 4.01 (and
which happily supports current giflib).
2021-04-16 14:06:10 +00:00
Vincent Laporte 982bdad584 ocamlPackages.cairo2: use Dune 2 2021-04-16 11:07:36 +02:00
Vincent Laporte e3aa8c650b ocamlPackages.lablgtk3: use Dune 2 2021-04-16 11:07:36 +02:00
sternenseemann 894b606945 ocamlPackages.wayland: init at 0.2 2021-04-15 11:51:06 +02:00
Vincent Laporte fd75d3b722 ocamlPackages.safepass: 3.0 → 3.1 2021-04-15 07:04:35 +02:00
Vincent Laporte 1c6935fbe4 ocamlPackages.postgresql: 4.6.3 → 5.0.0 2021-04-14 22:39:03 +02:00
Vincent Laporte 7db1853f5c ocamlPackages.rpclib: 8.0.0 → 8.1.0 2021-04-12 21:37:58 +02:00
Vincent Laporte f01a04abd4
ocamlPackages.jsonrpc: 1.4.1 → 1.5.0 2021-04-12 08:22:24 +02:00
sterni 2140791f9b
ocamlPackages.janeStreet{,_0_9_0}: join the ocamlPackages fix point, allowing overriding to work as expected (#113696)
* ocamlPackages.janeStreet_0_9_0: join the ocamlPackages fix point

Internal dependencies in the janeStreet sets were always taken from the
own rec attribute set. While this is pretty simple and convenient, it
has the disadvantage that it doesn't play nice with overriding: If you'd
override an attribute in a janeStreet set previously, it would be
changed when referenced directly, but the other packages in that
janeStreet set still would use the original, non-overridden version of
the derivation.

This is easily fixed by passing janeStreet_0_9_0 itself from the fix
point of ocamlPackages and using it to reference the dependencies.

Example showing it now works as expected:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        janeStreet_0_9_0 = old.janeStreet_0_9_0 // {
          base = old.janeStreet_0_9_0.base.overrideAttrs (_: {
            meta.broken = true;
          });
        };
      });
    }

nix-repl> (import ./. {
  overlays = [ (import ./test-overlay.nix) ];
}).ocamlPackages.janeStreet_0_9_0.stdio

error: Package ‘ocaml4.10.0-base-0.9.4’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix:6 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

* ocamlPackages.janeStreet: take part in fixpoint for OCaml >= 4.08

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.14, i. e. OCaml >= 4.08

* ocamlPackages.janeStreet: take part in fixpoint for OCaml == 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.12, i. e. OCaml == 4.07

* ocamlPackages.janeStreet: take part in fixpoint for OCaml < 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.11, i. e. OCaml < 4.07

* ocamlPackages.janeStreet: remove self - super distinction

Previously, we inherited non-janestreet ocaml dependencies from super
and janestreet dependencies from self which always was super.janeStreet.

This behavior is however not really what we want due to liftJaneStreet:
Users and other packages will use ocamlPackages.base etc. instead of
ocamlPackages.janeStreet.base and the like. Consequently they also would
override the top-level attributes which would mean that other janestreet
packages would not pick up on it however.

As a consequence however, overriding ocamlPackages.janeStreet.base
doesn't work. Since this was never possible, I don't think this is an
issue. It is probably a good idea to deprecate that set anyways and
printing a warning when it is used via trace.

janeStreet_0_9_0 is unchanged as the disticniton between self and super
makes sense for it.

Below is an example showing how overriding would work from an user's
perspective:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        base = old.base.overrideAttrs (_: {
          meta.broken = true;
        });
      });
    }

nix-repl> (import ./. { overlays = [ (import ./test-overlay.nix) ]; }).ocamlPackages.
stdio
error: Package ‘ocaml4.10.0-base-0.14.0’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix:12 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
2021-04-11 12:26:10 +02:00
Vincent Laporte 0062afc050 ocamlPackages.printbox: 0.4 → 0.5 2021-04-11 10:10:38 +02:00
sternenseemann f0ceaf880e ocamlPackages.mirage-crypto*: 0.9.1 -> 0.9.2
https://github.com/mirage/mirage-crypto/releases/tag/v0.9.2
2021-04-09 14:23:12 +02:00
sternenseemann 4462a1f678 ocamlPackages.irmin*: 2.5.1 -> 2.5.2
https://github.com/mirage/irmin/releases/tag/2.5.2
2021-04-09 07:57:04 +02:00
Vincent Laporte cf42b2eb0f
ocamlPackages.sqlite3: use Dune 2 2021-04-07 21:27:13 +02:00
Vincent Laporte cc6d25b0d3 ocamlPackages.merlin-extend: use Dune 2 2021-04-07 20:34:26 +02:00
Vincent Laporte 55ddc94d92 ocamlPackages.ocamlnet: 4.1.8 → 4.1.9 2021-04-07 20:32:28 +02:00
Vincent Laporte c86f67bfb9 ocamlPackages.minisat: 0.2 → 0.3 2021-04-06 08:43:38 +02:00
Vincent Laporte 026b9db487
ocamlPackages.opti: use Dune 2 2021-04-05 17:19:44 +02:00
Vincent Laporte 938741a71b
ocamlPackages.parmap: use Dune 2 2021-04-05 16:50:15 +02:00
Vincent Laporte 3eb054abd8
ocamlPackages.gnuplot: use Dune 2 2021-04-05 15:14:40 +02:00
sternenseemann 83eb1fe06d ocamlPackages.pbkdf: init at 1.1.0
Necessary for the upcoming x509 0.12.0 release.
2021-04-05 15:09:05 +02:00
sternenseemann 60fa97197d ocamlPackages.mirage-crypto: 0.9.0 -> 0.9.1 2021-04-05 14:59:36 +02:00
sternenseemann 4350ede15e ocamlPackages.mimic: 0.0.1 -> 0.0.2
https://github.com/mirage/ocaml-git/releases/tag/mimic-v0.0.2
2021-04-05 14:27:57 +02:00
sternenseemann 2f368c2060 ocamlPackages.decompress-1-2: remove at 1.2.0
With imagelib updated there remains no user of this in nixpkgs.
2021-04-02 15:03:44 +02:00
sternenseemann a6425a6008 ocamlPackages.imagelib: 20200929 -> 20210402
Allows us to get rid of decompress 1.2.0:

https://github.com/rlepigre/ocaml-imagelib/releases/tag/20210402
2021-04-02 15:03:44 +02:00
Vincent Laporte 170bad5b0a
ocamlPackages.gsl: use Dune 2 2021-04-02 14:12:12 +02:00
Vincent Laporte 9ac5c7df17 ocamlPackages.gettext-camomile: init at 0.4.2 2021-04-02 09:13:44 +02:00
Vincent Laporte ef0e64ec60
ocamlPackages.sosa: remove spurious dependency on nonstd 2021-04-02 09:01:22 +02:00
sternenseemann 77ffcfa47a ocamlPackages.mirage-crypto*: 0.8.10 -> 0.9.0
ocamlPackages.mirage-crypto: allow compiling with ocaml-freestanding

ocamlPackages.mirage-crypto-ec: init at 0.9.0

https://github.com/mirage/mirage-crypto/releases/tag/v0.9.0
2021-04-01 22:14:30 +02:00
sternenseemann 83820fe6db ocamlPackages.mirage-clock-freestanding: init at 3.1.0 2021-04-01 16:10:15 +02:00
Vincent Laporte 94837b564d
ocamlPackages.crowbar: use Dune 2 2021-04-01 09:37:32 +02:00
Vincent Laporte 595363a38f
ocamlPackages.dtoa: use Dune 2 2021-04-01 09:08:13 +02:00
Vincent Laporte dc68bad367
ocamlPackages.cpu: use Dune 2 2021-04-01 08:49:17 +02:00
Vincent Laporte 6373ef78c6
ocamlPackages.parany: use Dune 2 2021-04-01 08:46:19 +02:00
Vincent Laporte 086ae4a06d ocamlPackages.bigstring: 0.2 → 0.3 2021-04-01 08:33:08 +02:00
Vincent Laporte d99c24d00a ocamlPackages.hidapi: use Dune 2 2021-04-01 08:33:08 +02:00
sternenseemann 7c9de65429 ocamlPackages.tcpip: 6.0.0 -> 6.1.0
https://github.com/mirage/mirage-tcpip/releases/tag/v6.1.0
2021-03-30 08:57:29 +02:00
sternenseemann 3ec81e0849 ocaml-freestanding: propagate solo5
solo5's bindings and ocaml-freestanding are both statically linked and
thus packages depending on ocaml-freestanding need the solo5 bindings as
well.
2021-03-30 08:57:29 +02:00
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
R. RyanTM f356088507 ocamlPackages.alcotest: 1.2.3 -> 1.3.0
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2021-03-22 16:16:31 +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
Vincent Laporte 439eeda150 ocamlPackages.psmt2-frontend: 0.2 → 0.3.1 2021-02-23 22:11:44 +01:00
github-actions[bot] 1aed95568f
Merge staging-next into staging 2021-02-21 18:17:25 +00:00
github-actions[bot] 93b17c1b4d
Merge master into staging-next 2021-02-21 18:17:22 +00:00
sternenseemann 2f96b9a7b4 ocamlPackages.qcheck*: 0.16 -> 0.17
* New exposed function, bug fixes:
  https://github.com/c-cube/qcheck/blob/0.17/CHANGELOG.md#017

* Fix a too liberal testing range causing an integer overflow in stdint
  which for some reason only qcheck 0.17 and not 0.16 seems to find
2021-02-21 17:16:17 +01:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
github-actions[bot] abe7db36a4
Merge staging-next into staging 2021-02-20 00:36:40 +00:00
sternenseemann 85c606d097
ocamlPackages.git: 3.2.0 -> 3.3.0; ocamlPackages.irmin: 2.4.0 -> 2.5.1 (#113717)
* ocamlPackages.git: 3.2.0 -> 3.3.0

* minor fixes to tests (while introducing new failures in the nix
  sandbox we have to patch)
* compatibility fixes to commit messages with git fsck and github at the
  expense of potentially breaking older ocaml-git managed repositories.

https://github.com/mirage/ocaml-git/releases/tag/3.3.0

* ocamlPackages.irmin: 2.4.0 -> 2.5.1

* irmin-graphql: enable tests as they now work without network
* irmin-layers: tests were removed
* ppx_irmin: tests were removed

Compatibility with git 3.3.0 and improved performance.

https://github.com/mirage/irmin/releases/tag/2.5.0
https://github.com/mirage/irmin/releases/tag/2.5.1

* ocamlPackages.{git, irmin}: add myself to maintainers
2021-02-19 22:19:24 +01:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Cyril Cohen 268e43a005 elpi: 1.12.0 -> 1.13.0 2021-02-18 22:26:10 +01:00
sternenseemann 6b1057b452 ocamlPackages.uucp: use throw instead of lib.assertMsg
This makes the uucp evaluation fail silently for nix-env -qaP
ocaml-ng.ocamlPackages_4_02, as throw messages are not printed to
stderr.
2021-02-17 18:23:17 +01:00
Arthur Teisseire 7cc2f6cc54 ocamlPackages.sha: init at 1.13 2021-02-17 17:45:18 +01:00
R. RyanTM 1f63d667b4 ocamlPackages.qtest: 2.11.1 -> 2.11.2 2021-02-17 11:29:55 +00:00
sternenseemann 35fbdb657f ocamlPackages.uucp: enable tests 2021-02-16 21:30:18 +01:00
sternenseemann 4931abed9e ocamlPackages.uucp: 11.0.0 -> 13.0.0
Now requires ocaml >= 4.03
2021-02-16 21:30:18 +01:00
R. RyanTM e9b68c1edb ocamlPackages.base64: 3.4.0 -> 3.5.0
dune-configurator is no longer necessary.

Also do some minor cleanups like:

* moving bos to checkInputs
* adding rresult to checkInputs
* adding minimumOCamlVersion
* make doCheck conditional to fix evaluation for ocaml < 4.05
2021-02-16 20:08:23 +01:00
Aaron L. Zeng 5f0583b08b ocamlPackages.ppx_log: init at 0.14.0 2021-02-16 18:28:11 +01:00
Vincent Laporte 64b4617883
ocamlPackages.ounit2: use Dune 2 2021-02-16 18:04:54 +01:00
sternenseemann cb15bdad1c ocamlPackages.stdint: 0.6.0 -> 0.7.0
* Lower minimumOCamlVersion like upstream.
* Enable tests which unfortunately require some fixing up.
* Use release tarball
* Use dune 2
2021-02-16 15:26:58 +01:00
Vincent Laporte 0b6201180e
ocamlPackages.gettext: use Dune 2 2021-02-16 09:36:40 +01:00
sternenseemann c59b8ce9c3
ocamlPackages: irmin 2.2.0 → 2.4.0; git: 2.13 → 3.2.0; and related changes (#110184)
* ocamlPackages.index: 1.2.1 -> 1.3.0

* ocamlPackages.decompress: 0.9.0 -> 1.2.0

* ocamlPackages.imagelib-unix: remove at 20191011

* ocamlPackages.imagelib: 20191011 -> 20200929

* ocamlPackages.duff: 0.2 -> 0.3

* ocamlPackages.carton{,-git,-lwt}: init at 0.2.0

* ocamlPackages.encore: 0.5 → 0.7

* ocamlPackages.git-http: remove at 2.1.3

* ocamlPackages.git-unix: move into git directory

* ocamlPackages.irmin-mem: remove at 2.2.0

Replaced by irmin.mem contained in ocamlPackages.irmin >= 2.4.0

* ocamlPackages.git*: 2.1.3 -> 3.2.0

ocamlPackages.git-unix: 2.1.3 -> 3.2.0

ocamlPackages.git-cohttp{,-unix,-mirage}: init at 3.2.0

* ocamlPackages.irmin*: 2.2.0 -> 2.4.0

ocamlPackages.irmin-containers: init at 2.4.0
ocamlPackages.irmin-layers: init at 2.4.0
ocamlPackages.irmin-mirage: init at 2.4.0
ocamlPackages.irmin-mirage-git: init at 2.4.0
ocamlPackages.irmin-mirage-graphql: init at 2.4.0

* ocamlPackages.wodan-irmin: mark as broken
2021-02-16 08:39:46 +01:00
Vincent Laporte 90361764fe
ocamlPackages.re: use Dune 2 2021-02-14 14:15:55 +01:00
Vincent Laporte 59eabeea8d
ocamlPackages.parse-argv: use Dune 2 2021-02-13 11:20:19 +01:00
Vincent Laporte 2d6a91ebf4
ocamlPackages.diet: use Dune 2 2021-02-13 11:05:22 +01:00
Vincent Laporte 1a7a395a6f
ocamlPackages.opam-core: use Dune 2 2021-02-13 10:33:09 +01:00
Vincent Laporte 58e5d62b62
ocamlPackages.tyxml: use Dune 2 2021-02-13 10:16:35 +01:00
Antonio Nuno Monteiro 702ac790ed mdx: 1.8.0 -> 1.8.1 2021-02-12 09:13:01 -08:00
Vincent Laporte 0279876952 ocamlPackages.lwt: 5.3.0 → 5.4.0 2021-02-12 17:42:29 +01:00
Vincent Laporte e4b1824c5b ocamlPackages.resource-pooling: use Dune 2 2021-02-12 17:42:29 +01:00
Vincent Laporte bc85b5b992 ocamlPackages.zmq: use Dune 2 2021-02-12 17:42:29 +01:00
Vincent Laporte 69dd7d2068 ocamlPackages.mirage-device: use Dune 2 2021-02-12 17:42:29 +01:00
Vincent Laporte eb15f3e87b ocamlPackages.irmin-watcher: use Dune 2 2021-02-12 17:42:29 +01:00
Vincent Laporte 0ca3e0ce49 ocamlPackages.mirage-bootvar-unix: use Dune 2 2021-02-12 17:42:29 +01:00
Vincent Laporte edf3a8376e ocamlPackages.ppx_deriving_protobuf: 2.7 → 3.0.0 2021-02-12 09:00:11 +01:00
Vincent Laporte 3c34795935 ocamlPackages.kafka: 0.4 → 0.5 2021-02-07 14:07:54 +01:00
Vincent Laporte f12fb9fbe6 ocamlPackages.ocaml-migrate-parsetree: use Dune 2 2021-02-06 21:40:25 +01:00