diff options
author | Marius Bakke <marius@gnu.org> | 2021-08-01 23:23:32 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-08-01 23:23:32 +0200 |
commit | d2e102d4e4fc5288d93e1100e86b35938a9ac162 (patch) | |
tree | b5ec688c954f7736c17371d9c76ff30509e8e6e8 /gnu/packages/text-editors.scm | |
parent | b2a5a180cfa56e55bc8078d606a971e34e326967 (diff) | |
parent | 536bec1ce5b3d68a6773f31e3788c63e8905ce98 (diff) | |
download | guix-d2e102d4e4fc5288d93e1100e86b35938a9ac162.tar.gz |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/text-editors.scm')
-rw-r--r-- | gnu/packages/text-editors.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7bdfbbbd35..654d652d47 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -506,7 +506,7 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on (define-public mg (package (name "mg") - (version "20180927") + (version "20210609") (source (origin (method git-fetch) (uri (git-reference @@ -515,12 +515,11 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on (file-name (git-file-name name version)) (sha256 (base32 - "14vrm8lvwksf697sqks7xfd1xaqjlqjc9afjk33sksq5p27wr203")) + "04c2vqxg31mk15cfrhzrivykis8fmf0m1d8h1qdjdmlfxd4qwaqf")) (modules '((guix build utils))) (snippet '(begin (substitute* "GNUmakefile" - (("/usr/bin/") "")) - #t)))) + (("/usr/bin/") "")))))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -929,14 +928,14 @@ Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "5.1.0") + (version "5.1.1") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0figd543inpi00yr6han73qd2fzx99r099vzcbg9mhpzsgxfwz4f")))) + (base32 "1d0yjx2wlx4fj5bccxdgfmrr7nzazkw4m08i6h4c0a54sb484yif")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") |