Commit Graph

570 Commits

Author SHA1 Message Date
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