Commit Graph

379 Commits

Author SHA1 Message Date
Théo Zimmermann
d1685e81ef ocamlformat: 0.11.0 -> 0.12 2019-12-09 15:08:07 +01:00
Vincent Laporte
7132e6b573 ocaml-crunch: init at 3.1.0 2019-12-06 06:17:14 +00:00
Matthew Bauer
0505c5125c
Merge branch 'master' into static-fixes 2019-12-02 13:34:24 -05:00
Alexander Bantyev
81ca7cc0a7
js_of_ocaml: fix dependencies 2019-11-26 18:03:50 +03:00
Frederik Rietdijk
be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
John Ericson
bca2e8255e treewide: CAML_LD_LIBRARY_PATH may be undefined 2019-11-14 13:44:07 -05:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Théo Zimmermann
72ef651f55
ocamlPackages.utop: fix source
By using the provided tbz file instead of the auto-generated GitHub
tarball, we ensure that strings like %%VERSION%% have been properly
generated.
2019-11-12 13:24:44 +01:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Yorick van Pelt
4550405ac9
ocaml-modules: replace buildInputs with nativeBuildInputs where appropriate
The default has been to use buildInputs for build dependencies.
This doesn't work when cross-compiling.
2019-11-11 11:10:14 +03:00
John Ericson
f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson
6fb526b32c findlib setup hook: createFindlibDestdir may not be defined 2019-11-08 13:28:59 -05:00
John Ericson
67cc85ec67 OCaml findlib: OCAMLPATH could be undefined 2019-11-08 13:24:20 -05:00
Matthew Bauer
5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05:00
Vincent Laporte
a2f7fc9a5c ocamlPackages.ocp-indent: 1.7.0 → 1.8.1 2019-11-04 07:32:17 +00:00
John Ericson
2811b032d6 treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
2019-11-01 14:44:44 -04:00
Vincent Laporte
0361ae2230 ocamlPackages.camlp4: fix evaluation for OCaml ≥ 4.09 2019-10-25 07:09:42 +00:00
Marco Maggesi
24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +02:00
Mario Rodas
5e716c80f2 dune: 1.11.3 -> 1.11.4
Changelog: https://github.com/ocaml/dune/releases/tag/1.11.4
2019-10-11 12:10:18 +02:00
Marco Maggesi
ff1ed720e2 Rename z77z into maggesi
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
2019-10-07 17:05:25 +02:00
Vincent Laporte
348c8947e0 ocamlPackages.utop: 2.4.1 → 2.4.2
Ensures compatibility with OCaml 4.09
2019-09-26 17:27:11 +00:00
Jörg Thalheim
94bd708252
Merge pull request #69337 from vbgl/ocamlformat-0.11.0
ocamlformat: 0.8 → 0.11.0
2019-09-24 10:54:25 +01:00
Vincent Laporte
9c427a0c1e
ocamlformat: 0.8 → 0.11.0 2019-09-24 05:53:06 +00:00
Vincent Laporte
0c0e63d211
ocamlPackages.camlp5: 7.08 → 7.10 2019-09-21 03:35:39 +00:00
Vincent Laporte
5fed98e862 ocamlPackages.js_of_ocaml*: 3.3.0 -> 3.4.0
Ensures compatibility with OCaml 4.08
2019-09-14 06:54:35 +00:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +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
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
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00: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
Mario Rodas
f7c9670cd8 dune: add marsam as maintainer 2019-08-23 12:33:38 +00:00
Mario Rodas
2898679f15 dune: 1.11.1 -> 1.11.3 2019-08-23 12:33:38 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Vincent Laporte
957a0ae2a7 ocamlPackages.camlp5: 7.07 -> 7.08 2019-08-12 14:36:38 +00:00
Mario Rodas
246c223e87 dune: 1.11.0 -> 1.11.1 2019-08-09 11:45:38 +00:00
Jon
62a916defd ocamlPackages_latest.camlp4: init at 4.08+1 (#66343) 2019-08-09 06:40:59 +00:00
Vincent Laporte
0a477846af ocamlPackages.findlib: 1.8.0 -> 1.8.1
Also remove unused legacy version 1.7.3
2019-08-07 12:26:34 +00:00
Vincent Laporte
c75b84a7c4 dune: disable for OCaml < 4.02 2019-07-30 16:18:39 +00:00
Mario Rodas
236d744df7 dune: 1.10.0 -> 1.11.0 2019-07-24 15:20:40 +00:00
Mario Rodas
d3a5c2a114
Merge pull request #64790 from marsam/update-opam
opam: 2.0.4 -> 2.0.5
2019-07-15 21:00:38 -05:00
Mario Rodas
f9843befd1 ocamlPackages.merlin: 3.3.1 -> 3.3.2 2019-07-15 16:11:22 +02:00
Mario Rodas
a61db6075f
opam: 2.0.4 -> 2.0.5 2019-07-15 04:20:00 -05:00
Mario Rodas
88c2586958 dune: 1.9.2 -> 1.10.0 (#62256)
* dune: 1.9.2 -> 1.10.0

* ocamlPackages.camomile: use jbuilder executable

* ocamlPackages.sqlexpr: fix build

* ocamlPackages.lwt_camlp4: fix build
2019-07-05 12:28:06 +00:00
Mario Rodas
4f7a080f48
ocamlPackages.merlin: 3.3.0 -> 3.3.1 2019-06-17 10:20:00 -05:00
Mario Rodas
ddaf94d804 ocamlPackages.merlin: 3.2.2 -> 3.3.0 2019-06-03 17:13:37 +02:00