From dc89a2183969b9c2d6a31b256d9de0d4e20d6818 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 17 Feb 2026 13:11:46 +1100 Subject: [PATCH] Upgrade deps, note use of upstream Clojure --- bin/dev | 2 +- build.clj | 2 -- deps.edn | 12 +++++++----- manifest.scm | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/dev b/bin/dev index cd7dc20..0ab1a49 100755 --- a/bin/dev +++ b/bin/dev @@ -1,4 +1,4 @@ #!/usr/bin/env sh # Run the program without building it -clojure -M -m core "$@" +clojure -M:dev "$@" diff --git a/build.clj b/build.clj index 0c10561..56e97b1 100644 --- a/build.clj +++ b/build.clj @@ -14,8 +14,6 @@ (defn uber [_] (clean nil) - (b/copy-dir {:src-dirs ["src" "resources"] - :target-dir class-dir}) (b/copy-dir {:src-dirs ["src" "resources"] :target-dir class-dir}) (b/compile-clj {:basis @basis diff --git a/deps.edn b/deps.edn index 3b832ed..27d8d74 100644 --- a/deps.edn +++ b/deps.edn @@ -1,10 +1,12 @@ {:paths ["src" "resources" "private"] ;; Private is not included in the build :deps { - org.clojure/clojure {:mvn/version "1.11.1"} - org.clojure/data.csv {:mvn/version "1.0.1"} - org.clojure/tools.cli {:mvn/version "1.1.230"}} + ;; Note that the clojure version below will be installed from upstream + ;; rather than using the system version. + org.clojure/clojure {:mvn/version "1.12.4"} + org.clojure/data.csv {:mvn/version "1.1.1"} + org.clojure/tools.cli {:mvn/version "1.3.250"}} :aliases - {:dev {:extra-deps {lambdaisland/deep-diff2 {:mvn/version "2.10.211"}} + {:dev {:extra-deps {lambdaisland/deep-diff2 {:mvn/version "2.12.219"}} :main-opts ["-m" "core"] ;; Saves ~ 1 second of startup time - 1.5 sec on my laptop. After ;; building an uberjar and running with these options, it drops to about @@ -13,5 +15,5 @@ :test {:extra-deps {lambdaisland/kaocha {:mvn/version "1.87.1366"}} :main-opts ["-m" "kaocha.runner"]} ;; Run with clj -T:build function-in-build - :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}} + :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.12"}} :ns-default build}}} diff --git a/manifest.scm b/manifest.scm index 30ab8a8..196ac0f 100644 --- a/manifest.scm +++ b/manifest.scm @@ -4,9 +4,10 @@ ;; develop/build the program. Use it with `guix shell --manifest=manifest.scm`. (specifications->manifest (list - ;; No issues running this OpenJDK 21 program on Debian Stable (OpenJDK 17). + ;; No issues running this OpenJDK 21 program on Debian Bookworm (OpenJDK 17). "openjdk@21:jdk" "clojure-tools" + "rlwrap" "clj-kondo" "beancount" ))