|
7 | 7 | outputs = { self, nixpkgs, flake-utils }: |
8 | 8 | flake-utils.lib.eachDefaultSystem (system: |
9 | 9 | let |
10 | | - pkgs = (import nixpkgs { |
11 | | - inherit system; |
12 | | - overlays = [ |
13 | | - (final: prev: { |
14 | | - ocamlPackages = prev.ocamlPackages.overrideScope' (oself: osuper: { |
15 | | - ctypes-foreign = osuper.ctypes-foreign.overrideAttrs (_: { doCheck = false; }); |
16 | | - ctypes = osuper.ctypes.overrideAttrs (_: { doCheck = false; }); |
17 | | - mdx = osuper.mdx.override { |
18 | | - # workaround for: |
19 | | - # https://github.com/NixOS/nixpkgs/pull/241476/commits/1ed74f3536d29e5635d7f47a1d7b82a89f5a8077 |
20 | | - logs = oself.logs; |
21 | | - }; |
22 | | - }); |
23 | | - }) |
24 | | - ]; |
| 10 | + pkgs = import nixpkgs { inherit system; }; |
| 11 | + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_5_4.overrideScope (oself: osuper: { |
| 12 | + ctypes-foreign = osuper.ctypes-foreign.overrideAttrs (_: { doCheck = false; }); |
| 13 | + ctypes = osuper.ctypes.overrideAttrs (_: { doCheck = false; }); |
| 14 | + mdx = (osuper.mdx.override { |
| 15 | + # workaround for: |
| 16 | + # https://github.com/NixOS/nixpkgs/pull/241476/commits/1ed74f3536d29e5635d7f47a1d7b82a89f5a8077 |
| 17 | + logs = oself.logs; |
| 18 | + }).overrideAttrs (_: { doCheck = false; }); |
| 19 | + cmdliner = osuper.cmdliner.overrideAttrs (old: rec { |
| 20 | + version = "2.1.0"; |
| 21 | + src = pkgs.fetchFromGitHub { |
| 22 | + owner = "dbuenzli"; |
| 23 | + repo = "cmdliner"; |
| 24 | + rev = "v${version}"; |
| 25 | + sha256 = "sha256-ebe5I77zEKoehJ55ZszV0dQP4ZDfVpGXqDsEb2qEE24="; |
| 26 | + }; |
| 27 | + }); |
25 | 28 | }); |
26 | | - inherit (pkgs.ocamlPackages) buildDunePackage; |
| 29 | + inherit (ocamlPackages) buildDunePackage; |
27 | 30 | pkg = attrs: buildDunePackage ({ |
28 | 31 | version = "n/a"; |
29 | 32 | src = ./. ; |
30 | 33 | duneVersion = "3"; |
31 | 34 | doCheck = true; |
32 | 35 | } // attrs); |
33 | | - ocamlformat = pkgs.ocamlformat_0_26_2; |
| 36 | + ocamlformat = pkgs.ocamlformat_0_27_0; |
34 | 37 | in |
35 | | - with pkgs.ocamlPackages; rec { |
| 38 | + with ocamlPackages; rec { |
36 | 39 | packages = rec { |
37 | 40 | default = http; |
38 | 41 | http = pkg { |
|
108 | 111 | checkInputs = [ |
109 | 112 | alcotest eio mdx ppx_here |
110 | 113 | tls-eio |
111 | | - mirage-crypto-rng-eio |
| 114 | + mirage-crypto-rng |
112 | 115 | ]; |
113 | 116 | propagatedBuildInputs = [ cohttp eio logs uri fmt ptime http ]; |
114 | 117 | }; |
|
129 | 132 | }; |
130 | 133 | devShells.default = pkgs.mkShell { |
131 | 134 | inputsFrom = pkgs.lib.attrValues packages; |
132 | | - buildInputs = [ ocamlformat ] ++ (with pkgs.ocamlPackages; [ |
| 135 | + buildInputs = [ ocamlformat ] ++ (with ocamlPackages; [ |
133 | 136 | ocaml-lsp |
134 | 137 | ]); |
135 | 138 | }; |
136 | 139 | devShells.eio = pkgs.mkShell { |
137 | 140 | inputsFrom = [ cohttp-eio ]; |
138 | | - buildInputs = [ ocamlformat ] ++ (with pkgs; [ |
139 | | - ocamlPackages.ocaml-lsp gmp libev nmap curl |
| 141 | + buildInputs = [ ocamlformat ocamlPackages.ocaml-lsp ] ++ (with pkgs; [ |
| 142 | + gmp libev nmap curl |
140 | 143 | ]); |
141 | 144 | }; |
142 | 145 | }); |
|
0 commit comments