Skip to content
Merged
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: 2 additions & 0 deletions .github/workflows/nix-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
- 5_3
- 5_4
- 5_5
- 5_6
include:
- {ocaml-version: 5_5, os: ubuntu-26.04-arm}

Expand All @@ -52,6 +53,7 @@ jobs:
- {ocaml-version: '5_3', os: macos-latest}
- {ocaml-version: '5_4', os: macos-latest}
- {ocaml-version: '5_5', os: macos-latest}
- {ocaml-version: '5_6', os: macos-latest}
runs-on: ${{ matrix.setup.os }}
steps:
- uses: actions/checkout@v7
Expand Down
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
(ocaml
(and
(>= "4.08")
(< "5.6")))
(< "5.7")))
(ocamlfind :build)
(cmdliner
(>= "1.1.0"))
Expand All @@ -62,7 +62,7 @@
(ocaml
(and
(>= "4.08")
(< "5.6")))
(< "5.7")))
(reason
(= :version))
(utop
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

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

3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
let
pkgs = nixpkgs.legacyPackages.${system}.extend (
self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_5;
ocamlPackages = super.ocaml-ng.ocamlPackages_5_6;
}
);
in
Expand All @@ -38,6 +38,7 @@
};
release = pkgs.callPackage ./nix/shell.nix {
reason = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
dune-release = pkgs.ocaml-ng.ocamlPackages_5_5.dune-release;
release-mode = true;
};
});
Expand Down
7 changes: 6 additions & 1 deletion nix/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ let
inherit (lock.nodes.nixpkgs.locked) rev;
allRefs = true;
};
basePkgs = import src { };
in
import src { };
basePkgs.extend (
_self: super: {
ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}";
}
);
in

pkgs.callPackage ./. { doCheck = true; }
1 change: 1 addition & 0 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
cacert,
curl,
git,
dune-release ? ocamlPackages.dune-release,
release-mode ? false,
}:

Expand Down
2 changes: 1 addition & 1 deletion reason.opam
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ homepage: "https://reasonml.github.io/"
bug-reports: "https://github.com/reasonml/reason/issues"
depends: [
"dune" {>= "3.18"}
"ocaml" {>= "4.08" & < "5.6"}
"ocaml" {>= "4.08" & < "5.7"}
"ocamlfind" {build}
"cmdliner" {>= "1.1.0"}
"dune-build-info" {>= "2.9.3"}
Expand Down
2 changes: 1 addition & 1 deletion rtop.opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage: "https://reasonml.github.io/"
bug-reports: "https://github.com/reasonml/reason/issues"
depends: [
"dune" {>= "3.18"}
"ocaml" {>= "4.08" & < "5.6"}
"ocaml" {>= "4.08" & < "5.7"}
"reason" {= version}
"utop" {>= "2.0"}
"cppo"
Expand Down
Loading