diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:17:08 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:52:11 +0100 |
| commit | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (patch) | |
| tree | 9f2c7a21ad8f2c061a8d46aac817e4c68d307086 /gnu/packages/text-editors.scm | |
| parent | 6931ca9baaaee4c7e85cf3cd5d0f7e4eb5cfd88e (diff) | |
| parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/text-editors.scm')
| -rw-r--r-- | gnu/packages/text-editors.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index a0518f9481..e1d85d411c 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -911,7 +911,7 @@ in plain text file format.") (define-public editorconfig-core-c (package (name "editorconfig-core-c") - (version "0.12.5") + (version "0.12.6") (source (origin (method git-fetch) @@ -920,7 +920,7 @@ in plain text file format.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "073sh18y0v8wm10iphaia54pkdmwylalccpn1k5i9dwyfjzgj7yg")))) + (base32 "05qllpls3r95nfl14gqq3cv4lisf07fgn85n52w8blc5pfl1h93g")))) (build-system cmake-build-system) (arguments '(#:phases @@ -930,6 +930,13 @@ in plain text file format.") (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")) @@ -1060,7 +1067,7 @@ Octave. TeXmacs is completely extensible via Guile.") (build-system meson-build-system) (native-inputs (list appstream-glib - blueprint-compiler + blueprint-compiler-0.4 desktop-file-utils gettext-minimal `(,glib "bin") @@ -1100,14 +1107,14 @@ The basic features of Text Pieces are: (define-public scintilla (package (name "scintilla") - (version "5.3.4") + (version "5.4.3") (source (origin (method url-fetch) (uri (string-append "https://www.scintilla.org/scintilla" (string-delete #\. version) ".tgz")) (sha256 - (base32 "0inbhzqdikisvnbdzn8153p1apbghxjzkkzji9i8zsdpyapb209z")))) + (base32 "1ysdi9rsg14w5mn581gjvr9jrdg1yp9rmg1r9jz7gngdgcz7q5ij")))) (build-system gnu-build-system) (arguments (list |