diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 63e3f8d..b6e9358 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,8 +25,8 @@ jobs: - ubuntu-latest - windows-latest ocaml-compiler: - - 4.14.x - - 5.0.x + - 5.1.x + - 5.2.x runs-on: ${{ matrix.os }} @@ -57,7 +57,7 @@ jobs: fail-fast: false matrix: ocaml-compiler: - - 4.14.x + - 5.2.x steps: - uses: actions/checkout@v3 - name: Use OCaml ${{ matrix.ocaml-compiler }} diff --git a/flake.lock b/flake.lock index 28e1149..d900fa5 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -34,17 +52,37 @@ } }, "nixpkgs": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1727644383, + "narHash": "sha256-5zVGeKR/NEazNsjwlIgoxjHzvf1W0O7V5DFAc97sLek=", + "owner": "nix-ocaml", + "repo": "nix-overlays", + "rev": "9eb3220e9898a1209d824aafebb3f7b10cf89cd6", + "type": "github" + }, + "original": { + "owner": "nix-ocaml", + "repo": "nix-overlays", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { - "lastModified": 1715534435, - "narHash": "sha256-mEkBIwOuOERXsw+k5xK/Cskz754diaoX2rhePpyOKZg=", - "owner": "nixos", + "lastModified": 1727631725, + "narHash": "sha256-3BhOfmcg9Pxjm/kU+IVYe76CvHL6zArK9ktlCJeP06E=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6046e8807481cfcbc143897f2e323772d251b693", + "rev": "b5c4f45cfcaa5a44632c7119922987e131249cd2", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", + "rev": "b5c4f45cfcaa5a44632c7119922987e131249cd2", "type": "github" } }, @@ -69,6 +107,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 951d7f6..31992de 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs.nix-filter.url = "github:numtide/nix-filter"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:nixos/nixpkgs"; + inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays"; outputs = { self, nixpkgs, flake-utils, nix-filter }: flake-utils.lib.eachDefaultSystem (system: diff --git a/lev-fiber-csexp/test/dune b/lev-fiber-csexp/test/dune index 0d144a3..2bbfcf4 100644 --- a/lev-fiber-csexp/test/dune +++ b/lev-fiber-csexp/test/dune @@ -13,7 +13,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests) diff --git a/lev-fiber/test/dune b/lev-fiber/test/dune index fb24190..441635f 100644 --- a/lev-fiber/test/dune +++ b/lev-fiber/test/dune @@ -11,7 +11,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests) diff --git a/lev-fiber/test/util/dune b/lev-fiber/test/util/dune index e903c60..2929abb 100644 --- a/lev-fiber/test/util/dune +++ b/lev-fiber/test/util/dune @@ -9,7 +9,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests) diff --git a/lev/test/dune b/lev/test/dune index e4b014b..5bc7a91 100644 --- a/lev/test/dune +++ b/lev/test/dune @@ -7,7 +7,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests) @@ -23,7 +23,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests @@ -42,7 +42,7 @@ ;; in dune-project ppx_expect.config ppx_expect.config_types - ppx_expect.common + ppx_expect base ppx_inline_test.config) (inline_tests