From 9da6b4801716b3311a4931c8b3b5c22e6c437f24 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 3 Jun 2024 20:29:44 -0700 Subject: [PATCH] tag 0.14.1 --- CHANGES.md | 2 +- flake.lock | 14 +++++++------- flake.nix | 31 ++++++++++++++++++++++++------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4e861e85f..3b858709c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -# Unreleased +# 0.14.1 * Support JSX transform with fragments (@tatchi in [#835](https://github.com/reasonml/reason-react/pull/835)) diff --git a/flake.lock b/flake.lock index 5043237c4..f08386fd1 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1716679396, - "narHash": "sha256-TpVGqdxjZp9sevgYEFDMsSJVRrBwmDCv1rnc1oKXeTU=", + "lastModified": 1716844469, + "narHash": "sha256-2Edbn0TOoBC7+AY0rQeoYPFRWK89lVVgrGZxwxYX9rU=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "89b0248f46dec442c13455f97e6e3603969b338d", + "rev": "cd34c0a555802e83b38196719c094c335a6c4f81", "type": "github" }, "original": { @@ -56,17 +56,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716660083, - "narHash": "sha256-QO7cdjtDhx72KEw6m0NOtuE5FS4asaRExZ65uFR/q8g=", + "lastModified": 1716792620, + "narHash": "sha256-wQmXzee/veETYJv93TkRYsAQkEdt2QYCJeJil5SrJfg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", + "rev": "7d7cf1590c05d799745bf456f2b95b798f48d3bb", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", + "rev": "7d7cf1590c05d799745bf456f2b95b798f48d3bb", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 71e92e60b..c42cef48f 100644 --- a/flake.nix +++ b/flake.nix @@ -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 { @@ -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 ]; }; @@ -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; }; }; });