diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2025-12-27 02:16:43 +0100 |
|---|---|---|
| committer | Rutherther <rutherther@ditigal.xyz> | 2026-01-25 21:31:02 +0100 |
| commit | 9af25edaaf8569640a554a74577102165ab9daae (patch) | |
| tree | fc7c7ef2525ee5762d4c58ef21d24c8c485f5db4 /gnu/packages/clojure.scm | |
| parent | ef24686b208234ed74e93b139db1564030fbb78b (diff) | |
gnu: clojure: Update to 1.12.4.
* gnu/packages/clojure.scm (clojure): Update to 1.12.4 and lint.
Change-Id: I6c540ffe6fdce267e094f9f86c8b6a9d4a8efbc3
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
Diffstat (limited to 'gnu/packages/clojure.scm')
| -rw-r--r-- | gnu/packages/clojure.scm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index a892df4dd96..cd1f602cdc2 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com> +;;; Copyright © 2025 Mathieu Lirzin <mthl@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,7 +82,7 @@ (package (name "clojure") - (version "1.12.0") + (version "1.12.4") (source (let ((name+version (string-append name "-" version))) (origin (method git-fetch) @@ -90,10 +91,10 @@ (commit name+version))) (file-name (string-append name+version "-checkout")) (sha256 - (base32 "17f62x9qq71yhcfpg2npv19xi9wcpgqj255nmvpfy1z2md64gawz"))))) + (base32 + "072dv6s2gxcg8snlgkpjk6bp1cb17bgfshdq6ijsa4yslpqbf9wc"))))) (build-system ant-build-system) - (inputs - `(("jre" ,icedtea))) + (inputs (list icedtea)) (arguments `(#:imported-modules ((guix build clojure-utils) (guix build clojure-build-system) @@ -166,13 +167,20 @@ (display (string-append "maven.compile.classpath=" classpath "\n")) (display (string-append "maven.test.classpath=" classpath "\n"))))) #t)) + (add-before 'check 'fix-test-classpath + ;; Some java test files need access to compiled classes. + (lambda _ + (substitute* "build.xml" + (("javac srcdir=\"\\$\\{jtestsrc\\}\"" cmd) + (string-append cmd " classpath=\"${build}\""))))) (add-after 'build 'build-javadoc ant-build-javadoc) (replace 'install (install-jars "./")) (add-after 'install-license-files 'install-doc (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc (install-javadoc "target/javadoc/")) - (add-after 'reset-gzip-timestamps 'reset-class-timestamps clj:reset-class-timestamps)))) + (add-after 'reset-gzip-timestamps 'reset-class-timestamps + clj:reset-class-timestamps)))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") |