Merge branch 'master' into staging.

1 files changed, 71 insertions, 65 deletions

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index f3ef5bcc04..60d042fb66 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -16,7 +16,7 @@
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2021 Cage <cage-dev@twistfold.it>
+;;; Copyright © 2021, 2022 Cage <cage-dev@twistfold.it>
 ;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
 ;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -693,7 +693,7 @@ is fully configurable and extensible in Common Lisp.")
 (define-public lagrange
   (package
     (name "lagrange")
-    (version "1.10.5")
+    (version "1.11.2")
     (source
      (origin
        (method url-fetch)
@@ -701,7 +701,7 @@ is fully configurable and extensible in Common Lisp.")
         (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/"
                        "download/v" version "/lagrange-" version ".tar.gz"))
        (sha256
-        (base32 "1kimdy0k26l3b673sg12gd0d94mxx5lycyxlmla9hxxcsfn2rlqy"))
+        (base32 "07vr0n8zpxcf6vjf4rz30s75llzxg9yndqphar4b1iygig9rx6jf"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -715,7 +715,8 @@ is fully configurable and extensible in Common Lisp.")
     (native-inputs
      (list pkg-config zip))
     (inputs
-     (list fribidi
+     (list freetype
+           fribidi
            harfbuzz
            libunistring
            libwebp
@@ -773,7 +774,7 @@ history, and page outlines.")
 (define-public bombadillo
   (package
     (name "bombadillo")
-    (version "2.3.3")
+    (version "2.4.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -781,28 +782,28 @@ history, and page outlines.")
                     (commit version)))
               (sha256
                (base32
-                "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"))
+                "03gcd813bmiy7ad179zg4p61nfa9z5l94sdmsmmn2x204h1ksd8n"))
               (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "tildegit.org/sloum/bombadillo"
-       #:install-source? #f
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'install-data
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((builddir "src/tildegit.org/sloum/bombadillo")
-                             (out (assoc-ref outputs "out"))
-                             (pkg (strip-store-file-name out))
-                             (sharedir (string-append out "/share"))
-                             (appdir (string-append sharedir "/applications"))
-                             (docdir (string-append sharedir "/doc/" pkg))
-                             (mandir (string-append sharedir "/man/man1"))
-                             (pixdir (string-append sharedir "/pixmaps")))
-                        (with-directory-excursion builddir
-                          (install-file "bombadillo.desktop" appdir)
-                          (install-file "bombadillo.1" mandir)
-                          (install-file "bombadillo-icon.png" pixdir)
-                          #t)))))))
+     (list
+      #:import-path "tildegit.org/sloum/bombadillo"
+      #:install-source? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-data
+            (lambda _
+              (let* ((builddir "src/tildegit.org/sloum/bombadillo")
+                     (pkg (strip-store-file-name #$output))
+                     (sharedir (string-append #$output "/share"))
+                     (appdir (string-append sharedir "/applications"))
+                     (docdir (string-append sharedir "/doc/" pkg))
+                     (mandir (string-append sharedir "/man/man1"))
+                     (pixdir (string-append sharedir "/pixmaps")))
+                (with-directory-excursion builddir
+                  (install-file "bombadillo.desktop" appdir)
+                  (install-file "bombadillo.1" mandir)
+                  (install-file "bombadillo-icon.png" pixdir))))))))
     (home-page "https://bombadillo.colorfield.space")
     (synopsis "Terminal browser for the gopher, gemini, and finger protocols")
     (description "Bombadillo is a non-web browser for the terminal with
@@ -815,7 +816,7 @@ http, and https via third-party applications.")
 (define-public tinmop
   (package
     (name "tinmop")
-    (version "0.9.2")
+    (version "0.9.6")
     (source
      (origin
        (method git-fetch)
@@ -824,47 +825,52 @@ http, and https via third-party applications.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1cgx2g2kryfmcwqzzjzcpbdc6zzj10xc52gz0cj2dx5ylc0yg7k3"))))
+        (base32 "19rr1wcadm4698q5gyq0pxv81220l5g8zfnp61s43a4q7kn4mi1z"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("automake" ,automake)
-       ("autoreconf" ,autoconf)
-       ("gettext" ,gnu-gettext)
-       ("mandoc" , mandoc)
-       ("nano" ,nano)
-       ("openssl" ,openssl)
-       ("sbcl" ,sbcl)
-       ("xdg-utils" ,xdg-utils)))
+     (list autoconf
+           automake
+           gnu-gettext
+           mandoc
+           nano
+           openssl
+           sbcl
+           unzip
+           xdg-utils))
     (inputs
-     `(("access" ,sbcl-access)
-       ("alexandria" ,sbcl-alexandria)
-       ("babel" ,sbcl-babel)
-       ("bordeaux-threads" ,sbcl-bordeaux-threads)
-       ("cl-base64" ,sbcl-cl-base64)
-       ("cl-colors2" ,sbcl-cl-colors2)
-       ("cl-html5-parser" ,sbcl-cl-html5-parser)
-       ("cl-i18n" ,sbcl-cl-i18n)
-       ("cl-ppcre" ,sbcl-cl-ppcre)
-       ("cl-spark" ,sbcl-cl-spark)
-       ("cl-sqlite" ,sbcl-cl-sqlite)
-       ("cl+ssl" ,sbcl-cl+ssl)
-       ("clunit2" ,sbcl-clunit2)
-       ("croatoan" ,sbcl-croatoan)
-       ("crypto-shortcuts" ,sbcl-crypto-shortcuts)
-       ("drakma" ,sbcl-drakma)
-       ("esrap" ,sbcl-esrap)
-       ("ieee-floats" ,sbcl-ieee-floats)
-       ("local-time" ,sbcl-local-time)
-       ("log4cl" ,sbcl-log4cl)
-       ("marshal" ,sbcl-marshal)
-       ("osicat" ,sbcl-osicat)
-       ("parse-number" ,sbcl-parse-number)
-       ("percent-encoding" ,sbcl-percent-encoding)
-       ("sxql" ,sbcl-sxql)
-       ("sxql-composer" ,sbcl-sxql-composer)
-       ("tooter" ,sbcl-tooter)
-       ("unix-opts" ,sbcl-unix-opts)
-       ("usocket" ,sbcl-usocket)))
+     (list ncurses
+           sbcl-access
+           sbcl-alexandria
+           sbcl-babel
+           sbcl-bordeaux-threads
+           sbcl-cl+ssl
+           sbcl-cl-base64
+           sbcl-cl-colors2
+           sbcl-cl-html5-parser
+           sbcl-cl-i18n
+           sbcl-cl-ppcre
+           sbcl-cl-spark
+           sbcl-cl-sqlite
+           sbcl-clunit2
+           sbcl-croatoan
+           sbcl-crypto-shortcuts
+           sbcl-drakma
+           sbcl-esrap
+           sbcl-ieee-floats
+           sbcl-local-time
+           sbcl-log4cl
+           sbcl-marshal
+           sbcl-osicat
+           sbcl-parse-number
+           sbcl-percent-encoding
+           sbcl-purgatory
+           sbcl-sxql
+           sbcl-sxql-composer
+           sbcl-tooter
+           sbcl-trivial-clipboard
+           sbcl-unix-opts
+           sbcl-usocket
+           sqlite))
     (arguments
      `(#:tests? #f
        #:strip-binaries? #f
@@ -893,9 +899,9 @@ http, and https via third-party applications.")
                  '("LISP_COMPILER) --eval \"(require 'asdf)\" "
                    "--eval \"(push \\\"$$(pwd)/\\\" asdf:*central-registry*)\"  "))))
              #t)))))
-    (synopsis "Gemini and pleroma client with a terminal interface")
+    (synopsis "Gemini, kami and pleroma client with a terminal interface")
     (description
-     "This package provides a Gemini and pleroma client with a terminal
+     "This package provides a Gemini, kami and pleroma client with a terminal
 interface.")
     (home-page "https://www.autistici.org/interzona/tinmop.html")
     (license license:gpl3+)))