From 1cdb8d8f6c328037b8f1b9446a497e0e94861f19 Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Wed, 17 Jan 2024 09:16:47 -0600 Subject: Start of discocaml. --- flake.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 15c47ca..aeb0b59 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; + ocamlPkgs = pkgs.ocaml-ng.ocamlPackages_5_1; toolchain = fenix.packages.${system}.stable.withComponents [ "cargo" "rustc" @@ -20,16 +21,22 @@ in rec { devShells.default = pkgs.mkShell { inputsFrom = builtins.attrValues packages; - nativeBuildInputs = [ pkgs.cargo-watch pkgs.sqlite pkgs.sqlx-cli ]; + nativeBuildInputs = + [ pkgs.cargo-watch ocamlPkgs.ocaml-lsp pkgs.sqlite pkgs.sqlx-cli ]; }; - packages.default = - let toml = builtins.fromTOML (builtins.readFile ./Cargo.toml); + packages = { + default = packages.lambo; + + discocaml = ocamlPkgs.callPackage ./discocaml { }; + + lambo = let toml = builtins.fromTOML (builtins.readFile ./Cargo.toml); in rust.buildRustPackage { pname = toml.package.name; version = toml.package.version; src = ./.; cargoLock.lockFile = ./Cargo.lock; }; + }; }); } -- cgit v1.2.3