Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/opam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# disabling this for now

ocaml-compiler:
- 5.2.0
- 5.3.0

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = 0.26.0
version = 0.27.0
6 changes: 3 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"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.")
(depends
ocaml
(melange (<= 5.1.0))
(melange (>= 6.0.0))
(reason-react-ppx
(= :version))
(reason
(>= 3.12.0))
(ocaml-lsp-server :with-dev-setup)
(opam-check-npm-deps
(and
(= 3.0.1)
:dev
:with-dev-setup))
(ocamlformat
(and
Expand All @@ -59,7 +59,7 @@
(reason
(>= 3.12.0))
(ppxlib
(and (>= 0.33.0) (< 0.36.0)))
(>= 0.36.0))
(merlin :with-test)
(ocamlformat
(and
Expand Down
14 changes: 7 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@
forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
let
pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_3.overrideScope (oself: osuper: {
ppxlib = osuper.ppxlib.overrideAttrs (o: {
propagatedBuildInputs = o.propagatedBuildInputs ++ [ osuper.stdio ];
});
});
ocamlPackages = super.ocaml-ng.ocamlPackages_5_3;
});
in
f pkgs);
Expand Down Expand Up @@ -89,7 +85,7 @@
]);
propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
};
packages = self.packages.${pkgs.system};
packages = self.packages.${pkgs.stdenv.hostPlatform.system};
in
{
default = makeDevShell { inherit packages; };
Expand Down
4 changes: 4 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading