Skip to content

Commit 7869c29

Browse files
authored
Build on OCaml 4.11 (#55)
1 parent 1fe8286 commit 7869c29

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
ocamlVersion: [4_08, 4_09, 4_10]
12+
ocamlVersion: [4_08, 4_09, 4_10, 4_11]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: cachix/install-nix-action@v8

nix/default.nix

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,40 @@
11
{ pkgs ? import ./sources.nix { inherit ocamlVersion; }
2-
, ocamlVersion ? "4_09" }:
2+
, ocamlVersion ? "4_10" }:
33

44
let
55
inherit (pkgs) lib stdenv ocamlPackages;
66
in
77

88
with ocamlPackages;
99
let
10+
genSrc = { dirs, files }: lib.filterGitSource {
11+
src = ./..;
12+
inherit dirs;
13+
files = files ++ [ "dune-project" ];
14+
};
1015
build-lambda-runtime = args: buildDunePackage ({
1116
useDune2=true;
1217
version = "0.1.0-dev";
13-
src = lib.gitignoreSource ./..;
1418
} // args);
1519

1620
in rec {
1721
lambda-runtime = build-lambda-runtime {
1822
pname = "lambda-runtime";
23+
src = genSrc {
24+
dirs = [ "lib" ];
25+
files = [ "lambda-runtime.opam" ];
26+
};
1927
buildInputs = [ alcotest ];
2028
doCheck = false;
21-
propagatedBuildInputs = [ yojson ppx_deriving_yojson piaf uri logs lwt4 ];
29+
propagatedBuildInputs = [ yojson ppx_deriving_yojson piaf uri logs lwt ];
2230
};
2331

2432
now = build-lambda-runtime {
2533
pname = "now";
34+
src = genSrc {
35+
dirs = [ "now" "test" ];
36+
files = [ "now.opam" ];
37+
};
2638
buildInputs = [ alcotest ];
2739
# tests lambda-runtime too
2840
doCheck = true;
@@ -31,7 +43,7 @@ in
3143
httpaf
3244
yojson
3345
ppx_deriving_yojson
34-
lwt4
46+
lwt
3547
base64
3648
];
3749
};

nix/sources.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
let
44
overlays =
55
builtins.fetchTarball
6-
https://github.com/anmonteiro/nix-overlays/archive/3fb1555.tar.gz;
6+
https://github.com/anmonteiro/nix-overlays/archive/957c4eb.tar.gz;
77

88
in
99

0 commit comments

Comments
 (0)