Commit Graph

634 Commits

Author SHA1 Message Date
Sandro
0a318e1e70
Merge pull request #165058 from r-ryantm/auto-update/ocaml4.13.1-ocamlbuild 2022-03-27 15:12:51 +02:00
Vincent Laporte
2a51eebfb7 ocaml-ng.ocamlPackages_4_01_0.cppo: fix build 2022-03-24 09:45:20 +01:00
Vincent Laporte
5dbd4b2b27 ocamlPackages.ocamlscript: 2.0.3 → 3.0.0 2022-03-22 09:43:05 +01:00
R. Ryantm
2bf2a759db ocamlPackages.ocamlbuild: 0.14.0 -> 0.14.1 2022-03-21 04:22:29 +00:00
Vincent Laporte
0b29a7d688 ocamlPackages.utop: 2.8.0 → 2.9.0 2022-03-14 16:23:31 +01:00
Vincent Laporte
b5359c444e buildDunePackage: use dune_2 by default 2022-03-13 21:19:09 +01:00
Mario Rodas
7cd45cc147
Merge pull request #162643 from r-ryantm/auto-update/dune
dune_3: 3.0.2 -> 3.0.3
2022-03-13 12:53:54 -05:00
Vincent Laporte
28b02ff09c ocamlformat: build versions [0.17.0; 0.19.0[ with OCaml 4.12 2022-03-04 16:09:07 +01:00
Vincent Laporte
315ed6fad0 ocamlPackages.camlp5: disable for OCaml ≥ 4.13 2022-03-04 16:09:07 +01:00
R. Ryantm
94e16d346b dune_3: 3.0.2 -> 3.0.3 2022-03-03 15:10:39 +00:00
R. Ryantm
0de0c6049c opaline: 0.3.2 -> 0.3.3 2022-03-02 12:07:54 +00:00
Vincent Laporte
70e51d715e ocamlPackages.lambda-term: 3.1.0 → 3.2.0
And fix the attribute name that used to be “lambdaTerm”
2022-03-01 09:32:26 +01: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
Mario Rodas
3994eb975a dune_3: init at 3.0.2 2022-02-18 12:47:14 +01:00
Vladimír Čunát
3dfddd89c6
Merge branch 'master' into staging-next
Trivial conflict in pkgs/top-level/aliases.nix
2022-02-06 10:29:49 +01:00
Vincent Laporte
05f127a994 dune_2: 2.9.2 → 2.9.3 2022-02-05 19:13:13 +01:00
Jonathan Ringer
9a16965c75
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/awesomeversion/default.nix
	pkgs/development/python-modules/md2gemini/default.nix
	pkgs/development/python-modules/mill-local/default.nix
	pkgs/development/python-modules/pyatv/default.nix
	pkgs/development/python-modules/pyezviz/default.nix
	pkgs/development/python-modules/pyinsteon/default.nix
	pkgs/development/python-modules/pylitterbot/default.nix
	pkgs/development/python-modules/pynuki/default.nix
	pkgs/development/python-modules/pypck/default.nix
	pkgs/development/python-modules/types-requests/default.nix
	pkgs/top-level/aliases.nix
2022-02-03 21:29:24 -08:00
Artturi
0f491bd7a3
Merge pull request #157264 from FliegendeWurst/disable-broken-parallel 2022-02-03 16:04:57 +02:00
FliegendeWurst
6f930f18f0 ocamlPackages.camlp4: disable parallel build 2022-02-02 12:14:36 +01:00
FliegendeWurst
6282d34ad4 ocamlPackages.camlidl: disable parallel build 2022-02-02 11:57:19 +01:00
github-actions[bot]
ce60c22080
Merge staging-next into staging 2022-01-30 06:01:52 +00:00
Sandro
709f7b3c61
Merge pull request #156746 from Stunkymonkey/treewide-pname-version-8 2022-01-30 01:26:37 +01:00
Felix Buehler
a4cf5b79fd treewide: rename name to pname&version 2022-01-27 17:29:01 +01:00
Dmitry Kalinkin
0693fd77f7
Merge branch 'staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
	nixos/doc/manual/release-notes/rl-2205.section.md
	pkgs/development/python-modules/aioesphomeapi/default.nix
	pkgs/development/python-modules/mat2/default.nix
	pkgs/development/python-modules/pydevccu/default.nix
	pkgs/development/python-modules/pywlroots/default.nix
	pkgs/development/python-modules/rokuecp/default.nix
2022-01-27 00:54:10 -05:00
Guillaume Girol
1ad781df88
Merge pull request #156500 from Stunkymonkey/ocamlbuild-pname-version
ocamlPackages.ocamlbuild: rename name to pname&version
2022-01-25 20:48:01 +00:00
github-actions[bot]
077faa4635
Merge staging-next into staging 2022-01-25 12:01:49 +00:00
Mario Rodas
f8ea1ec9ce
dune_2: 2.9.1 -> 2.9.2 (#156329)
https://github.com/ocaml/dune/releases/tag/2.9.2
2022-01-25 10:53:20 +01:00
Alyssa Ross
1a60dd2adc
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/cupy/default.nix
	pkgs/development/python-modules/staticjinja/default.nix
2022-01-24 15:39:34 +00:00
Felix Buehler
4861b5971b ocamlPackages.ocamlbuild: rename name to pname&version 2022-01-24 14:48:05 +01:00
José Romildo Malaquias
0522e55f99
ocamlPackages.ppxlib: 0.23.0 -> 0.24.0 (#154901)
* ocamlPackages.ppxlib: 0.23.0 -> 0.24.0

* ocamlPackages.bls12-381{,-unix}: 0.4.2 -> 1.1.0

- Update to version 1.1.0
- Use the same revision tag used in the opam repository, as the release tarbal seems to be unavailable
- Does not depend on bls12-381-gen and rust anymore

* ocamlPackages.bls12-381-{gen: 0.4.2 -> 0.4.4,legacy: init at 0.4.4}

- Update bls12-381-gen to version 0.4.4
- Add new package bls12-381-legacy

* ocamlPackages.tezos-*: 10.2 -> 11.0

- Update tezos to version 11.0
- Add new packages:
    tezos-base-test-helpers
    tezos-embedded-protocol-demo-noops
    tezos-event-logging-test-helpers
    tezos-protocol-alpha
    tezos-protocol-demo-noops
    tezos-protocol-plugin-alpha
    tezos-protocol-demo-noops
    tezos-protocol-plugin-alpha
    tezos-shell-services-test-helpers
- Remove old package:
    tezos-test-services

* ocamlPackages.repr: 0.4.0 -> 0.5.0

* ocamlPackages.hacl-star-raw: 0.3.2 -> 0.4.5

* ocamlPackages.arp: 2.3.2 -> 3.0.0

* ocamlPackages.index: 1.4.1 -> 1.5.0

* ocamlPackages.digestif: 1.0.0 -> 1.1.0

* ocamlPackages.ethernet: 2.2.0 -> 3.0.0

* ocamlPackages.httpaf: 0.6.6 -> 0.7.1

* ocamlPackages.mirage-nat: 2.2.3 -> 2.2.5

* ocamlPackages.tcpip: 6.2.0 -> 7.0.1

* ocamlPackages.paf: 0.0.6 -> 0.0.8

* ocamlPackages.ppx_irmin: 2.7.2 -> 2.9.1

* ocamlPackages.tezos-*: add missing packages, needed by ligo-0.34

* ocamlPackages.ocaml-recovery-parser: init at 0.2.2

* ligo: 0.27.0 -> 0.34.0
2022-01-23 21:24:16 +01:00
Guillaume Girol
8c34758962
Merge pull request #152276 from symphorien/ocaml-destdir-nix-shell
ocamlPackages.findlib: don't wait configurePhase to set OCAMLFIND_DESTDIR
2022-01-23 17:37:57 +00:00
Guillaume Girol
9a778368f2 ocamlPackages.findlib: move destdir creation to installPhase
allows to use configurePhase in nix-shell
2022-01-23 12:00:00 +00:00
Rudi Grinberg
a7f4d6bae9
ocamlformat: 0.20.0 and 0.20.1 (#152199)
* ocaml-version: 3.1.0 -> 3.4.0

* ocamlformat: 0.19.0 -> 0.20.0

* odoc-parser: refactor use version variable

use version to compute the uri for the archive

* odoc-parser: 0.9.0 -> 1.0.0

* odoc-parser: allow multiple versions

allow both 0.9.0 and 1.0.0 to accommodate different version of
ocamlformat

* ocamlformat: 0.20.0 -> 0.20.1
2022-01-03 10:02:28 +01:00
Guillaume Girol
79fb9f824e ocamlPackages.findlib: don't wait configurePhase to set OCAMLFIND_DESTDIR
this fixes ocamlfind printconf destdir inside nix-shell

fixes #152028

the regression was introduced by
a3ab43d3a4 which was meant to fix building
ocamlPackages.ocamlbuild with strictDeps. This commit keeps ocamlbuild
building.
2021-12-26 12:00:00 +00:00
Vincent Laporte
71a636dafd ocamlPackages.js_of_ocaml: 3.10.0 → 3.11.0 2021-12-20 18:09:47 +01:00
Mario Rodas
130ceb50bb opam: 2.1.1 -> 2.1.2
https://github.com/ocaml/opam/releases/tag/2.1.2
2021-12-08 13:35:00 -05:00
Yestin L. Harrison
64ed431483 camlp4: add new versions 2021-12-07 17:28:39 +01:00
Vincent Laporte
9cb58616cc ocamlPackages.merlin: 4.3.1 → 4.4 2021-12-01 13:11:26 +01:00
Vincent Laporte
a5552c62db obelisk: 0.5.2 → 0.6.0 2021-11-29 10:44:07 +01:00
sternenseemann
34b47c5c68 dune-release: 1.5.0 -> 1.5.2
https://github.com/ocamllabs/dune-release/releases/tag/1.5.1
https://github.com/ocamllabs/dune-release/releases/tag/1.5.2
2021-11-17 17:35:16 +01:00
Mario Rodas
f487c6a5af opam: 2.1.0 -> 2.1.1
https://github.com/ocaml/opam/releases/tag/2.1.1
2021-11-06 16:38:36 -05:00
Vincent Laporte
81797521af ocamlPackages.merlin: fix tests on darwin 2021-11-05 17:05:35 +01:00
Sandro Jäckel
195845a10c
ocamlPackages.ocaml-top: subsitute version 2021-10-31 13:30:05 +01:00
Felix Buehler
c1b85df6ad obuild: switch to fetchFromGitHub 2021-10-30 13:10:23 -07:00
Felix Buehler
1dcfdaf9eb ocaml-top: switch to fetchFromGitHub 2021-10-30 13:10:23 -07:00
Felix Buehler
bcf11847a2 ocamlPackages.ocp-indent: switch to fetchFromGitHub 2021-10-30 13:10:23 -07:00
Felix Buehler
8f1a669d9f ocsigen-i18n: switch to fetchFromGitHub 2021-10-30 13:10:23 -07:00
Vincent Laporte
c535db45ce ocamlPackages.cppo: 1.6.7 → 1.6.8 2021-10-28 07:31:58 +02:00
Vincent Laporte
c7266c501e ocamlPackages.ocp-build: fix build 2021-10-21 07:18:38 +02:00
Delta
d7442dc613 ocamlPackages.merlin: 4.1 → 4.3.1 2021-10-03 18:59:26 +02:00
github-actions[bot]
912b8082df
Merge master into staging-next 2021-09-10 00:01:31 +00:00
Vincent Laporte
70a469d855 ocamlPackages.js_of_ocaml: 3.9.1 → 3.10.0 2021-09-09 21:21:52 +02:00
github-actions[bot]
8cd1da2362
Merge master into staging-next 2021-09-09 00:01:35 +00:00
Mario Rodas
d8dcebe545 dune_2: 2.9.0 -> 2.9.1
https://github.com/ocaml/dune/releases/tag/2.9.1
2021-09-08 23:54:40 +02:00
Ryan Burns
6310613bb0 ocamlPackages.ocaml_oasis: fix build
Add missing pre/post hooks - preConfigure is now required,
as findlib sets a necessary preConfigure hook
2021-09-06 22:41:05 +09:00
Guillaume Girol
a5c133a4b4 ocamlbuild: fix build
findlib's setup hook is now a preConfigure setup hook, so make sure to
run it
2021-08-19 12:00:00 +00:00
Guillaume Girol
a17fc03375 pkgsStatic.ocaml-ng: migrate static adapter to derivations themselves 2021-08-19 09:32:03 +02:00
Guillaume Girol
41e07ee477 pkgsStatic.ocaml-ng: migrate more logic to derivations 2021-08-19 09:30:48 +02:00
Guillaume Girol
9ae5ae736a opaline: fix static build 2021-08-19 09:30:48 +02:00
Guillaume Girol
ce31d529bc ocamlbuild: fix static cross 2021-08-19 09:30:48 +02:00
Guillaume Girol
a3ab43d3a4 ocamlPackages.findlib: create destdir even when there are no buildInputs 2021-08-19 09:30:48 +02:00
Guillaume Girol
e98be5d5e0 ocamlPackages.findlib: refactor 2021-08-19 09:30:48 +02:00
Guillaume Girol
4c0020beab ocamlPackages.findlib: fix buildInputs vs nativeBuildInputs 2021-08-19 09:30:47 +02:00
Guillaume Girol
2c35af2205 dune: fix buildInputs vs nativeBuildInputs 2021-08-19 09:30:47 +02:00
Felix Buehler
a8a8ce4700 omake: deprecate phases 2021-08-16 22:26:34 +02:00
Mario Rodas
dd3049da63 ocamlPackages.ocp-index: 1.2.2 -> 1.3.1 2021-08-12 14:03:04 +02:00
Sandro Jäckel
94f66d6b9f
dune-release: remove -f from rm -rf 2021-08-02 10:58:47 +02:00
Ben Siraphob
e0cef70443
Merge pull request #131572 from marsam/update-opam
opam: 2.0.8 -> 2.1.0
2021-08-01 12:32:59 +07:00
Ben Siraphob
2f94991628 treewide: fix redirected URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2021-08-01 00:01:50 +07:00
sternenseemann
6f460f1127 dune-release: apply yes broken pipe fix in additional places
Seems the use of yes increased and we need to fix it in additional
places. Alternatively we could ofcourse find out why SIGHUP is trapped
somewhere?!
2021-07-29 14:14:15 +02:00
sternenseemann
0876c079f7 dune-release: remove now unnecessary test fixes
We've upstreamed those git fixes.
2021-07-29 14:13:51 +02:00
Mario Rodas
707f6106fe ocamlformat: 0.18.0 -> 0.19.0
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.19.0
2021-07-29 05:00:19 +02:00
Felix Buehler
327cb2e9f0 ocamlPackages.utop: deprecate phases 2021-07-27 14:11:06 +02:00
Mario Rodas
bef038a486 dune-release: 1.4.0 -> 1.5.0
https://github.com/ocamllabs/dune-release/releases/tag/1.5.0
2021-07-26 04:20:00 +00:00
Mario Rodas
5a7e27afe1 opam: 2.0.8 -> 2.1.0
https://github.com/ocaml/opam/releases/tag/2.1.0
2021-07-26 04:20:00 +00:00
github-actions[bot]
f2eada4ab8
Merge master into staging-next 2021-07-18 06:01:33 +00:00
Felix Buehler
87316d778b various: cleanup of "inherit version;" 2021-07-18 00:19:24 +02:00
Sandro
1619046572
Merge pull request #126894 from Stunkymonkey/pname&version 2021-07-05 18:52:04 +02:00
Mario Rodas
246f3da399 dune_2: 2.8.5 -> 2.9.0
https://github.com/ocaml/dune/releases/tag/2.9.0
2021-07-02 00:42:09 +02:00
Felix Buehler
6f04cd0e69 application/development: /s/name/pname&version/ 2021-06-30 09:55:22 +02:00
Felix Buehler
1e7f88a523 camlp5: replace fetchzip with fetchFromGitHub 2021-06-30 09:53:51 +02:00
Vincent Laporte
4f3bc6aa7f ocamlPackages.utop: 2.7.0 → 2.8.0 2021-06-28 08:48:48 +02:00
Vincent Laporte
a29a3981ef ocamlPackages.ocaml-migrate-parsetree: 2.1.0 → 2.2.0 2021-06-26 17:07:42 +02:00
Vincent Laporte
5ca9831cb1 ocamlPackages.menhir: 20190626 → 20210419
ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419
2021-06-05 13:38:01 +02:00
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