Skip to content

Commit ca7ad77

Browse files
authored
reason-react-ppx: upgrade ppxlib to 0.36 (#883)
* reason-react-ppx: upgrade ppxlib to 0.36 * update * update ppxlib to 0.36.1 * update flake * remove overrides * 5.3 * update flake * melange 6 * upgrade opam-check-npm-deps * check-npm-deps * update flakes * promote tests * 5.2 again * works
1 parent 82eebe8 commit ca7ad77

File tree

15 files changed

+226
-209
lines changed

15 files changed

+226
-209
lines changed

.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = 0.26.0
1+
version = 0.27.0

dune-project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"reason-react helps you use Reason to build React components with deeply integrated, strong, static type safety.\n\nIt is designed and built by people using Reason and React in large, mission critical production React codebases.")
3535
(depends
3636
ocaml
37-
(melange (<= 5.1.0))
37+
(melange (>= 6.0.0))
3838
(reason-react-ppx
3939
(= :version))
4040
(reason
@@ -59,7 +59,7 @@
5959
(reason
6060
(>= 3.12.0))
6161
(ppxlib
62-
(and (>= 0.33.0) (< 0.36.0)))
62+
(>= 0.36.0))
6363
(merlin :with-test)
6464
(ocamlformat
6565
(and

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
1111
let
1212
pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
13-
ocamlPackages = super.ocaml-ng.ocamlPackages_5_3.overrideScope (oself: osuper: {
14-
ppxlib = osuper.ppxlib.overrideAttrs (o: {
15-
propagatedBuildInputs = o.propagatedBuildInputs ++ [ osuper.stdio ];
16-
});
17-
});
13+
ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
1814
});
1915
in
2016
f pkgs);
@@ -23,7 +19,7 @@
2319
packages = forAllSystems (pkgs:
2420
let
2521
inherit (pkgs.ocamlPackages)
26-
buildDunePackage melange merlin ppxlib reason;
22+
buildDunePackage melange merlin ppxlib_gt_0_37 reason;
2723
packages = rec {
2824
reason-react-ppx = buildDunePackage {
2925
pname = "reason-react-ppx";
@@ -44,7 +40,7 @@
4440
# Due to a Reason version mismatch, the generated OCaml PPX diff
4541
# looks different
4642
doCheck = false;
47-
propagatedBuildInputs = [ ppxlib ];
43+
propagatedBuildInputs = [ ppxlib_gt_0_37 ];
4844
};
4945

5046
reason-react = buildDunePackage {
@@ -76,7 +72,7 @@
7672
let
7773
makeDevShell = { packages, release-mode ? false }:
7874
pkgs.mkShell {
79-
# dontDetectOcamlConflicts = true;
75+
dontDetectOcamlConflicts = true;
8076
inputsFrom = pkgs.lib.attrValues packages;
8177
nativeBuildInputs =
8278
with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ]
@@ -89,7 +85,7 @@
8985
]);
9086
propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
9187
};
92-
packages = self.packages.${pkgs.system};
88+
packages = self.packages.${pkgs.stdenv.hostPlatform.system};
9389
in
9490
{
9591
default = makeDevShell { inherit packages; };

package-lock.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)