From bc7ca0fa2d9e8773d13aae6ce56cb740521e8e99 Mon Sep 17 00:00:00 2001 From: haxala1r Date: Thu, 1 Jan 2026 13:36:09 +0300 Subject: [PATCH] new library: added containers as a dependency. --- flake.lock | 6 +++--- flake.nix | 10 +++++++--- lib/compiler/dune | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bc5e5d0..c2cc24a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4390abf..44266a7 100644 --- a/flake.nix +++ b/flake.nix @@ -11,17 +11,21 @@ pkgs = nixpkgs.legacyPackages.${system}; devInputs = with pkgs.ocamlPackages; [merlin]; ocamlPkgs = with pkgs.ocamlPackages; [menhir dune_3]; - nativeInputs = with pkgs; ocamlPkgs ++ [ocaml]; + libs = with pkgs.ocamlPackages; [findlib containers]; + nativeInputs = with pkgs; ocamlPkgs ++ [ocaml]; in { - packages.default = pkgs.ocamlPackages.buildDunePackage { + packages.default = (pkgs.ocamlPackages.buildDunePackage { pname = "ollisp"; version = "0.0.1"; src = pkgs.lib.cleanSource ./.; nativeBuildInputs = nativeInputs; - }; + buildInputs = libs; + }); + devShells.default = pkgs.mkShell { nativeBuildInputs = nativeInputs ++ devInputs; + buildInputs = libs; }; }); } diff --git a/lib/compiler/dune b/lib/compiler/dune index b15ac79..da06b51 100644 --- a/lib/compiler/dune +++ b/lib/compiler/dune @@ -1,3 +1,3 @@ (library (name compiler) - (libraries parser)) + (libraries parser containers))