From aebebdade182d658983cef1bdfea57c54ccc9350 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 4 Aug 2022 10:26:16 +0200 Subject: [PATCH] Add boot to clojure env --- README.md | 4 ++++ clojure/flake.nix | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 208fab5..bfb3279 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Once your preferred template has been initialized, you can use the provided shel | [Ruby] | [`ruby`](./ruby/) | | [Rust] | [`rust`](./rust/) | | [Scala] | [`scala`](./scala/) | +| [WebAssembly][wasm] | [`wasm`](./wasm) | | [Zig] | [`zig`](./zig/) | ## Template contents @@ -58,6 +59,7 @@ The sections below list what each template includes. In all cases, you're free t ### [`clojure`](./clojure/) - [Clojure] 1.11.1.1149 +- [Boot] 2.8.3 - [Leiningen] 2.9.8 ### [`cue`](./cue/) @@ -210,6 +212,7 @@ The sections below list what each template includes. In all cases, you're free t All of the templates have only the root [flake](./flake.nix) as a flake input. That root flake provides a common revision of [Nixpkgs] and [`flake-utils`][flake-utils] to all the templates. [ant]: https://ant.apache.org +[boot]: https://www.boot-clj.com [buf]: https://github.com/bufbuild/buf [cabal]: https://www.haskell.org/cabal [cachix]: https://www.cachix.org @@ -278,5 +281,6 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T [terragrunt]: https://terragrunt.gruntwork.io [virtualenv]: https://pypi.org/project/virtualenv [vulnix]: https://github.com/flyingcircusio/vulnix +[wasm]: https://webassembly.org/ [yarn]: https://yarnpkg.com [zig]: https://ziglang.org diff --git a/clojure/flake.nix b/clojure/flake.nix index b5f2b4a..b11a1d2 100644 --- a/clojure/flake.nix +++ b/clojure/flake.nix @@ -11,19 +11,21 @@ config = { packageOverrides = p: { + boot = p.boot.override { jdk = p.${jdk}; }; clojure = p.clojure.override { jdk = p.${jdk}; }; leiningen = p.leiningen.override { jdk = p.${jdk}; }; }; }; pkgs = import nixpkgs { inherit config system; }; - inherit (pkgs) clojure leiningen mkShell; + inherit (pkgs) boot clojure leiningen mkShell; in { devShells = { default = mkShell { - buildInputs = [ clojure leiningen ]; + buildInputs = [ boot clojure leiningen ]; shellHook = '' + ${clojure}/bin/clj --version ''; }; };