Skip to content

Commit

Permalink
Prepare for 3.8.2 (#2673)
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro authored Oct 15, 2022
1 parent 3f90924 commit 6e6c3a7
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 37 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.8.2

- Fix magic numbers for OCaml 5.0 (@anmonteiro) [#2671](https://github.com/reasonml/reason/pull/2671)

## 3.8.1

- (Internal) Rename: Reason_migrate_parsetree -> Reason_omp (@ManasJayanth) [#2666](https://github.com/reasonml/reason/pull/2666)
Expand Down
2 changes: 1 addition & 1 deletion dune
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(ignored_subdirs (node_modules js))
(dirs :standard \ node_modules js)
42 changes: 29 additions & 13 deletions flake.lock

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

17 changes: 14 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
{
description = "Nix Flake for ReasonML";

inputs.nix-filter.url = "github:numtide/nix-filter";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:anmonteiro/nix-overlays";

outputs = { self, nixpkgs, flake-utils }:
outputs = { self, nixpkgs, flake-utils, nix-filter }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_00;
});
in
rec {
packages.default = pkgs.callPackage ./nix { };
devShells.default = pkgs.callPackage ./shell.nix { };
packages.default = pkgs.callPackage ./nix {
nix-filter = nix-filter.lib;
};
devShells = {
default = pkgs.callPackage ./nix/shell.nix {
reason = packages.default;
};
release = pkgs.callPackage ./nix/shell.nix {
reason = packages.default;
release-mode = true;
};
};
});
}
9 changes: 4 additions & 5 deletions nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs }:
{ pkgs, nix-filter }:

let
inherit (pkgs) stdenv lib ocamlPackages;
Expand All @@ -9,10 +9,9 @@ ocamlPackages.buildDunePackage {
pname = "reason";
version = "0.0.1-dev";

src = lib.filterGitSource {
src = ./..;
dirs = [ "scripts" "src" "formatTest" ];
files = [ "dune" "dune-project" "reason.opam" "rtop.opam" ];
src = nix-filter.filter {
root = ./..;
include = [ "dune" "dune-project" "reason.opam" "rtop.opam" "scripts" "src" "formatTest" ];
};

useDune2 = true;
Expand Down
26 changes: 26 additions & 0 deletions nix/shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ mkShell
, ocamlPackages
, reason
, stdenv
, lib
, cacert
, curl
, git
, release-mode ? false
}:

mkShell {
inputsFrom = [ reason ];
buildInputs = with ocamlPackages; [
utop
merlin
]
++ (if release-mode then [
cacert
curl
ocamlPackages.dune-release
git
] else [ ])
;

}
2 changes: 1 addition & 1 deletion reason.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esy-ocaml/reason",
"version": "3.8.1",
"version": "3.8.2",
"license": "MIT",
"description": "Native Compiler Support for Reason: Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
"repository": {
Expand Down
14 changes: 0 additions & 14 deletions shell.nix

This file was deleted.

0 comments on commit 6e6c3a7

Please sign in to comment.