diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
| commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
| tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/packages/text-editors.scm | |
| parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
| parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
| download | guix-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/cups.scm gnu/packages/python-web.scm gnu/packages/web.scm guix/build/maven/pom.scm
Diffstat (limited to 'gnu/packages/text-editors.scm')
| -rw-r--r-- | gnu/packages/text-editors.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 62b198fd0d..3040082ee2 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -840,14 +840,14 @@ editors.") (define-public texmacs (package (name "texmacs") - (version "1.99.21") + (version "2.1") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "0zmm8212cha22dp1xablj1h4anlnyhjh09n13ckqf6ppb1bkf4gm")))) + (base32 "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -868,16 +868,14 @@ editors.") (let ((out (assoc-ref outputs "out"))) (substitute* "packages/linux/icons.sh" (("/usr/share") - (string-append out "/share"))) - #t))) + (string-append out "/share")))))) (add-after 'install 'install-desktop-file (lambda* (#:key outputs #:allow-other-keys) ;; Install desktop file. (let* ((out (assoc-ref outputs "out")) (apps (string-append out "/share/applications")) (source "TeXmacs/misc/mime/texmacs.desktop")) - (install-file source apps) - #t))) + (install-file source apps)))) (add-before 'configure 'gzip-flags (lambda _ (substitute* "Makefile.in" |