Commit Graph

46 Commits

Author SHA1 Message Date
Vincent Laporte
eec6d815c9 ocamlPackages.yojson: 2.2.2 → 3.0.0
ocamlPackages.atdgen-codec-runtime: 2.16.0 → 3.0.1
2025-12-12 06:35:52 +01:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
Wolfgang Walther
b19d0f6d3d treewide: replace substituteAll with replaceVars 2025-02-10 22:51:56 +01:00
Silvan Mosberger
667d42c00d treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01:00
Reno Dakota
9ecab00bf4 ocaml-ng.ocamlPackages{_5_1,}.merlin: fix vim python-3.12 warnings
apply upstream patch 9e0c47b0d5.patch
to fix syntax warnings from python-3.12 when opening vim.
2024-07-13 15:44:57 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Vincent Laporte
f09f7f1778 ocamlPackages.yojson: 1.7.0 → 2.0.2
ocamlPackages.merlin: 3.4.2 → 3.8.0

ocamlPackages.merlin: 4.5 → 4.6

ocamlPackages.{atd,atdgen}: 2.9.1 → 2.10.0

ocamlPackages.elpi: fix build with atd 2.10.0
2022-08-29 08:10:02 +02:00
Ulrik Strid
a13cdfe520 ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
To keep this for the future we also strictDeps where possible, including for janePackages, topkg, oasis and ocamlbuild.
This makes some closures significantly smaller and makes cross compilation easier
2022-02-24 14:39:27 +01:00
sternenseemann
29d77c57ed dot-merlin-reader: 3.4.2 -> 4.1
4.1 uncoupled the versions between merlin and dot-merlin-reader which
means we can and must update them independently of each other since
merlin 4.1 is only available in specific versions for OCaml 4.11 and
4.12 respectively.

Therefore merlin now fetches its own source instead of inheriting it
from dot-merlin-reader.
2021-03-27 17:26:12 +01:00
Vincent Laporte
d9c71767bd ocamlPackages.merlin: 3.4.0 → 3.4.2 2020-12-31 08:17:21 +01:00
Hongchang Wu
4304c709af ocamlPackages.merlin: 3.3.9 -> 3.4.0 2020-10-04 16:57: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
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
d1a51e415d ocamlPackages.merlin: 3.3.4 -> 3.3.6 2020-06-12 04:20:00 -05:00
Vincent Laporte
513e1339c0 ocamlPackages.merlin: 3.3.3 → 3.3.4 2020-04-22 07:24:48 +02:00
Vincent Laporte
2cf477f28d ocamlPackages.merlin: 3.3.2 → 3.3.3 2019-12-11 09:58:21 +01:00
Mario Rodas
f9843befd1 ocamlPackages.merlin: 3.3.1 -> 3.3.2 2019-07-15 16:11:22 +02: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
Théo Zimmermann
794158fcd5 buildDunePackage: new support function; use it to refactor some OCaml derivations 2018-11-07 10:08:03 +01:00
R. RyanTM
baa4483a65 ocamlPackages.merlin: 3.2.1 -> 3.2.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/merlin/versions
2018-10-27 06:24:22 -07:00
Vincent Laporte
1c7c1be1a8 ocamlPackages.merlin: 3.1.0 -> 3.2.1 2018-10-10 17:15:45 +00:00
Vincent Laporte
f3a155e656 ocamlPackages.merlin: 3.0.5 -> 3.1.0 (#42386) 2018-06-25 00:19:58 +02:00
Maxime Dénès
ec28cab25f ocamlPackages.merlin: 3.0.3 -> 3.0.5 2017-12-11 14:35:00 +01:00
Vincent Laporte
fe41e17631 ocamlPackages.merlin: fix homepage URL 2017-10-22 22:14:38 +00:00
Vincent Laporte
d6e423c400 ocamlPackages.merlin: 3.0.2 -> 3.0.3 2017-10-22 13:25:46 +00:00
Jake Waksbaum
a3ba600366 ocamlPackages.merlin: 2.5.4 -> 3.0.2 (#29337) 2017-09-21 19:39:36 +01:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
romildo
1c6abe0230 merlin: 2.5.3 -> 2.5.4
- Update to version 2.5.4.
- Remove dependency on menhir, which seems not needed.
2017-05-29 09:46:47 +02:00
Vincent Laporte
9c87884fdf merlin: 2.5.2 -> 2.5.3 2016-12-01 20:14:26 +00:00
Vincent Laporte
20486458e6 ocamlPackages.merlin: 2.5.1 -> 2.5.2 2016-11-21 19:17:16 +01:00
Vincent Laporte
b7b1e42ea4 ocamlPackages.merlin: 2.5.0 -> 2.5.1 2016-10-23 14:49:17 +02:00
Théophane Hufschmitt
7bb3a04064 ocamlPackages.merlin : 2.3.1 -> 2.5.0
For ocaml > 4.02 only
2016-08-04 14:44:33 +02:00
Vincent Laporte
6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Vincent Laporte
7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00
Vincent Laporte
142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
Vincent Laporte
07536bd1fe merlin: update from 2.1.1 to 2.1.2 2015-03-09 12:07:08 +01:00
Vincent Laporte
db75b5d052 merlin: update from 2.1 to 2.1.1 2015-01-29 08:43:15 +01:00
Vincent Laporte
763b2a7718 merlin: update from 2.0 to 2.1 2015-01-19 12:07:00 +01:00
Vincent Laporte
68b959d655 merlin: update from 1.7.1 to 2.0
Also adds an option to compile the emacs mode at install time.
2014-11-03 13:41:46 +00:00
Vincent Laporte
857c13e1af Minor modifications of some ocaml packages:
adds myself as a maintainer
adds assertions to have evaluation errors rather than build errors
moves opam out of ocamlPackages, as it does not provide a library
2014-09-21 11:02:55 +01:00
Mateusz Kowalczyk
7e5d0ee0c3 s/dependancy/dependency/ 2014-09-10 00:28:49 +01:00
Vincent Laporte
e2db82874c Updates merlin to 1.7.1 2014-08-22 14:56:33 +02:00
Vincent Laporte
e8d2f8f109 merlin: update to 1.7 2014-08-19 18:43:41 +02:00
Vincent Laporte
81f258e7bf merlin: some cleaning of the derivation 2014-08-01 09:42:37 +02:00
Vincent Laporte
f16124d521 Adds merlin
Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
2014-07-05 17:33:55 +02:00