diff --git a/default.nix b/default.nix index 21e15eb..737856e 100644 --- a/default.nix +++ b/default.nix @@ -30,7 +30,6 @@ buildDunePackage { ./flake.lock ./flake_env.opam ./direnvrc - ./LICENSE ]; }; duneVersion = "3"; @@ -42,9 +41,16 @@ buildDunePackage { postInstall = '' install -m400 -D direnvrc $out/share/flake_env/direnvrc ''; + buildInputs = [ + core + core_unix + ppx_yojson_conv + ppx_yojson_conv_lib + re + sha + ]; checkInputs = [ alcotest bisect_ppx ]; nativeBuildInputs = [ reason ]; - propagatedBuildInputs = [ core core_unix findlib ocaml ppx_yojson_conv ppx_yojson_conv_lib re sha ]; meta = with lib; { description = "Yet another flake plugin for direnv"; diff --git a/flake.nix b/flake.nix index 4caf913..b61bbff 100644 --- a/flake.nix +++ b/flake.nix @@ -39,19 +39,21 @@ }; devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; - packages = [ - pkgs.just - pkgs.rnix-lsp - pkgs.pre-commit - pkgs.ocamlPackages.alcotest - pkgs.ocamlPackages.bisect_ppx - pkgs.ocamlPackages.dune_3 - pkgs.ocamlPackages.findlib - pkgs.ocamlPackages.ocaml - pkgs.ocamlPackages.ocaml-lsp - pkgs.ocamlPackages.ocamlformat - pkgs.ocamlPackages.ocamlformat-rpc-lib - ]; + packages = builtins.attrValues { + inherit (pkgs) + just + nil + pre-commit + ; + inherit (pkgs.ocamlPackages) + dune_3 + findlib + ocaml + ocaml-lsp + ocamlformat + ocamlformat-rpc-lib + ; + }; shellHook = config.pre-commit.installationScript; }; pre-commit = {