From 9db3e6f49ca7e476dbde2924564ab4c84d074319 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 21 Jul 2025 18:27:59 +0000 Subject: [PATCH] gnu: editorconfig-core-c: Fix build. * gnu/packages/text-editors.scm (editorconfig-core-c) [arguments]<#:cmake>: Pin old version. Change-Id: Ied3e790dbb49caed261ba5303b1fb509441541e4 --- gnu/packages/text-editors.scm | 45 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index db32a20e0cc4f936c2ca222df7037b4055a227bf..d95706ed45e0da67c957aeb457d75a097d62974f 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages cmake) #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -1258,27 +1259,29 @@ in plain text file format.") (base32 "05qllpls3r95nfl14gqq3cv4lisf07fgn85n52w8blc5pfl1h93g")))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'insert-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((tests (assoc-ref inputs "tests"))) - (copy-recursively tests "tests")) - #t)) - (add-after 'insert-tests 'disable-failing-tests - (lambda _ - (substitute* "tests/parser/CMakeLists.txt" - (("# Test max property name and values") - "# Disabled: test max property name and values\nif(FALSE)\n") - (("# Test max section names") - "endif()\n\n# Test max section names")))) - (add-after 'install 'delete-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - (with-directory-excursion lib - (delete-file "libeditorconfig_static.a")) - #t)))))) + (list + #:cmake cmake-3.25 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'insert-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((tests (assoc-ref inputs "tests"))) + (copy-recursively tests "tests")) + #t)) + (add-after 'insert-tests 'disable-failing-tests + (lambda _ + (substitute* "tests/parser/CMakeLists.txt" + (("# Test max property name and values") + "# Disabled: test max property name and values\nif(FALSE)\n") + (("# Test max section names") + "endif()\n\n# Test max section names")))) + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (with-directory-excursion lib + (delete-file "libeditorconfig_static.a")) + #t)))))) (native-inputs `(("tests" ,(origin