From 33a65de549b75867b9288963e27215b34ecc3832 Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Tue, 5 Dec 2023 12:07:44 -0600 Subject: Update nix --- flake.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 7cc04fd..97e364f 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,16 @@ materializedDefsToScope materializeOpamProject'; package = "wormhole"; + devPackagesQuery = { + ocaml-lsp-server = "*"; + ocamlformat = "*"; + # 1.9.6 fails to build + ocamlfind = "1.9.5"; + utop = "*"; + }; query = { ocaml-base-compiler = "*"; + ocamlformat = "*"; }; overlay = final: prev: { "${package}" = prev.${package}.overrideAttrs (_: { @@ -33,6 +41,7 @@ ]; }); }; + devBuildInputs = [ pkgs.ocamlPackages.ocamlformat ]; resolved-scope = let scope = buildOpamProject { } package ./. query; in scope.overrideScope' overlay; @@ -51,7 +60,7 @@ defaultPackage = packages.materialized.${package}; devShells.default = pkgs.mkShell { inputsFrom = [ defaultPackage ]; - buildInputs = []; + buildInputs = devBuildInputs; }; } ); -- cgit v1.2.3