JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
293,354 Commits 2 Branches 0 Tags 12 GiB
42b70ad7f1
Commit Graph

500 Commits

Author SHA1 Message Date
Joachim Breitner
41b485f7c4 dune.nix: Include dune version in warning when dune is not supported 
as dune 1 and dune 2 have different version ranges here
 2021-05-19 14:07:20 +02:00
Vincent Laporte
44339cc0b0 ocamlPackages.ocp-build: fix compilation with OCaml 4.12 2021-04-27 08:42:50 +02:00
Vincent Laporte
9ffb287d75 ocamlformat: build versions < 0.17 with OCaml 4.10 2021-04-27 08:42:50 +02:00
Mario Rodas
212adc0c99 ocamlformat: 0.17.0 -> 0.18.0 
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.18.0
 2021-04-01 04:20:00 +00:00
Vincent Laporte
b729d4080a
ocamlPackages.ocp-indent: use Dune 2 2021-04-11 14:32:14 +02:00
github-actions[bot]
01b3d1558f
Merge staging-next into staging 2021-03-30 18:15:09 +00:00
Mario Rodas
d1ccfb3d18 dune_2: 2.8.4 -> 2.8.5 
https://github.com/ocaml/dune/releases/tag/2.8.5
 2021-03-30 16:46:15 +02:00
github-actions[bot]
bef3b9438a
Merge staging-next into staging 2021-03-27 18:14:11 +00:00
sternenseemann
ef6450411f ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1 
Add nix expression for the OCaml-version specific versions of merlin
4.1 and conditionally call it in ocaml-packages.nix.
 2021-03-27 17:26:12 +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
github-actions[bot]
219312a10b
Merge staging-next into staging 2021-03-26 12:06:44 +00: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
R. RyanTM
274fc0f668 ocamlPackages.findlib: 1.8.1 -> 1.9.1 2021-03-22 20:42:50 +00: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
github-actions[bot]
3b97019142
Merge master into staging-next 2021-03-14 06:17:28 +00:00
Jules Aguillon
3bece16153 ocamlformat: 0.16.0 -> 0.17.0 
Adds 'ocamlformat_0_17_0' and update 'ocamlformat'.
 2021-03-12 16:29:02 +01:00
github-actions[bot]
5d13702776
Merge master into staging-next 2021-03-09 12:25:54 +00:00
Mario Rodas
a262124577 dune_2: 2.8.2 -> 2.8.4 
https://github.com/ocaml/dune/releases/tag/2.8.3
https://github.com/ocaml/dune/releases/tag/2.8.4
 2021-03-09 12:34:56 +01:00
github-actions[bot]
dcea8212b5
Merge staging-next into staging 2021-03-07 12:20:40 +00:00
Vincent Laporte
a104d2b18c ocamlPackages.dune_1: disable for OCaml ≥ 4.12 2021-03-07 12:07:14 +01:00
Vincent Laporte
60785fe4db ocamlPackages.dune: rename into dune_1 2021-03-07 12:07:14 +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
Mario Rodas
7043f00adc ocamlPackages.ocp-index: 1.2.1 -> 1.2.2 2021-02-26 04:20:00 +00:00
R. RyanTM
eddb81ccd8 ocsigen-i18n: 3.5.0 -> 3.7.0 2021-02-25 22:21:30 -05:00
Vincent Laporte
0f24f12bb4
ocamlPackages.crunch: use Dune 2 2021-02-25 22:12:12 +01:00
github-actions[bot]
54795a5689
Merge staging-next into staging 2021-02-21 12:19:46 +00:00
github-actions[bot]
cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
sternenseemann
cdb97ba523 ocamlPackages.ocamlmod: disable tests if ounit is not available 
When we redid ounit and ounit2, the minimumOCamlVersion was also pushed
to OCaml 4.04. ocamlmod builds on earlier versions as well, but doesn't
evaluate if we pull in ounit.

Therefore we conditionally disable tests for OCaml < 4.04 which means
for example oasis is available for those versions again as well.
 2021-02-21 10:12:22 +01:00
Ben Siraphob
127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Jan Tojnar
8f50f1ce10
Merge branch 'staging-next' into staging 
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
 2021-02-19 17:15:31 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
R. RyanTM
2f6523f96b ocamlPackages.utop: 2.6.0 -> 2.7.0 2021-02-19 08:15:26 +01:00
Vincent Laporte
d0e7e493ca
ocamlPackages.ocp-index: use Dune 2 2021-02-13 10:59:13 +01:00
Vincent Laporte
1106f2d1ac
ocaml-top: use Dune 2 2021-02-13 10:55:12 +01:00
Mario Rodas
0d01108677 opam: 2.0.7 -> 2.0.8 
https://github.com/ocaml/opam/releases/tag/2.0.8
 2021-02-09 04:20:00 +00:00
sternenseemann
f0a821afc5 opam-installer: init at 2.0.7 2021-01-26 08:17:31 +01:00
Jörg Thalheim
09f47ac855
Merge branch 'master' into development-tools-stdenv-lib 2021-01-23 15:57:23 +00:00
Mario Rodas
9d6fd2ba13 dune_2: 2.8.0 -> 2.8.2 
https://github.com/ocaml/dune/releases/tag/2.8.1
https://github.com/ocaml/dune/releases/tag/2.8.2
 2021-01-23 16:09:22 +01:00
Ben Siraphob
c522fec274 pkgs/development/tools: stdenv.lib -> lib 2021-01-23 20:30:03 +07:00
Jules Aguillon
bf010dac66
ocamlformat: Add versions 0.15.1 and 0.16.0 2021-01-22 09:10:02 +01:00
sternenseemann
095ef20a24 dune: stdenv.lib → lib 
Reference #108938.
 2021-01-21 11:26:26 +01:00
sternenseemann
f3704de649 dune: let dune install itself 2021-01-21 11:26:26 +01:00
zowoq
932941b79c treewide: editorconfig fixes 
- remove trailing whitespace
- use spaces for indentation
 2021-01-21 13:29:54 +10:00
zowoq
31f5dd3f36 treewide: editorconfig fixes 
- remove trailing whitespace
- use spaces for indentation
 2021-01-20 09:11:11 +10:00
Antonio Nuno Monteiro
80bf06e78b dune_2: 2.7.1 -> 2.8.0 2021-01-19 15:15:02 +01:00
sternenseemann
c955b30d4c dune-release: fix tests for newer git versions 
Newer git versions show a hint when calling `git init` to set the
default initial branch to something like 'main'. This obviously is
printed to stderr and thus not hidden by `> /dev/null`. We fix the
ensuing test failure by setting a branch in the invocation.
 2021-01-13 09:54:56 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib; 
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
 2021-01-11 10:38:22 +01:00
Vincent Laporte
b3351951b0 ocamlPackages.camlp5: 7.13 → 7.14 2021-01-09 14:00:53 +01:00
Vincent Laporte
6b0396351e ocamlPackages.lambdaTerm: 2.0.3 → 3.1.0 
ocamlPackages.utop: 2.4.3 → 2.6.0
 2021-01-05 18:23:20 +01:00