1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

490 commits

Author SHA1 Message Date
Vincent Laporte d149b27d41 ocamlformat: refactor 2020-10-18 09:51:18 +02:00
Hongchang Wu 4304c709af ocamlPackages.merlin: 3.3.9 -> 3.4.0 2020-10-04 16:57:52 +02:00
Hongchang Wu 91c74eeae3 ocamlPackages.dot-merlin-reader: init at 3.4.0 2020-09-25 15:11:46 +02:00
Jules Aguillon c4cb4c226e
Declare several versions of OCamlformat (#88799)
OCamlformat is still a bit unstable and it's common to work on several
projects that each use a different version.

Define every versions at once and share code

* ocamlformat: add dependency on base

OCamlformat always required Base.
This will be important in the future as Base may make breaking changes.
2020-09-22 07:30:35 +02:00
Mario Rodas 1d2c243d9e dune_2: fix hash 2020-09-07 13:26:52 +02:00
Mario Rodas adcb00e739 ocamlPackages.merlin: 3.3.8 -> 3.3.9
https://github.com/ocaml/merlin/releases/tag/v3.3.9
2020-09-04 16:33:58 +02:00
Mario Rodas c7e8da6225 dune_2: 2.7.0 -> 2.7.1
https://github.com/ocaml/dune/releases/tag/2.7.1
2020-09-04 15:27:26 +02:00
Vincent Laporte 910ac8645f ocamlPackages.ocp-index: 1.2 → 1.2.1 2020-09-02 10:30:34 +02:00
Mario Rodas f26043b428 ocamlPackages.merlin: 3.3.6 -> 3.3.8
https://github.com/ocaml/merlin/releases/tag/v3.3.7
https://github.com/ocaml/merlin/releases/tag/v3.3.8
2020-09-01 10:41:39 +02:00
Mario Rodas 548bd1e04f dune_2: 2.6.2 -> 2.7.0
https://github.com/ocaml/dune/releases/tag/2.7.0
2020-08-24 11:43:13 +02:00
Silvan Mosberger 1fe7fee592
Merge pull request #93347 from symphorien/spacetime
Ocaml spacetime support
2020-08-22 16:38:54 +02:00
Symphorien Gibol 3ede620042 camlp4: fix build with spacetime 2020-08-15 23:44:01 +02:00
R. RyanTM f8c1c5ad83 ocamlPackages.ocp-indent: 1.8.1 -> 1.8.2 2020-08-15 14:10:21 +00:00
Vincent Laporte 774db64cc6 js_of_ocaml: 3.6.0 → 3.7.0 2020-08-15 07:29:11 +02:00
Mario Rodas 07e74acd0f
ocamlformat: add marsam to maintainers 2020-08-07 04:20:00 +00:00
Mario Rodas 22594a9d4a ocamlformat: 0.14.2 -> 0.15.0
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.15.0
2020-08-06 23:20:00 -05:00
sternenseemann b37f77420e dune-release: 1.3.3 → 1.4.0 2020-08-02 15:01:02 +02:00
R. RyanTM d2ad65c2d7 dune_2: 2.6.1 -> 2.6.2 2020-08-01 03:14:18 +00:00
Mario Rodas 969e35423c dune_2: 2.6.0 -> 2.6.1
Changelog: https://github.com/ocaml/dune/releases/tag/2.6.1
2020-07-05 12:11:03 +02:00
Vincent Laporte 581660a4d3 ocamlPackages.camlp5: 7.11 → 7.12 2020-07-01 13:46:30 +02:00
Vincent Laporte 5ac8870024 ocamlPackages.js_of_ocaml: 3.5.2 → 3.6.0 2020-06-28 09:59:04 +02:00
sternenseemann c4ca9ba10d dune-release: init at 1.3.3 2020-06-26 12:14:03 +02:00
Vincent Laporte a0d4f232d7 ocamlPackages.js_of_ocaml: rename file to “default.nix” 2020-06-15 08:53:50 +02:00
Vincent Laporte d6a4ee1193 ocamlPackages.js_of_ocaml_2: remove at 2.7 & 2.8.4 2020-06-15 08:53:50 +02:00
Mario Rodas d1a51e415d
ocamlPackages.merlin: 3.3.4 -> 3.3.6 2020-06-12 04:20:00 -05:00
Mario Rodas 657f4927eb dune_2: 2.5.1 -> 2.6.0
Changelog: https://github.com/ocaml/dune/releases/tag/2.6.0
2020-06-08 10:45:02 +02:00
Mario Rodas a1ee2cb9c4 ocamlformat: 0.14.1 -> 0.14.2 2020-05-12 08:14:18 +02:00
Vincent Laporte 513e1339c0 ocamlPackages.merlin: 3.3.3 → 3.3.4 2020-04-22 07:24:48 +02:00
Mario Rodas 9d81c54b31 opam: add marsam to maintainers 2020-04-21 15:49:43 +02:00
Mario Rodas 05cfa5ff99 opam: 2.0.6 -> 2.0.7 2020-04-21 15:49:43 +02:00
Mario Rodas 1a36927174 ocamlformat: 0.14.0 -> 0.14.1
Changelog: https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.14.1
2020-04-21 08:56:19 +02:00
Mario Rodas b3c3a0bd18 dune_2: 2.5.0 -> 2.5.1
Changelog: https://github.com/ocaml/dune/releases/tag/2.5.1
2020-04-20 09:08:36 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Mario Rodas 7ac4b79e82 dune_2: 2.4.0 -> 2.5.0
Changelog: https://github.com/ocaml/dune/releases/tag/2.5.0
2020-04-10 09:00:08 +02:00
Vincent Laporte 4cf775aee9 ocamlPackages.cppo: 1.6.5 → 1.6.6 2020-04-09 10:02:59 +02:00
Mario Rodas 09022cb32f
ocamlformat: 0.13.0 -> 0.14.0
Changelog: https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.14.0
2020-04-03 04:20:00 -05:00
Vincent Laporte 8dddd8a07f ocamlPackages.camlp5: 7.10 → 7.11 2020-03-19 18:04:14 -07:00
Antonio Nuno Monteiro c9fc7a2a9c dune: 2.3.1 -> 2.4.0 2020-03-11 17:14:52 +01:00
Vincent Laporte 5e468ef981 ocsigen-i18n: 3.4.0 → 3.5.0 2020-03-08 18:09:22 +01:00
Joachim Breitner 2d2a5a9b63
js_of_ocaml: 3.4.0 -> 3.5.2 (#75766)
drive-by contributions, as I was playing around with this (it has better
support for the `num` library, it seems.)

js_of_ocaml: 3.4.0 -> 3.5.2
ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0
ocamlPackages.eliom: 6.8.0 → 6.10.1
ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0
ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
2020-03-06 07:42:04 +01:00
Vincent Laporte 9794d1e5fc ocamlPackages.ocp-index: 1.1.9 → 1.2 2020-03-01 22:39:43 +01:00
Vincent Laporte d02dc3c5fd ocamlPackages.ocp-build: fix for OCaml ≥ 4.08 2020-03-01 22:39:43 +01:00
Mario Rodas 2e1198cb47 dune_2: fix hash 2020-02-24 12:54:42 +01:00
Mario Rodas 09c1342c70 dune_2: 2.3.0 -> 2.3.1
Changelog: https://github.com/ocaml/dune/releases/tag/2.3.1
2020-02-21 15:04:02 +01:00
Mario Rodas bfb7ebf5df dune_2: 2.2.0 -> 2.3.0
Changelog: https://github.com/ocaml/dune/releases/tag/2.3.0
2020-02-15 20:03:14 +01:00
Antonio Nuno Monteiro 990f64d5d7 ocamlformat: fix 0.13.0 URL 2020-02-10 07:34:52 +01:00
Mario Rodas a5c3e14785 dune_2: 2.1.3 -> 2.2.0
Changelog: https://github.com/ocaml/dune/releases/tag/2.2.0
2020-02-07 09:58:43 +01:00
Antonio Nuno Monteiro a21c2fa3ea
ocamlformat: 0.12 -> 0.13.0 (#78942) 2020-01-31 10:48:37 +01:00
Vincent Laporte 57aaf67b72 ocamlPackages.utop: 2.4.2 → 2.4.3 2020-01-28 17:33:13 +01:00
Mario Rodas 560f6943a2 opam: 2.0.5 -> 2.0.6
Changelog: https://github.com/ocaml/opam/blob/2.0.6/CHANGES
2020-01-16 15:35:29 +01:00
Mario Rodas 98c22e50cd dune_2: 2.1.2 -> 2.1.3
Changelog: https://github.com/ocaml/dune/releases/tag/2.1.3
2020-01-16 14:20:19 +01:00
Mario Rodas 7994673d56 dune_2: 2.1.1 -> 2.1.2
Changelog: https://github.com/ocaml/dune/releases/tag/2.1.2
2020-01-10 12:54:15 +01:00
Mario Rodas d465a40fb2
dune_2: 2.1.0 -> 2.1.1 2020-01-07 04:20:00 -05:00
Mario Rodas 5d01fd4d1a
Revert "ocamlPackages.cppo: 1.6.5 -> 1.6.6"
cppo 1.6.6 breaks building it with ocaml 4.02, which is still required
for some packages.

This reverts commit 000f19ff08.
2020-01-04 09:00:00 -05:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Mario Rodas 1b1f9584e5
dune_2: init at 2.1.0
Changelog:
- https://github.com/ocaml/dune/releases/tag/2.0.0
- https://github.com/ocaml/dune/releases/tag/2.0.1
- https://github.com/ocaml/dune/releases/tag/2.1.0
2019-12-21 10:03:41 -05:00
Mario Rodas 86d06ee968
ocamlPackages.utop: use buildDunePackage 2019-12-18 04:23:00 -05:00
Mario Rodas d07842589d
ocamlPackages.ocp-index: use buildDunePackage 2019-12-18 04:22:00 -05:00
Mario Rodas 000f19ff08
ocamlPackages.cppo: 1.6.5 -> 1.6.6 2019-11-27 04:20:00 -05:00
Vincent Laporte 788148f93c ocaml-top: 1.1.5 → 1.2.0-rc 2019-12-15 08:11:56 +01:00
Vincent Laporte 2cf477f28d ocamlPackages.merlin: 3.3.2 → 3.3.3 2019-12-11 09:58:21 +01:00
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