Skip to content

Commit

Permalink
tag 0.14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro committed Jun 4, 2024
1 parent 9ec7c12 commit 9da6b48
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Unreleased
# 0.14.1

* Support JSX transform with fragments (@tatchi in
[#835](https://github.com/reasonml/reason-react/pull/835))
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.

31 changes: 24 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@
pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
(self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_2; })
];

makeDevShell = { packages, release-mode ? false }:
pkgs.mkShell {
# dontDetectOcamlConflicts = true;
inputsFrom = pkgs.lib.attrValues packages;
nativeBuildInputs =
with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ]
++ pkgs.lib.optionals release-mode (with pkgs; [
cacert
curl
ocamlPackages.dune-release
ocamlPackages.odoc
git
]);
propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
};
in

rec {
Expand All @@ -35,8 +51,10 @@
};
# Due to a Reason version mismatch, the generated OCaml PPX diff
# looks different
doCheck = false;
nativeCheckInputs = [ reason ];
doCheck = true;
checkInputs = [ ];
checkPhase = "dune build @runtest -p reason-react,reason-react-ppx";
nativeCheckInputs = [ reason merlin pkgs.jq ];
propagatedBuildInputs = [ ppxlib ];
};

Expand Down Expand Up @@ -66,11 +84,10 @@
};

devShells = {
default = pkgs.mkShell {
dontDetectOcamlConflicts = true;
inputsFrom = pkgs.lib.attrValues packages;
nativeBuildInputs = with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ];
propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
default = makeDevShell { inherit packages; };
release = makeDevShell {
inherit packages;
release-mode = true;
};
};
});
Expand Down

0 comments on commit 9da6b48

Please sign in to comment.