From ec37ff199c99aaf705421ec3ba567ce15ef172c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 11 Apr 2020 23:17:19 +0300 Subject: gnu: libmypaint: Upgrade to 1.5.1. * gnu/packages/gimp.scm (libmypaint): Upgrade to 1.5.1. --- gnu/packages/gimp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 3537fa12f5..a6278c6170 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms @@ -270,7 +270,7 @@ (define-public gimp-fourier (define-public libmypaint (package (name "libmypaint") - (version "1.3.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mypaint/libmypaint/" @@ -278,7 +278,7 @@ (define-public libmypaint version ".tar.xz")) (sha256 (base32 - "0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va")))) + "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 48e961a5ab2d5c83ce0ba263cb84efbd7da9b20e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 00:05:30 +0300 Subject: gnu: gimp-resynthesizer: Don't use unstable tarball. * gnu/packages/gimp.scm (gimp-resynthesizer)[source]: Download using git-fetch. [arguments]: Remove stray tabs. --- gnu/packages/gimp.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a6278c6170..ab0dbcc925 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -337,13 +337,14 @@ (define-public gimp-resynthesizer (version "2.0.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bootchk/resynthesizer") + (commit (string-append "v" version)))) (sha256 (base32 - "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr")) - (file-name (string-append name "-" version ".tar.gz")))) + "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `( ;; Turn off tests to avoid: @@ -351,11 +352,11 @@ (define-public gimp-resynthesizer #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-env - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) - (add-after 'configure 'set-prefix + (add-after 'unpack 'set-env + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + #t)) + (add-after 'configure 'set-prefix ;; Install plugin under $prefix, not under GIMP's libdir. (lambda* (#:key outputs #:allow-other-keys) (let ((target (string-append (assoc-ref outputs "out") @@ -364,8 +365,8 @@ (define-public gimp-resynthesizer (package-version gimp)) ".0"))) (substitute* (list "src/resynthesizer/Makefile" - "src/resynthesizer-gui/Makefile") - (("GIMP_LIBDIR = .*") + "src/resynthesizer-gui/Makefile") + (("GIMP_LIBDIR = .*") (string-append "GIMP_LIBDIR = " target "\n"))) (mkdir-p target) #t)))))) -- cgit v1.2.3 From a1da0fb20b99ba80bd58dd5b2ab08d61f3e8f9c8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 12 Apr 2020 03:00:26 +0530 Subject: gnu: dino: Update to 0.1.0. * gnu/packages/messaging.scm (dino): Update to 0.1.0. [source]: Replace git repository with release tarball. [arguments]: Remove "-DSHARED_SIGNAL_PROTOCOL=yes" configure flag. Remove unpack-sources phase. [native-inputs]: Remove libsignal-protocol-c-source. --- gnu/packages/messaging.scm | 108 +++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 04287f251f..c6217a95de 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017, 2018 Arun Isaac +;;; Copyright © 2017, 2018, 2020 Arun Isaac ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Rutger Helling @@ -728,68 +728,52 @@ (define-public gajim-omemo (license license:gpl3+))) (define-public dino - ;; The only release tarball is for version 0.0, but it is very old and fails - ;; to build. - (let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417") - (revision "4")) - (package - (name "dino") - (version (git-version "0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dino/dino.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:parallel-build? #f ; not supported - ; Use our libsignal-protocol-c instead of the git submodule. - #:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes") - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build cmake-build-system) - (guix build glib-or-gtk-build-system)) - #:phases - (modify-phases %standard-phases - ;; The signal-protocol plugin accesses internal headers of - ;; libsignal-protocol-c, so we need to put the sources there. - (add-after 'unpack 'unpack-sources - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "plugins/signal-protocol/libsignal-protocol-c" - (invoke "tar" "xvf" - (assoc-ref inputs "libsignal-protocol-c-source") - "--strip-components=1")))) - (add-after 'install 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (inputs - `(("libgee" ,libgee) - ("libsignal-protocol-c" ,libsignal-protocol-c) - ("libgcrypt" ,libgcrypt) - ("libsoup" ,libsoup) - ("qrencode" ,qrencode) - ("sqlite" ,sqlite-with-column-metadata) - ("gpgme" ,gpgme) - ("gtk+" ,gtk+) - ("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c)) - ("glib" ,glib "bin") - ("vala" ,vala) - ("gettext" ,gettext-minimal))) - (home-page "https://dino.im") - (synopsis "Graphical Jabber (XMPP) client") - (description "Dino is a Jabber (XMPP) client which aims to fit well into + (package + (name "dino") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/dino/dino/releases/download/v" + version "/dino-" version ".tar.gz")) + (sha256 + (base32 + "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:parallel-build? #f ; not supported + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build cmake-build-system) + (guix build glib-or-gtk-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (inputs + `(("libgee" ,libgee) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libgcrypt" ,libgcrypt) + ("libsoup" ,libsoup) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite-with-column-metadata) + ("gpgme" ,gpgme) + ("gtk+" ,gtk+) + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("glib" ,glib "bin") + ("vala" ,vala) + ("gettext" ,gettext-minimal))) + (home-page "https://dino.im") + (synopsis "Graphical Jabber (XMPP) client") + (description "Dino is a Jabber (XMPP) client which aims to fit well into a graphical desktop environment like GNOME.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public prosody (package -- cgit v1.2.3 From 6c54d06ec122787c7e7439f22dea6bc9616ec831 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 20:28:15 +0200 Subject: gnu: ephemeralpg: Update to 3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (ephemeralpg): Update to 3.0. [arguments]: Set #:test-target and use the standard ‘check’ phase. --- gnu/packages/databases.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d180f347e0..a6f78154e8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -225,7 +225,7 @@ (define-public go-gopkg.in-mgo.v2 (define-public ephemeralpg (package (name "ephemeralpg") - (version "2.9") + (version "3.0") (source (origin (method url-fetch) @@ -233,17 +233,14 @@ (define-public ephemeralpg "https://eradman.com/ephemeralpg/code/ephemeralpg-" version ".tar.gz")) (sha256 - (base32 "1ghp3kya4lxvfwz3c022cx9vqf55jbf9sjw60bxjcb5sszklyc89")))) + (base32 "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - (invoke "ruby" "test.rb"))) + (delete 'configure) ; no configure script (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -255,11 +252,13 @@ (define-public ephemeralpg "/bin") ;; For getsocket. ,(string-append out "/bin"))))) - #t))))) + #t))) + #:test-target "test")) (inputs `(("postgresql" ,postgresql) ("util-linux" ,util-linux))) (native-inputs + ;; For tests. `(("ruby" ,ruby) ("which" ,which))) (home-page "https://eradman.com/ephemeralpg/") -- cgit v1.2.3 From 0e1662a6cd6b80daac9efe03df674c15fbb6babe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 21:11:12 +0200 Subject: gnu: exo: Update to 0.12.11. * gnu/packages/xfce.scm (exo): Update to 0.12.11. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4b88e97095..6ab07e6a22 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -204,7 +204,7 @@ (define-public libxfce4ui (define-public exo (package (name "exo") - (version "0.12.10") + (version "0.12.11") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -212,7 +212,7 @@ (define-public exo "exo-" version ".tar.bz2")) (sha256 (base32 - "1b3w4pf9gkcp13h63nf93k95hkw0ij7v5y7wjklqd1qifm8xd3w4")))) + "1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -222,7 +222,7 @@ (define-public exo `(("gtk+-3" ,gtk+) ("libxfce4util" ,libxfce4util))) (inputs - `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3 + `(;; FIXME Referred to in exo-1.pc but conflict with gtk+-3. ("gtk+-2" ,gtk+-2) ("libxfce4ui" ,libxfce4ui) ("perl-uri" ,perl-uri))) -- cgit v1.2.3 From cc86d5254b3f4ddf333c6b5d8026637bfa916a12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 21:18:09 +0200 Subject: gnu: garcon: Update to 0.7.0. * gnu/packages/xfce.scm (garcon): Update to 0.7.0. --- gnu/packages/xfce.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6ab07e6a22..36f632b8f5 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -238,7 +238,7 @@ (define-public exo (define-public garcon (package (name "garcon") - (version "0.6.4") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -246,17 +246,17 @@ (define-public garcon "garcon-" version ".tar.bz2")) (sha256 (base32 - "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp")))) + "08r4dfvdvl178cjajm7ww16lwb7jsfqh3yz614mn84c0a0dvdhw2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin"))) (inputs - `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc + `(("gtk+-2" ,gtk+-2))) ; required by garcon-gtk2-1.pc (propagated-inputs `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc - ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc + ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc (home-page "https://www.xfce.org/") (synopsis "Implementation of the freedesktop.org menu specification") (description -- cgit v1.2.3 From 8ab88f6f5b425b6b460ae7fb5ae29feb1923aad6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 22:11:28 +0200 Subject: gnu: xfce4-session: Update to 4.14.2. * gnu/packages/xfce.scm (xfce4-session): Update to 4.14.2. [source]: Hard-code NAME. [description]: Tweak. --- gnu/packages/xfce.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 36f632b8f5..28a4256ff8 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -563,15 +563,15 @@ (define-public xfce4-appfinder (define-public xfce4-session (package (name "xfce4-session") - (version "4.14.0") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "xfce4-session/" (version-major+minor version) "/" + "xfce4-session-" version ".tar.bz2")) (sha256 (base32 - "0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql")) + "1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv")) (modules '((guix build utils))) (snippet '(begin @@ -602,7 +602,7 @@ (define-public xfce4-session (synopsis "Xfce session manager") (description "Session manager for Xfce, it will restore your session on startup and -allows you to shutdown the computer from Xfce.") +allows you to shut down the computer from Xfce.") (license gpl2+))) (define-public xfce4-settings -- cgit v1.2.3 From 0db448768b2e457698aea19bed2a3a322d26deac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 22:16:45 +0200 Subject: gnu: xfce4-screensaver: Update to 0.1.10. * gnu/packages/xfce.scm (xfce4-screensaver): Update to 0.1.10. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 28a4256ff8..b708eb42b5 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1160,7 +1160,7 @@ (define-public xfce4-screenshooter (define-public xfce4-screensaver (package (name "xfce4-screensaver") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1170,7 +1170,7 @@ (define-public xfce4-screensaver version ".tar.bz2")) (sha256 (base32 - "11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp")))) + "0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 10f04aec491b4dbabaf5d3a9a9903b75a1d540fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 22:18:37 +0200 Subject: gnu: xfce4-clipman-plugin: Update to 1.6.1. * gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.1. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b708eb42b5..d291a63933 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -387,7 +387,7 @@ (define-public xfce4-battery-plugin (define-public xfce4-clipman-plugin (package (name "xfce4-clipman-plugin") - (version "1.4.4") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -395,7 +395,7 @@ (define-public xfce4-clipman-plugin "xfce4-clipman-plugin-" version ".tar.bz2")) (sha256 (base32 - "1819kjn7gs30zhhj2ppfw4zjpcgj9amw1vvppjsavsff1xflrq88")))) + "1d6fxdzy9b511hqcyj7825fx67q6zqk6cln4g3x9d498jrvk3s5k")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 347c833be559b834bbac61d4521c6dcfb3ec905c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 22:21:52 +0200 Subject: gnu: xfce4-pulseaudio-plugin: Update to 0.4.3. * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.3. [source]: Hard-code NAME. --- gnu/packages/xfce.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d291a63933..a5d5dab322 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -418,19 +418,20 @@ (define-public xfce4-clipman-plugin (define-public xfce4-pulseaudio-plugin (package (name "xfce4-pulseaudio-plugin") - (version "0.4.2") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/panel-plugins/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a")))) + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" + "xfce4-pulseaudio-plugin/" + (version-major+minor version) "/" + "xfce4-pulseaudio-plugin-" version ".tar.bz2")) + (sha256 + (base32 "0nv1lbkshfzar87f6xq1ib120pjja24r7135rbc42wqkw8vq4las")))) (build-system gnu-build-system) (arguments `(#:phases - ;; For dbus/dbus-glib.h in pulseaudio-config.h + ;; For dbus/dbus-glib.h in pulseaudio-config.h. (modify-phases %standard-phases (add-after 'set-paths 'augment-cflags (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From aec0ae27121d8004b7053def6a2b3fe71877e6ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 22:23:33 +0200 Subject: gnu: xfce4-whiskermenu-plugin: Update to 2.4.3. * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.4.3. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a5d5dab322..b231761d43 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -465,7 +465,7 @@ (define-public xfce4-pulseaudio-plugin (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.3.4") + (version "2.4.3") (source (origin (method url-fetch) @@ -473,7 +473,7 @@ (define-public xfce4-whiskermenu-plugin "xfce4-whiskermenu-plugin/" (version-major+minor version) "/" "xfce4-whiskermenu-plugin-" version ".tar.bz2")) (sha256 - (base32 "03jpcbdpkgg825g7mr630wxynachymsrnyhz32mkl0jsd4sxxlw4")))) + (base32 "1w2zvqr0g6miliv3nb0shljfawwc1brdn2fyz4kvfg7b3klyxyir")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 1518b4bceb9955ed6d94432d651b7a2a9f3052e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 08:55:10 +0300 Subject: gnu: Remove duplicate python-prometheus-client. * gnu/packages/monitoring.scm (python-prometheus-client): Update to 0.7.1. * gnu/packages/python-xyz.scm (python-prometheus-client): Remove variable. * gnu/packages/monitoring.scm: Import (gnu packages monitoring). --- gnu/packages/matrix.scm | 1 + gnu/packages/monitoring.scm | 6 +++--- gnu/packages/python-xyz.scm | 22 ---------------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 0aba774a91..7bbdc09688 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -20,6 +20,7 @@ (define-module (gnu packages matrix) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages check) #:use-module (gnu packages databases) + #:use-module (gnu packages monitoring) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index bcb8df24d0..8da31d6a84 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019 Oleg Pykhalov +;;; Copyright © 2020 Alex ter Weele ;;; ;;; This file is part of GNU Guix. ;;; @@ -371,14 +372,13 @@ (define-public python2-graphite-web (define-public python-prometheus-client (package (name "python-prometheus-client") - (version "0.5.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "prometheus_client" version)) (sha256 - (base32 - "0g7rpv1pq2lab1nfqdx98z9d3bqwc400alg1j4ynrpjkrbsizhg8")))) + (base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi")))) (build-system python-build-system) (arguments '(;; No included tests. diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2ecf7115ab..64b1e6d8dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19236,28 +19236,6 @@ (define-public python-pymacaroons enforcement of that policy.") (license license:expat))) -(define-public python-prometheus-client - (package - (name "python-prometheus-client") - (version "0.7.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prometheus_client" version)) - (sha256 - (base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi")))) - (build-system python-build-system) - (arguments - ;; TODO: No tests in the PyPI distribution. - `(#:tests? #f)) - (propagated-inputs - `(("python-twisted" ,python-twisted))) - (home-page "https://github.com/prometheus/client_python") - (synopsis "Prometheus instrumentation library") - (description - "This is the official Python client for the Prometheus monitoring server.") - (license license:asl2.0))) - (define-public python-ldap3 (package (name "python-ldap3") -- cgit v1.2.3 From f3978093972b53ddb2f36c2ba7f6097c34de60e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 09:12:43 +0300 Subject: gnu: go-github-com-audriusbutkevicius-pfilter: Update to 0.0.5. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-pfilter) [version]: Correctly identify commit as version tag 0.0.5. --- gnu/packages/syncthing.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ae344541ea..ad4c30d064 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Petter ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -1022,29 +1023,27 @@ (define-public go-github-com-flynn-archive-go-shlex (license asl2.0)))) (define-public go-github-com-audriusbutkevicius-pfilter - (let ((commit "c55ef6137fc6f075801eac099cc2687ede0f101d") - (revision "3")) - (package - (name "go-github-com-audriusbutkevicius-pfilter") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/pfilter.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/AudriusButkevicius/pfilter")) - (synopsis "Filter packets into multiple virtual connections") - (description "Pfilter is a Go package for filtering packets into multiple + (package + (name "go-github-com-audriusbutkevicius-pfilter") + (version "0.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/pfilter.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/AudriusButkevicius/pfilter")) + (synopsis "Filter packets into multiple virtual connections") + (description "Pfilter is a Go package for filtering packets into multiple virtual connections from a single physical connection.") - (home-page "https://github.com/AudriusButkevicius/pfilter") - (license expat)))) + (home-page "https://github.com/AudriusButkevicius/pfilter") + (license expat))) (define-public go-github-com-ccding-go-stun (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") -- cgit v1.2.3 From 8a00a2202ef2a0a0173e17479359370f5656ecd0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 24 Mar 2020 07:36:28 -0700 Subject: gnu: Add emacs-psc-ide. * gnu/packages/emacs-xyz.scm (emacs-psc-ide): New variable. --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e700920266..8d07290089 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12334,6 +12334,47 @@ (define-public emacs-pass and can be consulted and modified.") (license license:gpl3+))) +(define-public emacs-psc-ide + (let ((commit "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe") + (revision "1")) + (package + (name "emacs-psc-ide") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/purescript-emacs/psc-ide-emacs") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-dash" ,emacs-dash) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-let-alist" ,emacs-let-alist) + ("emacs-s" ,emacs-s) + ("emacs-seq" ,emacs-seq))) + (home-page "https://github.com/purescript-emacs/psc-ide-emacs") + (synopsis "Emacs integration for PureScript's psc-ide tool") + (description + "This package provices Emacs integration for @code{psc-ide}, an IDE +protocol for PureScript programming language. It features: + +@itemize +@item Completions +@item Type at point +@item Go to definition +@item Automatic imports +@item Case split +@item Build system integration, and +@item Flycheck support +@end itemize") + (license license:gpl3+)))) + (define-public emacs-evil-anzu (package (name "emacs-evil-anzu") -- cgit v1.2.3 From 4b238cd853db3851793784fdcfcbf678d3d60a60 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 12 Apr 2020 11:06:29 +0200 Subject: gnu: emacs-psc-ide: Add a comment about versioning. * gnu/packages/emacs-xyz.scm (emacs-psc-ide): Add a comment about versioning. --- gnu/packages/emacs-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d07290089..70aea93511 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12335,6 +12335,8 @@ (define-public emacs-pass (license license:gpl3+))) (define-public emacs-psc-ide + ;; There is no proper release. The base version is extracted from the + ;; "Version" keyword in the main file. (let ((commit "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe") (revision "1")) (package -- cgit v1.2.3 From 94475a4552a0de24e2b7dfbd704691e91fdcc8f1 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 12 Apr 2020 07:33:33 +0200 Subject: gnu: emacs-ebuild-mode: Update to 1.50. [[PGP Signed Part:No public key for 7C7AFFBEFEF2CB25 created at 2020-04-12T07:33:34+0200 using RSA]] * gnu/packages/emacs-xyz.scm (emacs-ebuild-mode): Update to 1.50. (needs info installation) From cc87b443a6dd94b07d711ec792fe1b6f1ac3e6d4 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 12 Apr 2020 07:19:44 +0200 Subject: [PATCH] gnu: emacs-ebuild-mode: Update to 1.50. * gnu/packages/emacs-xyz.scm (emacs-ebuild-mode): Update to 1.50. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 70aea93511..822a35ebbc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7896,7 +7896,7 @@ (define-public emacs-lua-mode (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.37") + (version "1.50") (source (origin (method url-fetch) (uri (string-append @@ -7905,7 +7905,7 @@ (define-public emacs-ebuild-mode (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "07dzrdjjczkxdfdgi60h4jjkvzi4p0k9rij2wpfp8s03ay3qldpp")))) + "0bgi98vx6ahxijw69kfdiy3rkjdg7yi6k3bkjyasak5920m6fj1d")))) (build-system emacs-build-system) (home-page "https://devmanual.gentoo.org") (synopsis "Major modes for Gentoo package files") -- cgit v1.2.3 From 0e1a1ece9e93487b81cfa9b7ceeb82ab9f3cf556 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 12 Apr 2020 13:01:30 +0200 Subject: gnu: emacs-ebuild-mode: Build and install info file. * gnu/packages/emacs-xyz.scm (emacs-ebuild-mode)[arguments]: Build and install documentation in a new phase. [native-inputs]: Add "texinfo". --- gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 822a35ebbc..2d23c72d73 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7897,16 +7897,28 @@ (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") (version "1.50") - (source (origin - (method url-fetch) - (uri (string-append - "https://dev.gentoo.org/~ulm/emacs/ebuild-mode" - "-" version ".tar.xz")) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "0bgi98vx6ahxijw69kfdiy3rkjdg7yi6k3bkjyasak5920m6fj1d")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://dev.gentoo.org/~ulm/emacs/" + "ebuild-mode-" version ".tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 "0bgi98vx6ahxijw69kfdiy3rkjdg7yi6k3bkjyasak5920m6fj1d")))) (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "ebuild-mode.info") + (install-file "ebuild-mode.info" + (string-append (assoc-ref outputs "out") + "/share/info")) + #t))))) + (native-inputs + `(("texinfo" ,texinfo))) (home-page "https://devmanual.gentoo.org") (synopsis "Major modes for Gentoo package files") (description -- cgit v1.2.3 From f741e914ebc1e029d84f74da846a1a662ad69312 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 12 Apr 2020 13:21:10 +0200 Subject: gnu: emacs-org: Install documentation. * gnu/packages/emacs-xyz.scm (emacs-org)[arguments]: Add a phase to install info file and refcard. --- gnu/packages/emacs-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d23c72d73..541a526ad0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8488,6 +8488,17 @@ (define-public emacs-org (sha256 (base32 "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (info-dir (string-append share "/info")) + (doc-dir (string-append share "/doc/" ,name "-" ,version))) + (install-file "org" info-dir) + (install-file "orgcard.pdf" doc-dir)) + #t))))) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") (description "Org is an Emacs mode for keeping notes, maintaining TODO -- cgit v1.2.3 From 8c73e2f284d96b98b25af5be2e5a1b8c9f1c269b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 13:44:12 +0300 Subject: gnu: Add libgit2-0.28. * gnu/packages/version-control.scm (libgit2-0.28): New variable. --- gnu/packages/version-control.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5b75aee366..f71864ac24 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -653,6 +653,24 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) +(define-public libgit2-0.28 + (package + (inherit libgit2) + (version "0.28.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libgit2/libgit2/releases/" + "download/v" version + "/libgit2-" version ".tar.gz")) + (sha256 + (base32 + "0hjgpqjjmkciw1i8jqkx9q2vhdc4fc99qajhrj2bq8ziwsp6hyrb")) + (patches (search-patches "libgit2-mtime-0.patch")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "deps") #t)))))) + (define-public git-crypt (package (name "git-crypt") -- cgit v1.2.3 From 354490dfe9e60d1866dd6ff55a2d40d7ea9f9bf0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Apr 2020 13:44:57 +0300 Subject: gnu: julia: Use libgit2-0.28. * gnu/packages/julia.scm (julia)[inputs]: Replace libgit2 with libgit2-0.28. --- gnu/packages/julia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 6dd53b9283..16a4705a07 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -409,7 +409,7 @@ (define-public julia ("openlibm" ,openlibm) ("mbedtls" ,mbedtls-apache) ("curl" ,curl) - ("libgit2" ,libgit2) + ("libgit2" ,libgit2-0.28) ("libssh2" ,libssh2) ("fortran" ,gfortran) ("libuv" ,libuv-julia) -- cgit v1.2.3 From 93d5cea57e6cbbbf99066aef65da65795cf51fd6 Mon Sep 17 00:00:00 2001 From: nixo Date: Fri, 17 Jan 2020 19:40:55 +0100 Subject: build: julia-build-system: Update for new Julia version. * guix/build/julia-build-system.scm (generate-load-path): Delete function. (install): Don't set JULIA_LOAD_PATH. (precompile): Set SOURCE_DATE_EPOCH. Update calculating the JULIA_LOAD_PATH. Adjust the 'invoke-julia' command. (check): Set SOURCE_DATE_EPOCH. Adjust JULIA_LOAD_PATH. Signed-off-by: Efraim Flashner --- guix/build/julia-build-system.scm | 51 +++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm index ff6fcf5fe3..e8ebcf8ba0 100644 --- a/guix/build/julia-build-system.scm +++ b/guix/build/julia-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Nicolò Balzarotti +;;; Copyright © 2019, 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,53 +37,46 @@ (define (invoke-julia code) ;; subpath where we store the package content (define %package-path "/share/julia/packages/") -(define (generate-load-path inputs outputs) - (string-append - (string-join (map (match-lambda - ((_ . path) - (string-append path %package-path))) - ;; Restrict to inputs beginning with "julia-". - (filter (match-lambda - ((name . _) - (string-prefix? "julia-" name))) - inputs)) - ":") - (string-append ":" (assoc-ref outputs "out") %package-path) - ;; stdlib is always required to find Julia's standard libraries. - ;; usually there are other two paths in this variable: - ;; "@" and "@v#.#" - ":@stdlib")) - (define* (install #:key source inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (package-dir (string-append out %package-path - (string-append - (strip-store-file-name source))))) - (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) + (strip-store-file-name source)))) (mkdir-p package-dir) - (copy-recursively source package-dir)) + (copy-recursively (getcwd) package-dir)) #t) -;; TODO: Precompilation is working, but I don't know how to tell -;; julia to use use it. If (on rantime) we set HOME to -;; store path, julia tries to write files there (failing) (define* (precompile #:key source inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (builddir (string-append out "/share/julia/")) (package (strip-store-file-name source))) (mkdir-p builddir) + ;; With a patch, SOURCE_DATE_EPOCH is honored + (setenv "SOURCE_DATE_EPOCH" "1") (setenv "JULIA_DEPOT_PATH" builddir) - (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) - ;; Actual precompilation - (invoke-julia (string-append "using " package))) + ;; Add new package dir to the load path. + (setenv "JULIA_LOAD_PATH" + (string-append builddir "packages/" ":" + (or (getenv "JULIA_LOAD_PATH") + ""))) + ;; Actual precompilation: + (invoke-julia + ;; When using Julia as a user, Julia writes precompile cache to the first + ;; entry of the DEPOT_PATH list (by default, the home dir). We want to + ;; write it to the store, so let's push the store path as the first + ;; element of DEPOT_PATH. Once the cache file exists, this hack is not + ;; needed anymore (like in the check phase). If the user install new + ;; packages, those will be installed and precompiled in the home dir. + (string-append "pushfirst!(DEPOT_PATH, pop!(DEPOT_PATH)); using " package))) #t) (define* (check #:key source inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (package (strip-store-file-name source)) (builddir (string-append out "/share/julia/"))) + ;; With a patch, SOURCE_DATE_EPOCH is honored + (setenv "SOURCE_DATE_EPOCH" "1") (setenv "JULIA_DEPOT_PATH" builddir) - (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) + (setenv "JULIA_LOAD_PATH" (string-append builddir "packages/")) (invoke-julia (string-append "using Pkg;Pkg.test(\"" package "\")"))) #t) -- cgit v1.2.3 From db79c15073c5b672fa7233fddfb44a61678e83bf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 12 Apr 2020 15:05:35 +0200 Subject: gnu: mypaint-brushes: Update to 2.0.2. * gnu/packages/gimp.scm (mypaint-brushes): Update to 2.0.2. [source, homepage]: Update upstream location. [arguments]: Remove it. [license]: Update license. (mypaint-brushes-1.3): New variable. (gimp)[inputs]: Use new variable. --- gnu/packages/gimp.scm | 52 +++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ab0dbcc925..d13390c214 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -183,7 +183,7 @@ (define-public gimp ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) ("libmypaint" ,libmypaint) - ("mypaint-brushes" ,mypaint-brushes) + ("mypaint-brushes" ,mypaint-brushes-1.3) ("exif" ,libexif) ; optional, EXIF + XMP support ("lcms" ,lcms) ; optional, color management ("librsvg" ,librsvg) ; optional, SVG support @@ -298,34 +298,42 @@ (define-public libmypaint (define-public mypaint-brushes (package (name "mypaint-brushes") - (version "1.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Jehan/mypaint-brushes.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0")))) + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mypaint/mypaint-brushes.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-dependency-version - (lambda _ - (substitute* "autogen.sh" - (("automake-1.13") "automake") - (("aclocal-1.13") "aclocal")) - #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (synopsis "Default brushes for MyPaint") (description "This package provides the default set of brushes for MyPaint.") - (home-page "https://github.com/Jehan/mypaint-brushes") - (license license:cc0))) + (home-page "https://github.com/mypaint/mypaint-brushes/") + ;; Scripts are distributed under GPL2+ terms, brushes are provided as + ;; public domain or under CC0 terms. + (license (list license:gpl2+ license:cc0 license:public-domain)))) + +(define-public mypaint-brushes-1.3 + (package + (inherit mypaint-brushes) + (name "mypaint-brushes") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mypaint/mypaint-brushes.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j")))))) (define-public gimp-resynthesizer ;; GIMP does not respect any plugin search path environment variable, so after -- cgit v1.2.3 From c492b23fb1c33e9f5d1c1f07e4bb3d364fe36df8 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 11 Apr 2020 20:23:42 +0200 Subject: gnu: openttd-opengfx: Update to 0.6.0. * gnu/packages/games.scm (openttd-opengfx)[version]: Update to 0.6.0. [source]: Change uri to cdn.openttd.org. [native-inputs]: Add which. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 31e1936795..5543e46ac8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3034,15 +3034,15 @@ (define openttd-engine (define openttd-opengfx (package (name "openttd-opengfx") - (version "0.5.5") + (version "0.6.0") (source (origin (method url-fetch) - (uri (string-append "http://binaries.openttd.org/extra/opengfx/" + (uri (string-append "https://cdn.openttd.org/opengfx-releases/" version "/opengfx-" version "-source.tar.xz")) (sha256 (base32 - "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49")))) + "0qxc6gl2gxcrn1np88dnjgbaaakkkx96b13rcmy1spryc8c09hyr")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" @@ -3072,6 +3072,7 @@ (define openttd-opengfx ("gimp" ,gimp) ("grfcodec" ,grfcodec) ("nml" ,nml) + ("which" ,which) ("python" ,python-2))) (home-page "http://dev.openttdcoop.org/projects/opengfx") (synopsis "Base graphics set for OpenTTD") -- cgit v1.2.3 From 842a9d8f56794abe3266be904ad7574a2dc5a286 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 11 Apr 2020 20:23:43 +0200 Subject: gnu: openttd: Update to 1.10.0. The os/dos subdirectory has been removed by upstream commit: fdb804d86bcab8d0529bdf6ca925bed04ad2f047 * gnu/packages/games.scm (openttd)[version]: Update to 1.10.0. [source]: Change uri to cdn.openttd.org, remove snippet & modules. --- gnu/packages/games.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5543e46ac8..ba3a199b97 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2971,20 +2971,14 @@ (define-public manaplus (define openttd-engine (package (name "openttd-engine") - (version "1.9.3") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/" + (uri (string-append "https://cdn.openttd.org/openttd-releases/" version "/openttd-" version "-source.tar.xz")) (sha256 (base32 - "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r")) - (modules '((guix build utils))) - (snippet - ;; The DOS port contains proprietary software. - '(begin - (delete-file-recursively "os/dos") - #t)))) + "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From b7851222a812668b630803e477225a222ad8636b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Apr 2020 15:26:42 +0200 Subject: gnu: gn: Update to 0.0-1736.ec938dd. * gnu/packages/build-tools.scm (gn): Update to 0.0-1736.ec938dd. [arguments]: Adjust last_commit_position.h for upstream changes. --- gnu/packages/build-tools.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 8cfd26fec0..d27c951d43 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier @@ -103,8 +103,8 @@ (define-public bear (license license:gpl3+))) (define-public gn - (let ((commit "6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349") - (revision "1666")) ;as returned by `git describe`, used below + (let ((commit "ec938ddaa276646eb8f1ab33e160c156011d8217") + (revision "1736")) ;as returned by `git describe`, used below (package (name "gn") (version (git-version "0.0" revision commit)) @@ -114,7 +114,7 @@ (define-public gn (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "157ax65sixjm0i1j89wvny48v1mbsl4pbvv5vqinjc6r0fryaf2r")) + "0j1qjwp2biw12s6npzpx4z8nvih7pyn68q6cz2k4700bk9y0d574")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -135,8 +135,10 @@ (define-public gn (call-with-output-file "out/last_commit_position.h" (lambda (port) (format port - "#define LAST_COMMIT_POSITION \"~a (~a)\"\n" - ,revision ,(string-take commit 8)) + (string-append + "#define LAST_COMMIT_POSITION_NUM ~a\n" + "#define LAST_COMMIT_POSITION \"~a (~a)\"\n") + ,revision ,revision ,(string-take commit 8)) #t)))) (replace 'build (lambda _ -- cgit v1.2.3 From e15acf8cac3378745b761dbd9b05385de74e07f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Apr 2020 17:35:31 +0200 Subject: gnu: icu4c: Add 66.1. * gnu/packages/icu4c.scm (icu-66.1): New public variable. --- gnu/packages/icu4c.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 3869016df3..beeb2d7ff4 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +117,24 @@ (define icu4c/fixed (search-patches "icu4c-CVE-2020-10531.patch"))))))) +(define-public icu4c-66.1 + (package + (inherit icu4c) + (version "66.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) + "/icu4c-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-src.tgz")) + (patch-flags '("-p2")) + (patches (search-patches "icu4c-CVE-2020-10531.patch")) + (sha256 + (base32 + "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))))) + (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From 25c93be652d3c982b63dd011d5dcf0cdc69c27a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Apr 2020 19:00:12 +0200 Subject: gnu: ungoogled-chromium: Update to 81.0.4044.92-0.b484ad4 [security fixes]. This release fixes CVE-2020-6430, CVE-2020-6456, CVE-2020-6431, CVE-2020-6432, CVE-2020-6433, CVE-2020-6434, CVE-2020-6435, CVE-2020-6436, CVE-2020-6437, CVE-2020-6438, CVE-2020-6439, CVE-2020-6440, CVE-2020-6441, CVE-2020-6442, CVE-2020-6443, CVE-2020-6444, CVE-2020-6445, CVE-2020-6446, CVE-2020-6447, and CVE-2020-6448. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 81. (%chromium-version): Set to 81.0.4044.92. (%ungoogled-revision): Set to b484ad4c0bdb696c86d941798ae6b0e2bd0db35d. (%debian-revision): Set to debian/81.0.4044.92-1. (%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes. (ungoogled-chromium-source): Remove PYTHON-2 from the environment, use PYTHON-WRAPPER instead. Call "remove_bundled_libraries.py" using PYTHON-2 directly. (ungoogled-chromium)[arguments]: Remove "is_cfi=false" from #:configure-flags. Adjust CXXFLAGS to ignore unknown compiler warnings. [inputs]: Change from ICU4C to ICU4C-66.1. --- gnu/packages/chromium.scm | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3d079559f3..f79254d825 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -135,8 +135,11 @@ (define %preserved-third-party-files "third_party/dawn" ;ASL2.0 "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 + "third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat + "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 "third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0 "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 + "third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0 "third_party/dom_distiller_js" ;BSD-3 "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 @@ -196,7 +199,6 @@ (define %preserved-third-party-files "third_party/qcms" ;Expat "third_party/rnnoise" ;BSD-3 "third_party/s2cellid" ;ASL2.0 - "third_party/sfntly" ;ASL2.0 "third_party/skia" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3 "third_party/skia/third_party/skcms" ;BSD-3 @@ -206,7 +208,6 @@ (define %preserved-third-party-files "third_party/spirv-headers" ;ASL2.0 "third_party/SPIRV-Tools" ;ASL2.0 "third_party/sqlite" ;Public domain - "third_party/ungoogled" ;BSD-3 "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 "third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3 @@ -247,9 +248,9 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %chromium-version "80.0.3987.163") -(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95") -(define %debian-revision "debian/80.0.3987.116-1") +(define %chromium-version "81.0.4044.92") +(define %ungoogled-revision "b484ad4c0bdb696c86d941798ae6b0e2bd0db35d") +(define %debian-revision "debian/81.0.4044.92-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" package-revision "." @@ -263,7 +264,7 @@ (define %chromium-origin %chromium-version ".tar.xz")) (sha256 (base32 - "0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn")))) + "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2")))) (define %ungoogled-origin (origin @@ -274,7 +275,7 @@ (define %ungoogled-origin (string-take %ungoogled-revision 7))) (sha256 (base32 - "0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q")))) + "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l")))) (define %debian-origin (origin @@ -288,7 +289,7 @@ (define %debian-origin (_ (string-take %debian-revision 7))))) (sha256 (base32 - "1cc5sp566dd8f2grgr770xwbxgxf58dk1w7q3s8pmv4js5h3pwq8")))) + "0srgbcqga3l75bfkv3bnmjk416189nazsximvzdx2k5n8v5k4p3m")))) ;; This is a "computed" origin that does the following: ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball. @@ -319,8 +320,7 @@ (define ungoogled-chromium-source (list #+(canonical-package patch) #+(canonical-package xz) #+(canonical-package tar) - #+python-2 - #+python)) + #+python-wrapper)) (copy-recursively #+ungoogled-source "/tmp/ungoogled") @@ -338,11 +338,11 @@ (define ungoogled-chromium-source (format #t "Ungooglifying...~%") (force-output) - (invoke "python3" "utils/prune_binaries.py" chromium-dir + (invoke "python" "utils/prune_binaries.py" chromium-dir "pruning.list") - (invoke "python3" "utils/patches.py" "apply" + (invoke "python" "utils/patches.py" "apply" chromium-dir "patches") - (invoke "python3" "utils/domain_substitution.py" "apply" "-r" + (invoke "python" "utils/domain_substitution.py" "apply" "-r" "domain_regex.list" "-f" "domain_substitution.list" "-c" "/tmp/domainscache.tar.gz" chromium-dir) @@ -390,13 +390,13 @@ (define ungoogled-chromium-source (format #t "Pruning third party files...~%") (force-output) - (apply invoke "python" + (apply invoke (string-append #+python-2 "/bin/python") "build/linux/unbundle/remove_bundled_libraries.py" "--do-remove" preserved-files) (format #t "Replacing GN files...~%") (force-output) - (invoke "python3" "build/linux/unbundle/replace_gn_files.py" + (invoke "python" "build/linux/unbundle/replace_gn_files.py" "--system-libraries" "ffmpeg" "flac" "fontconfig" "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" @@ -462,7 +462,6 @@ (define-public ungoogled-chromium ;; directory for an exhaustive list of supported flags. ;; (Note: The 'configure' phase will do that for you.) (list "is_debug=false" - "is_cfi=false" "use_gold=false" "use_lld=false" "clang_use_chrome_plugins=false" @@ -648,8 +647,13 @@ (define-public ungoogled-chromium (setenv "AR" "ar") (setenv "NM" "nm") (setenv "CC" "clang") (setenv "CXX" "clang++") - ;; Do not optimize away null pointer safety checks. - (setenv "CXXFLAGS" "-fno-delete-null-pointer-checks") + (setenv "CXXFLAGS" + (string-join + '(;; Do not optimize away null pointer safety checks. + "-fno-delete-null-pointer-checks" + ;; Disable warnings about unknown warnings that require + ;; Clang plugins or newer versions. + "-Wno-unknown-warning-option"))) ;; TODO: pre-compile instead. Avoids a race condition. (setenv "PYTHONDONTWRITEBYTECODE" "1") @@ -795,7 +799,7 @@ (define-public ungoogled-chromium ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c) + ("icu4c" ,icu4c-66.1) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) -- cgit v1.2.3 From 28264388ccbf381a66a3ae3e0c111574899da7c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Apr 2020 19:37:05 +0200 Subject: gnu: Add jucipp. * gnu/packages/text-editors.scm (jucipp): New public variable. --- gnu/packages/text-editors.scm | 96 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b7758f106d..48f19ecb1b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019, 2020 Nicolas Goaziou +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,12 +31,14 @@ (define-module (gnu packages text-editors) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages aspell) #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -49,6 +52,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages libbsd) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -61,6 +65,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -187,6 +192,97 @@ (define-public joe bindings and many of the powerful features of GNU Emacs.") (license license:gpl3+))) +(define-public jucipp + (package + (name "jucipp") + (version "1.5.1") + (home-page "https://gitlab.com/cppit/jucipp") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)) + ;; Two submodules are required which are + ;; developed alongside JuCi++ and difficult + ;; to package separately. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_TESTING=ON" + + ;; These arguments are here to facilitate an "in-source" + ;; build using "./build" instead of the default "../build". + ;; The test suite expects that to be the case. + "..") + #:out-of-source? #f + #:phases (modify-phases %standard-phases + (add-before 'configure 'enter-build-directory + (lambda _ + (mkdir "build") + (chdir "build") + #t)) + + ;; This phase is necessary to fix a test failure, see + ;; . + (add-after 'unpack 'add-reference-to-clang-internal-header + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/compile_commands.cc" + ((".*-I/usr/lib/clang.*" all) + (string-append "arguments.emplace_back(\"-I" + (assoc-ref inputs "libclang") + "/lib/clang/" + ,@(list (package-version clang)) + "/include\");\n" + all))) + #t)) + (add-after 'unpack 'patch-tiny-process-library + (lambda _ + (with-directory-excursion "lib/tiny-process-library" + (substitute* '("process_unix.cpp" + "tests/io_test.cpp") + (("/bin/sh") (which "sh")))) + #t)) + (add-after 'unpack 'disable-git-test + (lambda _ + (substitute* "tests/CMakeLists.txt" + ;; Disable the git test, as it requires the full checkout. + (("add_test\\(git_test.*\\)") "")) + #t)) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests do not expect HOME to be empty. + (setenv "HOME" "/etc") + + ;; Most tests require an X server. + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + (system (string-append xorg-server "/bin/Xvfb " + display " &"))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("aspell" ,aspell) + ("boost" ,boost) + ("gtkmm" ,gtkmm) + ("gtksourceviewmm" ,gtksourceviewmm) + ("libclang" ,clang) + ("libgit2" ,libgit2))) + (synopsis "Lightweight C++ IDE") + (description + "juCi++ is a small @dfn{IDE} (Integrated Development Environment) +designed especially towards libclang with speed, stability, and ease of use +in mind. + +It supports autocompletion, on-the-fly warnings and errors, syntax +highlighting, and integrates with Git as well as the CMake and Meson build +systems.") + (license license:expat))) + (define-public leafpad (package (name "leafpad") -- cgit v1.2.3 From e3e13b128a047126eb1669f591d445baef0ac991 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:30:02 -0700 Subject: gnu: kdepim-apps-libs: Fix typo "This package". * gnu/packages/kde-pim (kdepim-apps-libs): Fix typo. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fea6dd3068..adcfc57e11 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -670,7 +670,7 @@ (define-public kdepim-apps-libs ("qtbase" ,qtbase))) (home-page "https://cgit.kde.org/kdepim-apps-libs.git") (synopsis "KDE PIM mail related libraries and data files") - (description "This packages provides mail related libraries and data files + (description "This package provides mail related libraries and data files for KDE PIM.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) -- cgit v1.2.3 From 507779fdba6513099bf1c55ac0ded1e3008a9533 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:31:39 -0700 Subject: gnu: kmessagelib: Fix typo "This package". * gnu/packages/kde-pim (kmessagelib): Fix typo. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index adcfc57e11..b9a1020dea 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1346,7 +1346,7 @@ (define-public kmessagelib `(#:tests? #f)) ;; TODO many test fail for quite different reasons (home-page "https://cgit.kde.org/messagelib.git") (synopsis "KDE PIM messaging libraries") - (description "This packages provides several libraries for messages, + (description "This package provides several libraries for messages, e.g. a message list, a mime tree parse, a template parser and the kwebengineviewer.") (license ;; GPL for programs, LGPL for libraries -- cgit v1.2.3 From 01eb17de55247a23d7b069174579f3016295d9b3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 12:01:07 -0700 Subject: gnu: ruby-notiffany: Fix spelling of "library". * gnu/packages/ruby (ruby-notiffany): Fix typos. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a31f177349..4d6d323442 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1771,8 +1771,8 @@ (define-public ruby-notiffany ("ruby-nenv" ,ruby-nenv))) (native-inputs `(("bundler" ,bundler))) - (synopsis "Wrapper libray for notification libraries") - (description "Notiffany is a Ruby wrapper libray for notification + (synopsis "Wrapper library for notification libraries") + (description "Notiffany is a Ruby wrapper library for notification libraries such as Libnotify.") (home-page "https://github.com/guard/notiffany") (license license:expat))) -- cgit v1.2.3 From a4f33f381a9c369ee263508d6ee28ba3967e4195 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:44:25 -0700 Subject: gnu: emacs-dhall-mode: Fix spelling of "indentation". * gnu/packages/emacs-xyz (emacs-dhall-mode): Fix typo. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 541a526ad0..c43cb5e1cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1565,7 +1565,7 @@ (define-public emacs-dhall-mode @itemize @item Syntax highlighting @item Multiline support for String -@item Basic indendation, commenting +@item Basic indentation, commenting @item Automatic formatting on save using dhall-format. @item Error highlighting. @end itemize") -- cgit v1.2.3 From db7e24ce87194bcd723d408549f4a7be8749110a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:46:33 -0700 Subject: gnu: go-golang.org-x-sync-errgroup: Fix spelling of "cancellation". * gnu/packages/golang (go-golang.org-x-sync-errgroup): Fix typo. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6fc5181d6c..69f46df743 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3281,7 +3281,7 @@ (define-public go-golang.org-x-sync-errgroup (synopsis "Synchronization, error propagation, and Context cancellation for groups of goroutines working on subtasks of a common task.") (description "This package provides synchronization, error propagation, -and Context cancelation for groups of goroutines working on subtasks of a +and Context cancellation for groups of goroutines working on subtasks of a common task.") (home-page "https://godoc.org/golang.org/x/sync/errgroup") (license license:bsd-3)))) -- cgit v1.2.3 From 5995a9f7d1d93f241dce028c26fb03bb5914d3c9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:48:34 -0700 Subject: gnu: kmail: Fix spelling of "Environments". * gnu/packages/kde-pim (kmail): Fix typo. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index b9a1020dea..8dbc7bd591 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1095,7 +1095,7 @@ (define-public kmail (description "KMail supports multiple accounts, mail filtering and email encryption. The program let you configure your workflow and it has good integration into KDE (Plasma Desktop) but is also useable with other Desktop -Envionments. +Environments. KMail is the email component of Kontact, the integrated personal information manager from KDE.") -- cgit v1.2.3 From 5a03345898a542e71b94ad0f25b9917f91b5866c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:50:08 -0700 Subject: gnu: kdav: Fix spelling of "implementation". * gnu/packages/kde-pim (kdav): Fix typo. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 8dbc7bd591..cb24f0efbf 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -623,7 +623,7 @@ (define-public kdav ("qtxmlpatterns" ,qtxmlpatterns))) (home-page "https://cgit.kde.org/kdav.git") (synopsis "DAV protocol implementation with KJobs") - (description "This is a DAV protocol implemention with KJobs. Calendars + (description "This is a DAV protocol implementation with KJobs. Calendars and todos are supported, using either GroupDAV or CalDAV, and contacts are supported using GroupDAV or CardDAV.") (license ;; GPL for programs, LGPL for libraries -- cgit v1.2.3 From 1d0feeb09c5d6b84d8d45173f56593e09b1ad52f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:54:23 -0700 Subject: gnu: bctoolbox: Fix pluralization of "software". * gnu/packages/linphone (bctoolbox): Fix typo. --- gnu/packages/linphone.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 50d75a4a95..c9959d7d01 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -99,7 +99,7 @@ (define-public bctoolbox ("mbedtls" ,mbedtls-apache))) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne -Communications softwares like belle-sip, mediastreamer2 and linphone.") +Communications software like belle-sip, mediastreamer2 and linphone.") (home-page "https://gitlab.linphone.org/BC/public/bctoolbox") (license license:gpl2+))) -- cgit v1.2.3 From 67e2e1718cc79c73bb0272b691522b7d41a73bb3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:56:49 -0700 Subject: gnu: libqalculate: Fix spelling of "uncertainty". * gnu/packages/maths (libqalculate): Fix typo. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cd786ac0e8..ed856e09c9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5452,7 +5452,7 @@ (define-public libqalculate It provides basic and advanced functionality. Features include customizable functions, unit calculations, and conversions, physical constants, symbolic calculations (including integrals and equations), arbitrary precision, -uncertainity propagation, interval arithmetic, plotting and a user-friendly +uncertainty propagation, interval arithmetic, plotting and a user-friendly cli.") (license license:gpl2+))) -- cgit v1.2.3 From f5dd283c4cdda2ae012c05b38007ae138d043207 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:58:51 -0700 Subject: gnu: flyer-composer: Fix spelling of "command". * gnu/packages/pdf (flyer-composer): Fix typo. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e9a9b619e7..6ea17ffe49 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -135,7 +135,7 @@ (define-public flyer-composer times. If you have a second page, Flyer Composer can arrange it the same way - even if the second page is in a separate PDF file. -This package contains both the commnd line tool and the gui too.") +This package contains both the command line tool and the gui too.") (license license:agpl3+))) (define-public flyer-composer-cli -- cgit v1.2.3 From e0e873a9b428e74a04d9b90c0649ab3030e131d0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 11:59:31 -0700 Subject: gnu: flyer-composer-cli: Fix spelling of "command". * gnu/packages/pdf (flyer-composer-cli): Fix typo. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6ea17ffe49..3b26acb439 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -162,7 +162,7 @@ (define-public flyer-composer-cli times. If you have a second page, Flyer Composer can arrange it the same way - even if the second page is in a separate PDF file. -This package contains only the commnd line tool. If you like to use the gui, +This package contains only the command line tool. If you like to use the gui, please install the @code{flyer-composer-gui} package."))) (define-public poppler -- cgit v1.2.3 From 0b7a94cb1353406e7f76f68e9d60418bcd0460ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Apr 2020 18:04:59 +0200 Subject: gnu: weechat: Update to 2.8. * gnu/packages/irc.scm (weechat): Update to 2.8. --- gnu/packages/irc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index acaf25f745..95b8123b8e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -170,14 +170,14 @@ (define-public irssi (define-public weechat (package (name "weechat") - (version "2.7.1") + (version "2.8") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "0haw0c35mf4r47j24issc9caq0da3fy7gjfq3454fm3ap3n2yxcx")))) + "1301lrb3xnm9dcw3av82rkqjzqxxwwhrq0p6i37h6fxdxnas4gjm")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -193,7 +193,7 @@ (define-public weechat ("zlib" ,zlib) ;; Scripting language plug-ins. - ("guile" ,guile-2.2) + ("guile" ,guile-3.0) ("lua" ,lua-5.1) ("perl" ,perl) ("python" ,python) -- cgit v1.2.3 From 707f15bcb4ff4e2ad24a8b9d109c77f59a096890 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Apr 2020 20:18:40 +0200 Subject: gnu: brial: Update to 1.2.8. * gnu/packages/sagemath.scm (brial): Update to 1.2.8. --- gnu/packages/sagemath.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 47bf9a9c88..b96cb6b96e 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -331,7 +331,7 @@ (define-public zn-poly (define-public brial (package (name "brial") - (version "1.2.7") + (version "1.2.8") (source (origin (method git-fetch) @@ -340,7 +340,7 @@ (define-public brial (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm")))) + (base32 "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 7b23a69d6b97c463cb1ef237931af11c22c19c67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Apr 2020 18:05:45 +0200 Subject: gnu: wine-staging-patchset-data: Update to 5.6. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.6. (wine-staging)[source]: Update hash. --- gnu/packages/wine.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 541ef3cd7a..2c48bebdbf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017, 2020 Nicolas Goaziou -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. @@ -328,7 +328,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.3") + (version "5.6") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6")))) + (base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -387,7 +387,7 @@ (define-public wine-staging "/wine-" version ".tar.xz"))) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv")))) + (base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 4a0dda74fc7188931f5dc9998b63b7ae01c58ed5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 12:50:01 -0700 Subject: services: libvirt-configuration: Fix grammar of "allows to select" to "allows selecting". * gnu/services/virtualization (libvirt-configuration): Fix grammar. --- gnu/services/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index d473c5342e..989e439d5d 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -285,7 +285,7 @@ (define-configuration libvirt-configuration (string "3:remote 4:event") "Logging filters. -A filter allows to select a different logging level for a given category +A filter allows selecting a different logging level for a given category of logs The format for a filter is one of: @itemize -- cgit v1.2.3 From 0b14f150e9a4ad9155319c86234fb6a826649141 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 12:51:56 -0700 Subject: gnu: libogg: Fix grammar of "allows to manipulate" to "manipulates". * gnu/packages/xiph (libogg): Fix grammar. --- gnu/packages/xiph.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 794dad517e..7c71bf0a28 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -74,7 +74,7 @@ (define libogg '(#:configure-flags '("--disable-static"))) (synopsis "Library for manipulating the ogg multimedia format") (description - "The libogg library allows to manipulate the ogg multimedia container + "The libogg library manipulates the ogg multimedia container format, which encapsulates raw compressed data and allows the interleaving of audio and video data. In addition to encapsulation and interleaving of multiple data streams, ogg provides packet framing, error detection, and -- cgit v1.2.3 From 0cf069c2a5ebc81fc5776e48e9065f8ec2b690a6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 12:56:31 -0700 Subject: gnu: wmctrl: Fix grammar of "allows to interact" to "interacts" * gnu/packages/xdisorg (wmctrl): Fix grammar. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8605f7c03a..4a8b7ebfe5 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -602,7 +602,7 @@ (define-public wmctrl (home-page "http://tomas.styblo.name/wmctrl/") (synopsis "Command-line tool to control X window managers") (description - "Wmctrl allows to interact with an X window manager that is compatible + "Wmctrl interacts with an X window manager that is compatible with the EWMH/NetWM specification. It can query the window manager for information, and request for certain window management actions (resize and move windows, switch between desktops, etc.).") -- cgit v1.2.3 From a74ae84a36d1ccfcc4d7403fe1b718bd32873724 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:01:07 -0700 Subject: gnu: libpsl: Fix grammar "allows to load" to "allowing to load". * gnu/packages/web (libpsl): Fix grammar. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5e393db463..0092477679 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1269,7 +1269,7 @@ (define-public libpsl highlighting parts of the domain in a user interface, and sorting domain lists by site. -Libpsl has built-in PSL data for fast access, allows to load PSL data from +Libpsl has built-in PSL data for fast access, allowing to load PSL data from files, checks if a given domain is a public suffix, provides immediate cookie domain verification, finds the longest public part of a given domain, finds the shortest private part of a given domain, works with international -- cgit v1.2.3 From eee98f96a6a79ea7c593e70e4170f5ec84e3726c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:02:54 -0700 Subject: gnu: fe: Fix grammar "allows to fold" to "folds". * gnu/packages/text-editors (fe): Fix grammar. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 48f19ecb1b..36571e7846 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -908,7 +908,7 @@ (define-public fe `(("ncurses" ,ncurses))) (home-page "http://www.moria.de/~michael/fe/") (synopsis "Small folding editor") - (description "Fe is a small folding editor. It allows to fold + (description "Fe is a small folding editor. It folds arbitrary text regions; it is not bound to syntactic units. Fe has no configuration or extension language and requires no setup. -- cgit v1.2.3 From a3316a35d414d3afba1883930586d10359ebfbe3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:09:55 -0700 Subject: gnu: python-rst.linker: Fix grammar of "allows to automatically replace" to "automatically replaces". * gnu/packages/python-xyz (python-rst.linker): Fix grammar. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 64b1e6d8dc..f8339d008f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3552,7 +3552,7 @@ (define-public python-rst.linker ;; Note: As of version 1.7 the documentation is not worth building. (home-page "https://github.com/jaraco/rst.linker") (synopsis "Sphinx plugin to add links and timestamps") - (description "rst.linker allows to automatically replace text by a + (description "rst.linker automatically replaces text by a reStructuredText external reference or timestamps. It's primary purpose is to augment the changelog, but it can be used for other documents, too.") (license license:expat))) -- cgit v1.2.3 From ed8a9de8feface032296d7a4ef920cc8a7fffad1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:07:46 -0700 Subject: gnu: r-robustbase: Fix grammar of "allows to analyze" to "analyzes". * gnu/packages/statistics (r-robustbase): Fix grammar. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c05f2419d0..d3f75ce57b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4781,7 +4781,7 @@ (define-public r-robustbase (home-page "http://robustbase.r-forge.r-project.org/") (synopsis "Basic robust statistics") (description - "This package allows to analyze data with robust methods such as + "This package analyzes data with robust methods such as regression methodology including model selections and multivariate statistics.") (license license:gpl2+))) -- cgit v1.2.3 From c567ce5498555680c4197f6385ef4b379d93e3ff Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:12:42 -0700 Subject: gnu: python-setproctitle: Fix grammar of "allows to identify" to "allows identifying". * gnu/packages/python-xyz (python-setproctitle): Fix grammar. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f8339d008f..089a2ea6ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12658,7 +12658,7 @@ (define-public python-setproctitle Changing the title is mostly useful in multi-process systems, for example when a master process is forked: changing the children's title -allows to identify the task each process is busy with. The technique +allows identifying the task each process is busy with. The technique is used by PostgreSQL and the OpenSSH Server for example.") (license license:bsd-3) (properties `((python2-variant . ,(delay python2-setproctitle)))))) -- cgit v1.2.3 From dbc5461857526a830a4de46a7234dd6b0a39a582 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:15:26 -0700 Subject: gnu: python-pifpaf: Fix grammar of "allows to start and stop" to "starts and stops". * gnu/packages/python-xyz (python-pifpaf): Fix grammar. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 089a2ea6ce..9cff96b0a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19028,7 +19028,7 @@ (define-public python-pifpaf (home-page "https://github.com/jd/pifpaf") (synopsis "Tools and fixtures to manage daemons for testing in Python") (description "Pifpaf is a suite of fixtures and a command-line tool that -allows to start and stop daemons for a quick throw-away usage. This is typically +starts and stops daemons for a quick throw-away usage. This is typically useful when needing these daemons to run integration testing. It originally evolved from its precursor @code{overtest}.") (license license:asl2.0))) -- cgit v1.2.3 From 971b57d2ff0912af6e98e07a2713518692de0a8b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:18:39 -0700 Subject: gnu: xournalpp: Fix grammar of "Allow to map" to "Map". * gnu/packages/pdf (xournalpp): Fix grammar. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 3b26acb439..9d517bbf2f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -885,7 +885,7 @@ (define-public xournalpp @item Fill shape functionality @item PDF Export (with and without paper style) @item PNG Export (with and without transparent background) -@item Allow to map different tools / colors etc. to stylus buttons / +@item Map different tools / colors etc. to stylus buttons / mouse buttons @item Sidebar with Page Previews with advanced page sorting, PDF Bookmarks and Layers (can be individually hidden, editing layer can be -- cgit v1.2.3 From 7133049f1091c9afbe521668e0d7183a5ca54e14 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:20:52 -0700 Subject: gnu: pass-git-helper: Fix grammar of "allows to use" to "uses". * gnu/packages/password-utils (pass-git-helper): Fix grammar. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 333fbfa026..27e032d827 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -846,8 +846,8 @@ (define-public pass-git-helper ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/languitar/pass-git-helper") (synopsis "Git credential helper interfacing with pass") - (description "pass-git-helper is a git credential helper which allows to -use pass, the standard unix password manager, as the credential backend for + (description "pass-git-helper is a git credential helper which +uses pass, the standard unix password manager, as the credential backend for your git repositories. This is achieved by explicitly defining mappings between hosts and entries in the password store.") (license license:lgpl3+))) -- cgit v1.2.3 From 48b0d9c071397a5de5b5c2c5b8bc4b87b757bcc2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:26:27 -0700 Subject: gnu: dune-subgrid: Fix grammar of "allows to mark" to "marks". * gnu/packages/maths (dune-subgrid): Fix grammar. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ed856e09c9..9930f491a2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4985,7 +4985,7 @@ (define-public dune-subgrid ("pkg-config" ,pkg-config))) (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") (synopsis "Distributed and Unified Numerics Environment") - (description "The dune-subgrid module allows to mark elements of + (description "The dune-subgrid module marks elements of another hierarchical dune grid. The set of marked elements can then be accessed as a hierarchical dune grid in its own right. Dune-Subgrid provides the full grid interface including adaptive mesh refinement.") -- cgit v1.2.3 From bf052724599a9da7fa66a380fc6c2c00369b0c99 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:24:39 -0700 Subject: gnu: ocaml-qcheck: Fix grammar of "allows to check" to "checks". * gnu/packages/ocaml (ocaml-qcheck): Fix grammar. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 84efe2c1de..8e48e3d8b6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1179,7 +1179,7 @@ (define-public ocaml-qcheck (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This -module allows to check invariants (properties of some types) over randomly +module checks invariants (properties of some types) over randomly generated instances of the type. It provides combinators for generating instances and printing them.") (license license:lgpl3+))) -- cgit v1.2.3 From cc24c4cb12abbd777e7f0a79dd4c052b5f4d157d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:28:22 -0700 Subject: gnu: shogun: Fix grammar of "allows to combine" to "combines". * gnu/packages/machine-learning (shogun): Fix grammar. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3e32b3cfff..9a88b53415 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -570,8 +570,8 @@ (define (delete-ifdefs file) (synopsis "Machine learning toolbox") (description "The Shogun Machine learning toolbox provides a wide range of unified and -efficient Machine Learning (ML) methods. The toolbox seamlessly allows to -combine multiple data representations, algorithm classes, and general purpose +efficient Machine Learning (ML) methods. The toolbox seamlessly +combines multiple data representations, algorithm classes, and general purpose tools. This enables both rapid prototyping of data pipelines and extensibility in terms of new algorithms.") (license license:gpl3+))) -- cgit v1.2.3 From 3bb22e5433919816c021aaba1f6d1220d1a57151 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:29:47 -0700 Subject: gnu: emacs-clang-format: Fix grammar of "allows to filter" to "filters". * gnu/packages/llvm (emacs-clang-format): Fix grammar. --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 41217d14f0..7236567a5e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -816,7 +816,7 @@ (define-public emacs-clang-format (string-append clang "/bin/clang-format")))) #t))))) (synopsis "Format code using clang-format") - (description "This package allows to filter code through @code{clang-format} + (description "This package filters code through @code{clang-format} to fix its formatting. @code{clang-format} is a tool that formats C/C++/Obj-C code according to a set of style options, see @url{https://clang.llvm.org/docs/ClangFormatStyleOptions.html}."))) -- cgit v1.2.3 From 102fc7bc194c35562f189d899cb6ca1b067a4567 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:33:27 -0700 Subject: gnu: sbcl-unix-opts: Fix grammar of "allows to precisely control" to "precisely controls". * gnu/packages/lisp-xyz (sbcl-unix-opts): Fix grammar. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7edaf6bd1e..024daa4481 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2785,8 +2785,8 @@ (define-public sbcl-unix-opts options once and then use this definition for parsing and extraction of command line arguments, as well as printing description of command line options (you get --help for free). This way you don't need to repeat -yourself. Also, @command{unix-opts} doesn't depend on anything and allows to -precisely control behavior of the parser via Common Lisp restarts.") +yourself. Also, @command{unix-opts} doesn't depend on anything and +precisely controls the behavior of the parser via Common Lisp restarts.") (license license:expat))) (define-public cl-unix-opts -- cgit v1.2.3 From 44fc2f54c1bfc12b05eb1de7a0d248ceb798f752 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:38:21 -0700 Subject: gnu: dolphin: Fix grammar of "allows to navigate" to "navigates". * gnu/packages/kde-systemtools (dolphin): Fix grammar. --- gnu/packages/kde-systemtools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index cd1b442169..d51566341d 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -83,7 +83,7 @@ (define-public dolphin (description "Dolphin is a file manager for KDE focusing on usability. The main features of Dolphin are: @itemize -@item Navigation bar for URLs, which allows to navigate quickly +@item Navigation bar for URLs, which navigates quickly through the file hierarchy. @item View properties are remembered for each folder. @item Split of views is supported. -- cgit v1.2.3 From 4ecb544a6d360a86b7f2642cd06ee74829d10f96 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:36:36 -0700 Subject: gnu: lirc: Fix grammar of "allows to translate" to "translates". * gnu/packages/lirc (lirc): Fix grammar. --- gnu/packages/lirc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 5e77f1ddc2..510bc032f8 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -98,7 +98,7 @@ (define-public lirc "LIRC allows computers to send and receive IR signals of many commonly used remote controls. The most important part of LIRC is the @code{lircd} daemon that decodes IR signals received by the device drivers. The second -daemon program @code{lircmd} allows to translate IR signals to mouse movements. +daemon program @code{lircmd} translates IR signals to mouse movements. The user space applications allow you to control your computer with a remote control: you can send X events to applications, start programs and much more on just one button press.") -- cgit v1.2.3 From 79d7db4159aaab0ecde638f875d7a6d091c9e1dd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:39:58 -0700 Subject: gnu: elisa: Fix grammar of "allows to browse" to "browses". * gnu/packages/kde-multimedia (elisa): Fix grammar. --- gnu/packages/kde-multimedia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 4c1d5e7244..639d74d894 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -191,7 +191,7 @@ (define-public elisa (home-page "https://kde.org/applications/multimedia/org.kde.elisa") (synopsis "Powerful music player for Plasma 5") (description "Elisa is a simple music player aiming to provide a nice -experience for its users. Elisa allows to browse music by album, artist or +experience for its users. Elisa browses music by album, artist or all tracks. The music is indexed using either a private indexer or an indexer using Baloo. The private one can be configured to scan music on chosen paths. The Baloo one is much faster because Baloo is providing all needed data from -- cgit v1.2.3 From 04b56289e82b127c42845f208fc76645df489d8c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:47:22 -0700 Subject: gnu: libgravatar: Fix grammar of "allows to retrieve" to "retrieves". * gnu/packages/kde-internet (libgravatar): Fix grammar. --- gnu/packages/kde-internet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 666959ea15..5eb90cfb7c 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -452,7 +452,7 @@ (define-public libgravatar `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://cgit.kde.org/libgravatar.git") (synopsis "Online avatar lookup library") - (description "This library allows to retrieve avatar images based on a + (description "This library retrieves avatar images based on a hash from a person's email address, as well as local caching to avoid unnecessary network operations.") (license ;; GPL for programs, LGPL for libraries -- cgit v1.2.3 From 60738bdc59ca8b566845bd539e3bdc1beb627c5d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:53:09 -0700 Subject: gnu: java-microemulator-cldc: Fix grammar of "allows to demonstrate" to "demonstrates". * gnu/packages/java (java-microemulator-cldc): Fix grammar. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4d305aac49..2d21e30693 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7420,7 +7420,7 @@ (define-public java-microemulator-cldc (home-page "https://github.com/barteo/microemu") (synopsis "J2ME CLDC emulator") (description "Microemulator is a Java 2 Micro Edition (J2ME) CLDC/MIDP -Emulator. It allows to demonstrate MIDlet based applications in web browser +Emulator. It demonstrates MIDlet based applications in web browser applet and can be run as a standalone java application.") (license (list license:asl2.0 ;; or altenatively: -- cgit v1.2.3 From a84be333dde9f1e8ad4b70e05c534d7e9e1226f5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:00:42 -0700 Subject: gnu: ghc-smallcheck: Fix grammar of "allows to verify" to "verifies". * gnu/packages/haskell-xyz (ghc-smallcheck): Fix grammar. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d22a08e7fb..c9119efd69 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10780,7 +10780,7 @@ (define-public ghc-smallcheck (home-page "https://github.com/feuerbach/smallcheck") (synopsis "Property-based testing library") - (description "SmallCheck is a testing library that allows to verify + (description "SmallCheck is a testing library that verifies properties for all test cases up to some depth. The test cases are generated automatically by SmallCheck.") (license license:bsd-3))) -- cgit v1.2.3 From a4cb4d17c8551f883b76dc51459eb99423304f62 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 13:57:27 -0700 Subject: gnu: java-asm: Fix grammar of "allow to easily assemble" to "allow easily assembling". * gnu/packages/java (java-asm): Fix grammar. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2d21e30693..71baf23f73 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4416,7 +4416,7 @@ (define-public java-asm (description "ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically generate classes, directly in binary form. The provided common -transformations and analysis algorithms allow to easily assemble custom +transformations and analysis algorithms allow easily assembling custom complex transformations and code analysis tools.") (license license:bsd-3))) -- cgit v1.2.3 From bddd877fe7dba6fc4773490bb4fab6c65ac25ca4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:02:56 -0700 Subject: gnu: gamin: Fix grammar of "allows to detect" to "detects". * gnu/packages/gnome (gamin): Fix grammar. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 088de7dd4c..7d94e358f9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9678,7 +9678,7 @@ (define-public gamin (description "Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system. This is a service provided by a -library which allows to detect when a file or a directory has been modified.") +library which detects when a file or a directory has been modified.") (license license:gpl2+))) (define-public gnome-mahjongg -- cgit v1.2.3 From 309aaea5e145c3e066af5db22486a9a84a978599 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:04:20 -0700 Subject: gnu: gnome-shell-extension-hide-app-icon: Fix grammar of "allows to hide" to "hides". * gnu/packages/gnome-xyz (gnome-shell-extension-hide-app-icon): Fix grammar. --- gnu/packages/gnome-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index ad4593bcd5..625248a25a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -359,7 +359,7 @@ (define-public gnome-shell-extension-hide-app-icon (propagated-inputs `(("glib" ,glib))) (synopsis "Hide app icon from GNOME's panel") - (description "This extension allows to hide the icon and/or title of the + (description "This extension hides the icon and/or title of the currently focused application in the top panel of the GNOME shell.") (home-page "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/") -- cgit v1.2.3 From 4042f7f8e5e135e601f05c43afde11b3ed2e8039 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:07:09 -0700 Subject: gnu: java-jmapviewer: Fix grammar of "allows to easily integrate" to "easily integrates". * gnu/packages/geo (java-jmapviewer): Fix grammar. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 86385c14ae..4e0af93acf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1153,8 +1153,8 @@ (define-public java-jmapviewer (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") (synopsis "OSM map integration in Java") - (description "JMapViewer is a Java component which allows to easily -integrate an OSM map view into your Java application. It is maintained as + (description "JMapViewer is a Java component which easily +integrates an OSM map view into your Java application. It is maintained as an independent project by the JOSM team.") (license license:gpl2))) -- cgit v1.2.3 From a52aa7fdef19f95fc1755ecd88e979ba07d8b392 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Apr 2020 00:17:06 +0300 Subject: gnu: mcron: Update to 1.1.4. * gnu/packages/guix-xyz.scm (mcron): Update to 1.1.4. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a86a3f77ef..02404db679 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa -;;; Copyright © 2016, 2019 Eraim Flashner +;;; Copyright © 2016, 2019, 2020 Eraim Flashner ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2016 Amirouche @@ -2142,14 +2142,14 @@ (define-public guile2.0-commonmark (define-public mcron (package (name "mcron") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mcron/mcron-" version ".tar.gz")) (sha256 (base32 - "00kv7fgllzjpis0g1m9csycp4f6l11774m09dqy255cvmim2g743")))) + "1521w3h33bhdlg6qc66sq4dwv3qsx8r8x6srq4ca6kaahy6dszw8")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bf6c27889c5fcbf17b5492a98a9084351bcb63d3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:10:32 -0700 Subject: gnu: udiskie: Fix grammar of "allows to manage" to "manages". * gnu/packages/freedesktop (udiskie): Fix grammar. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b9811fb60e..9b62cf6aac 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1671,8 +1671,8 @@ (define-public udiskie (home-page "https://github.com/coldfix/udiskie") (synopsis "Automounter for removable media") (description - "The @command{udiskie} program is a udisks2 front-end that allows to -manage removable media such as CDs or flash drives from userspace. + "The @command{udiskie} program is a udisks2 front-end that +manages removable media such as CDs or flash drives from userspace. Its features include: -- cgit v1.2.3 From 0fed29843c721e8414d3d3b76e7e311360ce9a08 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:12:33 -0700 Subject: gnu: geierlein: Fix grammar of "allows to send" to "sends". * gnu/packages/finance (geierlein): Fix grammar. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 827a7651d2..a804b77c45 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -390,7 +390,7 @@ (define-public geierlein (synopsis "Free Elster client, for sending Germany VAT declarations") (description "Geierlein is a free Elster client, i.e. an application that -allows to send VAT declarations to Germany's fiscal authorities. +sends VAT declarations to Germany's fiscal authorities. Currently it is *not* possible to send returns that are due annually (especially the income tax return) since the fiscal authority doesn't -- cgit v1.2.3 From 2918485c9f21102eb378c18dc50b57350371eb0f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:16:22 -0700 Subject: gnu: geierlein: Fix grammar of "allow to do" to "allow doing". * gnu/packages/finance (geierlein): Fix grammar. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a804b77c45..aa71335040 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -394,7 +394,7 @@ (define-public geierlein Currently it is *not* possible to send returns that are due annually (especially the income tax return) since the fiscal authority doesn't -allow to do that off the ERiC library (which is proprietary however). +allow doing that off the ERiC library (which is proprietary however). It's not clear at the moment whether one day it will be possible to do so.") (license license:agpl3+))) -- cgit v1.2.3 From 132c50b0e12682f7fdacf8f0d9965445cfe8b691 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:18:25 -0700 Subject: gnu: emacs-google-maps: Fix grammar of "allows to display" to "displays". (emacs-google-maps): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c43cb5e1cd..c3c8a712f3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2019,7 +2019,7 @@ (define-public emacs-google-maps (build-system emacs-build-system) (home-page "https://github.com/jd/google-maps.el") (synopsis "Access Google Maps from Emacs") - (description "The @code{google-maps} package allows to display Google + (description "The @code{google-maps} package displays Google Maps directly inside Emacs.") (license license:gpl3+))) -- cgit v1.2.3 From 23f5dd915d543090d774a63488d6b294f6e61e95 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:21:18 -0700 Subject: gnu: libasr: Fix grammar of "allows to run" to "runs". * gnu/packages/dns (libasr): Fix grammar. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index cc9dc28391..af45ec2a82 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -305,7 +305,7 @@ (define-public libasr (synopsis "Asynchronous resolver library by the OpenBSD project") (description "libasr is a free, simple and portable asynchronous resolver library. -It allows to run DNS queries and perform hostname resolutions in a fully +It runs DNS queries and performs hostname resolution in a fully asynchronous fashion.") (license (list license:isc license:bsd-2 ; last part of getrrsetbyname_async.c -- cgit v1.2.3 From d41dabf8f15672ed976a099b86574e09ca9c9042 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:29:11 -0700 Subject: gnu: r-graphlayouts: Fix grammar of "allow to emphasize" to "emphasize". * gnu/packages/cran (r-graphlayouts): Fix grammar. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a9f939c18c..1f63560356 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15863,7 +15863,7 @@ (define-public r-graphlayouts "This package provides several layout algorithms to visualize networks which are not part of the igraph library. Most are based on the concept of stress majorization by Gansner et al. (2004) -. Some more specific algorithms allow to +. Some more specific algorithms emphasize hidden group structures in networks or focus on specific nodes.") (license license:expat))) -- cgit v1.2.3 From d6d4283ac7164882d9790ab19910123da477ba7f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:27:49 -0700 Subject: gnu: r-etm: Fix grammar of "permits to estimate" to "estimates". * gnu/packages/cran (r-etm): Fix grammar. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1f63560356..3de0608663 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11532,7 +11532,7 @@ (define-public r-etm (home-page "https://cran.r-project.org/web/packages/etm") (synopsis "Empirical transition matrix") (description - "The @dfn{empirical transition matrix} (etm) package permits to estimate + "The @dfn{empirical transition matrix} (etm) package estimates the matrix of transition probabilities for any time-inhomogeneous multistate model with finite state space using the Aalen-Johansen estimator.") (license license:expat))) -- cgit v1.2.3 From 4d72d02b8a1a83a0fa6cc4e332e7fae63f683c49 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:35:14 -0700 Subject: gnu: python-paramunittest: Fix spelling and grammar. * gnu/packages/check (python-paramunittest): Fix spelling of "parameterized". Fix grammar "allows to create" to "creates". --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2cfaddbc5f..d83e4b448b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1894,8 +1894,8 @@ (define-public python-paramunittest (synopsis "Simple extension to have parametrized unit tests") (description - "This package allows to create parametrized unit-tests that work with the standard -unittest package. A parametrized test case is automatically converted to multiple test + "This package creates parameterized unit-tests that work with the standard +unittest package. A parameterized test case is automatically converted to multiple test cases. Since they are TestCase subclasses, they work with other test suites that recognize TestCases.") (license license:bsd-2))) -- cgit v1.2.3 From f49369fad2165db628e56fca1c7167b49ec18b2d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:39:12 -0700 Subject: gnu: r-qtl: Fix grammar "allows to estimate" to "estimates". * gnu/packages/bioinformatics (r-qtl): Fix grammar. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 15a5dfb37c..6aae4b853d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8401,7 +8401,7 @@ (define-public r-qtl genes contributing to variation in quantitative traits (so-called quantitative trait loci, QTLs). -Using a hidden Markov model, R/qtl allows to estimate genetic maps, to +Using a hidden Markov model, R/qtl estimates genetic maps, to identify genotyping errors, and to perform single-QTL and two-QTL, two-dimensional genome scans.") (license license:gpl3))) -- cgit v1.2.3 From 23c8ef71245dbe8fcb5dff4520c2d796afaba6e1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:41:45 -0700 Subject: gnu: r-fgsea: Various grammar and spelling fixes. * gnu/packages/bioconductor (r-fgsea): Fix spelling of "standard". Fix grammar of "allows to make" to "makes". --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2fbfdba2d8..90e0b05bf2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3501,8 +3501,8 @@ (define-public r-fgsea (synopsis "Fast gene set enrichment analysis") (description "The package implements an algorithm for fast gene set enrichment -analysis. Using the fast algorithm allows to make more permutations and get -more fine grained p-values, which allows to use accurate stantard approaches +analysis. Using the fast algorithm makes more permutations and gets +more fine grained p-values, which allows using accurate standard approaches to multiple hypothesis correction.") (license license:expat))) -- cgit v1.2.3 From 8c4bf6c29c5246d6e3debae102ed0b4b2170a7be Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:52:46 -0700 Subject: gnu: r-aucell: Fix grammar of "allows to identify" to "identifies". * gnu/packages/bioconductor (r-aucell): Fix grammar. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 90e0b05bf2..96da932832 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4271,7 +4271,7 @@ (define-public r-aucell (home-page "https://bioconductor.org/packages/AUCell/") (synopsis "Analysis of gene set activity in single-cell RNA-seq data") (description - "AUCell allows to identify cells with active gene sets (e.g. signatures, + "AUCell identifies cells with active gene sets (e.g. signatures, gene modules, etc) in single-cell RNA-seq data. AUCell uses the @dfn{Area Under the Curve} (AUC) to calculate whether a critical subset of the input gene set is enriched within the expressed genes for each cell. The -- cgit v1.2.3 From e40ecf8a2c075505c8b7ee099ce64e0c013faece Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:54:31 -0700 Subject: gnu: r-wavcluster: Fix grammar of "allows to integrate" to "integrates". * gnu/packages/bioconductor (r-wavcluster): Fix grammar. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 96da932832..3ada92085e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6426,7 +6426,7 @@ (define-public r-wavcluster resolved at high resolution and cluster statistics are estimated using a rigorous Bayesian framework. Post-processing of the results, data export for UCSC genome browser visualization and motif search analysis are provided. In -addition, the package allows to integrate RNA-Seq data to estimate the False +addition, the package integrates RNA-Seq data to estimate the False Discovery Rate of cluster detection. Key functions support parallel multicore computing. While wavClusteR was designed for PAR-CLIP data analysis, it can be applied to the analysis of other NGS data obtained from experimental -- cgit v1.2.3 From 7cc83f43c96deb1eea5b0eb05eaba6599d49ca13 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:55:57 -0700 Subject: gnu: r-bamsignals: Fix grammar of "allows to efficiently obtain" to "efficiently obtains". * gnu/packages/bioinformatics (r-bamsignals): Fix grammar. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6aae4b853d..695e69e2b1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8532,7 +8532,7 @@ (define-public r-bamsignals (home-page "https://bioconductor.org/packages/bamsignals") (synopsis "Extract read count signals from bam files") (description - "This package allows to efficiently obtain count vectors from indexed bam + "This package efficiently obtains count vectors from indexed bam files. It counts the number of nucleotide sequence reads in given genomic ranges and it computes reads profiles and coverage profiles. It also handles paired-end data.") -- cgit v1.2.3 From bb3087eee83fc938f31096368b6068defe0f27be Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:58:26 -0700 Subject: gnu: r-r2html: Fix grammar of "allows to parse" to "parses". * gnu/packages/cran (r-r2html): Fix grammar. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3de0608663..7e94acfbed 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13880,7 +13880,7 @@ (define-public r-r2html as the student can keep a copy of the produced output to keep all that they did during the course. The package comes with a vignette describing how to write HTML reports for statistical analysis. Finally, a driver for Sweave -allows to parse HTML flat files containing R code and to automatically write +parses HTML flat files containing R code and to automatically write the corresponding outputs (tables and graphs).") (license license:gpl2+))) -- cgit v1.2.3 From 5a131e3bb8d873a9e0ac56944e643a4ae60ac11c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 14:48:56 -0700 Subject: gnu: python-pyyaml: Fix grammar of "allow to represent" to "represent". * gnu/packages/python-xyz (python-pyyaml): Fix grammar. --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9cff96b0a9..872405611e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2822,8 +2822,7 @@ (define-public python-pyyaml "PyYAML is a YAML parser and emitter for Python. PyYAML features a complete YAML 1.1 parser, Unicode support, pickle support, capable extension API, and sensible error messages. PyYAML supports standard YAML tags and -provides Python-specific tags that allow to represent an arbitrary Python -object.") +provides Python-specific tags that represent an arbitrary Python object.") (license license:expat))) (define-public python2-pyyaml -- cgit v1.2.3 From 75615ca090181a46c74b1b87734404ed4b485819 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:05:01 -0700 Subject: gnu: emacs-find-file-in-project: Fix grammar of "allows to find" to "finds". * gnu/packages/emacs-xyz (emacs-find-file-in-project): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c3c8a712f3..f67c395921 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6912,7 +6912,7 @@ (define-public emacs-find-file-in-project `(("ert-runner" ,emacs-ert-runner))) (home-page "https://github.com/technomancy/find-file-in-project") (synopsis "File/directory finder for Emacs") - (description "@code{find-file-in-project} allows to find files or + (description "@code{find-file-in-project} finds files or directories quickly in the current project. The project root is detected automatically when Git, Subversion or Mercurial are used. It also provides functions to assist in reviewing changes on files.") -- cgit v1.2.3 From 99f53a13d197b0e7cad00c1a5e0520ba1b0f51b8 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:07:20 -0700 Subject: gnu: emacs-finalize: Fix grammar of "will allows to immediately run" to "runs". * gnu/packages/emacs-xyz (emacs-finalize): Fix grammar. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f67c395921..3286d20b6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12487,8 +12487,8 @@ (define-public emacs-finalize (home-page "https://github.com/skeeto/elisp-finalize") (synopsis "Finalizers for Emacs Lisp") (description - "This package will allows to immediately run a callback (a finalizer) -after its registered lisp object has been garbage collected. This allows for + "This package runs a callback (a finalizer) +after its registered lisp object has been garbage collected. This allows extra resources, such as buffers and processes, to be cleaned up after the object has been freed.") (license license:unlicense))) -- cgit v1.2.3 From f80d5102a8ce3af1fd749358d7f1c13dfab00f09 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:12:32 -0700 Subject: gnu: emacs-closql: Fix grammar of "allows to store" to "stores". * gnu/packages/emacs-xyz (emacs-closql): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3286d20b6a..7df0b1d6d7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12594,7 +12594,7 @@ (define-public emacs-closql (home-page "https://github.com/emacscollective/closql") (synopsis "Store EIEIO objects using EmacSQL") (description - "This package allows to store uniform EIEIO objects in an EmacSQL + "This package stores uniform EIEIO objects in an EmacSQL database. SQLite is used as backend. This library imposes some restrictions on what kind of objects can be stored; it isn't intended to store arbitrary objects. All objects have to share a common superclass and subclasses cannot -- cgit v1.2.3 From 28643c2147012544e250773c5d8b95bb761ca618 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:13:53 -0700 Subject: gnu: emacs-md4rd: Fix grammar of "allows to read" to "allows reading". * gnu/packages/emacs-xyz (emacs-md4rd): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7df0b1d6d7..f090e4b4d0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13403,7 +13403,7 @@ (define-public emacs-md4rd (home-page "https://github.com/ahungry/md4rd") (synopsis "Emacs Mode for Reddit") (description - "This package allows to read Reddit from within Emacs interactively.") + "This package allows reading Reddit from within Emacs interactively.") (license license:gpl3+))) (define-public emacs-pulseaudio-control -- cgit v1.2.3 From 8098c2be4dd1d13ac8c69019acb6747226330823 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:15:30 -0700 Subject: gnu: emacs-pulseaudio-control: Fix grammar of "allows to control" to "allows controlling". * gnu/packages/emacs-xyz (emacs-pulseaudio-control): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f090e4b4d0..0d4c852578 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13437,7 +13437,7 @@ (define-public emacs-pulseaudio-control (home-page "https://github.com/flexibeast/pulseaudio-control") (synopsis "Control @code{pulseaudio} from Emacs") (description - "This package allows to control @code{pulseaudio} from Emacs.") + "This package allows controlling @code{pulseaudio} from Emacs.") (license license:gpl3+)))) (define-public emacs-datetime -- cgit v1.2.3 From 9df26b02064f30ca1b98a3084341c36d0479deea Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:28:17 -0700 Subject: gnu: josm: Fix grammar of "allows to edit" to "allows editing". * gnu/packages/geo (josm): Fix grammar. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4e0af93acf..384f274aee 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1292,7 +1292,7 @@ (define-public josm (synopsis "OSM editor") (description "JOSM is an extensible editor for OpenStreetMap (OSM). It supports loading GPX tracks, background imagery and OSM data from local -sources as well as from online sources and allows to edit the OSM data (nodes, +sources as well as from online sources and allows editing the OSM data (nodes, ways, and relations) and their metadata tags.") (license license:gpl2+))) -- cgit v1.2.3 From 9df53f726d9ad4b6704ea2aa63f185eae3c096e2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:21:50 -0700 Subject: gnu: emacs-mbsync: Fix grammar of "allows to call" to "calls". * gnu/packages/emacs-xyz (emacs-mbsync): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d4c852578..8d9ee1862a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13960,7 +13960,7 @@ (define-public emacs-mbsync (build-system emacs-build-system) (home-page "https://github.com/dimitri/mbsync-el") (synopsis "Interface to mbsync for Emacs") - (description "This package allows to call the @code{mbsync} from + (description "This package calls @code{mbsync} from within Emacs.") (license license:gpl3+)))) -- cgit v1.2.3 From 72b3ed6d3b2ea8d585b8c326f616c9f5ba05d7a3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:23:04 -0700 Subject: gnu: emacs-discover-my-major: Fix grammar of "provides allows to discover" to "discovers". * gnu/packages/emacs-xyz (emacs-discover-my-major): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d9ee1862a..4bf552d272 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14156,7 +14156,7 @@ (define-public emacs-discover-my-major `(("emacs-makey" ,emacs-makey))) (home-page "https://framagit.org/steckerhalter/discover-my-major/") (synopsis "Discover key bindings for the current Emacs major mode") - (description "This package provides allows to discover key bindings and + (description "This package discovers key bindings and their meaning for the current Emacs major-mode.") (license license:gpl3+))) -- cgit v1.2.3 From ca105ad2d7e2e17a08577ab242da5b0d053ac650 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:24:47 -0700 Subject: gnu: emacs-buttercup: Fix grammar of "allows to group" to "groups". * gnu/packages/emacs-xyz (emacs-buttercup): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bf552d272..1c6f77cc0a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17563,7 +17563,7 @@ (define-public emacs-buttercup (home-page "https://github.com/jorgenschaefer/emacs-buttercup") (synopsis "Behavior driven emacs lisp testing framework") (description "Buttercup is a behavior-driven development framework for -testing Emacs Lisp code. It allows to group related tests so they can share +testing Emacs Lisp code. It groups related tests so they can share common set-up and tear-down code, and allows the programmer to \"spy\" on functions to ensure they are called with the right arguments during testing.") (license license:gpl3+))) -- cgit v1.2.3 From 4aad3cfcea0e3e667d59bca45bcf8c5efe6c4e0c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:26:22 -0700 Subject: gnu: emacs-objed: Fix grammar of "allows to navigate and edit" to "allows navigating and editing". * gnu/packages/emacs-xyz (emacs-objed): Fix grammar. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1c6f77cc0a..dadbef6bab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22368,7 +22368,7 @@ (define-public emacs-objed (home-page "https://github.com/clemera/objed") (synopsis "Navigate and edit text objects") (description - "@code{emacs-objed} allows to navigate and edit text objects. It + "@code{emacs-objed} allows navigating and editing text objects. It enables modal editing and composition of commands, too. It combines ideas of other Editors like Vim or Kakoune and tries to align them with regular Emacs conventions.") -- cgit v1.2.3 From 44a057a14394ab2e93ae96dd3b0bab5f3524ec6a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:32:34 -0700 Subject: gnu: java-jsonp-api: Fix grammar of "allows to build" to "allows building". * gnu/packages/java (java-jsonp-api): Fix grammar. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 71baf23f73..667d87baa8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11644,7 +11644,7 @@ (define-public java-jsonp-api (description "JSON Processing (JSON-P) is a Java API to process (e.g. parse, generate, transform and query) JSON messages. It produces and consumes JSON text in a streaming fashion (similar to StAX API for XML) -and allows to build a Java object model for JSON text using API classes +and allows building a Java object model for JSON text using API classes (similar to DOM API for XML).") ;; either gpl2 only with classpath exception, or epl2.0. (license (list license:gpl2 -- cgit v1.2.3 From 61fa3c67325612ed5da64df0d2b71fd8d74f4f44 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:31:02 -0700 Subject: gnu: java-hdrhistogram: Fix grammar of "allows to create" to "creates". * gnu/packages/java (java-hdrhistogram): Fix grammar. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 667d87baa8..1d9f6ff92b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8815,7 +8815,7 @@ (define-public java-hdrhistogram ("hamcrest" ,java-hamcrest-core))) (home-page "https://hdrhistogram.github.io/HdrHistogram") (synopsis "High dynamic range histogram") - (description "Hdrhistogram allows to create histograms that support + (description "Hdrhistogram creates histograms that support recording and analyzing sampled data value counts across a configurable integer value range with configurable value precision within the range. Value precision is expressed as the number of significant digits in the value recording, and -- cgit v1.2.3 From c05181a337d91ec914c494b01d15ff256bf59ba4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:33:42 -0700 Subject: gnu: sbcl-ieee-floats: Fix grammar of "allows to convert" to "converts". * gnu/packages/lisp-xyz (sbcl-ieee-floats): Fix grammar. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 024daa4481..3ea194db13 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5502,7 +5502,7 @@ (define-public sbcl-ieee-floats (native-inputs `(("fiveam" ,sbcl-fiveam))) (synopsis "IEEE 754 binary representation for floats in Common Lisp") - (description "This is a Common Lisp library that allows to convert + (description "This is a Common Lisp library that converts floating point values to IEEE 754 binary representation.") (license license:bsd-3)))) -- cgit v1.2.3 From 104b1bde7327f23ccb2719727d6d5e4748078825 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 15:36:07 -0700 Subject: gnu: cl-dbus: Fix grammar of "allows to publish" to "publishes". * gnu/packages/lisp-xyz (cl-dbus): Fix grammar. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3ea194db13..9dd2b5409d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6416,7 +6416,7 @@ (define-public cl-dbus ("cl-xmlspam" ,sbcl-cl-xmlspam) ("ironclad" ,sbcl-ironclad))) (synopsis "D-Bus client library for Common Lisp") - (description "This is a Common Lisp library that allows to publish D-Bus + (description "This is a Common Lisp library that publishes D-Bus objects as well as send and notify other objects connected to a bus.") (license license:bsd-2)))) -- cgit v1.2.3 From b36217c54dd92bdfa0984b9eded0765a3b388426 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Apr 2020 00:08:48 +0200 Subject: self: Prevent inlining of internal procedures used by 'doc/build.scm'. This allows 'doc/build.scm' to keep using '@@' for these. (This sets a bad example, don't follow it.) * guix/self.scm (prevent-inlining!): New macro. : Use it for 'file-append*', 'translate-texi-manuals', and 'info-manual'. --- guix/self.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/guix/self.scm b/guix/self.scm index 6b633f9bc0..1040c27a6b 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -489,6 +489,13 @@ (define build (computed-file "guix-manual" build)) +(define-syntax-rule (prevent-inlining! identifier ...) + (begin (set! identifier identifier) ...)) + +;; XXX: These procedures are actually used by 'doc/build.scm'. Protect them +;; from inlining on Guile 3. +(prevent-inlining! file-append* translate-texi-manuals info-manual) + (define* (guile-module-union things #:key (name "guix-module-union")) "Return the union of the subset of THINGS (packages, computed files, etc.) that provide Guile modules." -- cgit v1.2.3 From da9deba13d551e316f5a99a614834efa27ddc7d1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Apr 2020 00:12:20 +0200 Subject: doc: Emit hyperlinks in HTML output for @lisp snippets. This makes it easier to jump to the definition of a procedure or variable when looking at a code snippet. There can be false-positive because scoping rules are ignored, for example, but it should be a good approximation. * doc/build.scm (syntax-highlighted-html)[build](highlights->sxml*): Add 'anchors' parameter. Add clause for ('symbol text). (syntax-highlight): Add 'anchors' parameter. Wrap body in named let and use it in recursive calls. Pass ANCHORS to 'highlights->sxml*'. (underscore-decode, anchor-id->key, collect-anchors, html?): New procedures. (process-file): Add 'anchors' parameter. and honor it. Rewrite mono-node and multi-node HTML files separately. --- doc/build.scm | 163 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 130 insertions(+), 33 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 8d5b58962a..c3d61f837b 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -220,8 +220,10 @@ (define build (syntax-highlight scheme) (syntax-highlight lexers) (guix build utils) + (srfi srfi-1) (ice-9 match) - (ice-9 threads)) + (ice-9 threads) + (ice-9 vlist)) (define (pair-open/close lst) ;; Pair 'open' and 'close' tags produced by 'highlights' and @@ -255,10 +257,11 @@ (define (pair-open/close lst) level (reverse result))) (values (reverse result) "" '()))))) - (define (highlights->sxml* highlights) + (define (highlights->sxml* highlights anchors) ;; Like 'highlights->sxml', but handle nested 'paren tags. This ;; allows for paren matching highlights via appropriate CSS - ;; "hover" properties. + ;; "hover" properties. When a symbol is encountered, look it up + ;; in ANCHORS, a vhash, and emit the corresponding href, if any. (define (tag->class tag) (string-append "syntax-" (symbol->string tag))) @@ -269,8 +272,16 @@ (define (tag->class tag) (number->string level)))) ,open (span (@ (class "syntax-symbol")) - ,@(highlights->sxml* body)) + ,@(highlights->sxml* body anchors)) ,close)) + (('symbol text) + ;; Check whether we can emit a hyperlink for TEXT. + (match (vhash-assoc text anchors) + (#f + `(span (@ (class ,(tag->class 'symbol))) ,text)) + ((_ . target) + `(a (@ (class ,(tag->class 'symbol)) (href ,target)) + ,text)))) ((tag text) `(span (@ (class ,(tag->class tag))) ,text))) highlights)) @@ -301,35 +312,95 @@ (define (concatenate-snippets pieces) (pk 'unsupported-code-snippet something) (primitive-exit 1))))) - (define (syntax-highlight sxml) + (define (syntax-highlight sxml anchors) ;; Recurse over SXML and syntax-highlight code snippets. - (match sxml - (('*TOP* decl body ...) - `(*TOP* ,decl ,@(map syntax-highlight body))) - (('head things ...) - `(head ,@things - (link (@ (rel "stylesheet") - (type "text/css") - (href #$syntax-css-url))))) - (('pre ('@ ('class "lisp")) code-snippet ...) - `(pre (@ (class "lisp")) - ,@(highlights->sxml* - (pair-open/close - (highlight lex-scheme - (concatenate-snippets code-snippet)))))) - ((tag ('@ attributes ...) body ...) - `(,tag (@ ,@attributes) ,@(map syntax-highlight body))) - ((tag body ...) - `(,tag ,@(map syntax-highlight body))) - ((? string? str) - str))) - - (define (process-html file) + (let loop ((sxml sxml)) + (match sxml + (('*TOP* decl body ...) + `(*TOP* ,decl ,@(map loop body))) + (('head things ...) + `(head ,@things + (link (@ (rel "stylesheet") + (type "text/css") + (href #$syntax-css-url))))) + (('pre ('@ ('class "lisp")) code-snippet ...) + `(pre (@ (class "lisp")) + ,@(highlights->sxml* + (pair-open/close + (highlight lex-scheme + (concatenate-snippets code-snippet))) + anchors))) + ((tag ('@ attributes ...) body ...) + `(,tag (@ ,@attributes) ,@(map loop body))) + ((tag body ...) + `(,tag ,@(map loop body))) + ((? string? str) + str)))) + + (define (underscore-decode str) + ;; Decode STR, an "underscore-encoded" string as produced by + ;; makeinfo for indexes, such as "_0025base_002dservices" for + ;; "%base-services". + (let loop ((str str) + (result '())) + (match (string-index str #\_) + (#f + (string-concatenate-reverse (cons str result))) + (index + (let ((char (string->number + (substring str (+ index 1) (+ index 5)) + 16))) + (loop (string-drop str (+ index 5)) + (append (list (string (integer->char char)) + (string-take str index)) + result))))))) + + (define (anchor-id->key id) + ;; Convert ID, an anchor ID such as + ;; "index-pam_002dlimits_002dservice" to the corresponding key, + ;; "pam-limits-service" in this example. + (underscore-decode + (string-drop id (string-length "index-")))) + + (define* (collect-anchors file #:optional (vhash vlist-null)) + ;; Collect the anchors that appear in FILE, a makeinfo-generated + ;; file. Grab those from
tags, which corresponds to + ;; Texinfo @deftp, @defvr, etc. Return VHASH augmented with + ;; more name/reference pairs. + (define string-or-entity? + (match-lambda + ((? string?) #t) + (('*ENTITY* _ ...) #t) + (_ #f))) + + (let ((shtml (call-with-input-file file html->shtml))) + (let loop ((shtml shtml) + (vhash vhash)) + (match shtml + ;; Attempt to match: + ;;
Scheme Variable: x
+ ;; but not: + ;;
cups-configuration parameter: …
+ (('dt ('@ ('id id)) + (? string-or-entity?) ... ('strong _ ...) _ ...) + (if (string-prefix? "index-" id) + (vhash-cons (anchor-id->key id) + (string-append (basename file) + "#" id) + vhash) + vhash)) + ((tag ('@ _ ...) body ...) + (fold loop vhash body)) + ((tag body ...) + (fold loop vhash body)) + (_ vhash))))) + + (define (process-html file anchors) ;; Parse FILE and perform syntax highlighting for its Scheme ;; snippets. Install the result to #$output. (format (current-error-port) "processing ~a...~%" file) (let* ((shtml (call-with-input-file file html->shtml)) - (highlighted (syntax-highlight shtml)) + (highlighted (syntax-highlight shtml anchors)) (base (string-drop file (string-length #$input))) (target (string-append #$output base))) (mkdir-p (dirname target)) @@ -352,17 +423,43 @@ (define (copy-as-is file) (pk 'error-link file target (strerror errno)) (primitive-exit 3)))))) + (define (html? file stat) + (string-suffix? ".html" file)) + ;; Install a UTF-8 locale so we can process UTF-8 files. (setenv "GUIX_LOCPATH" #+(file-append glibc-utf8-locales "/lib/locale")) (setlocale LC_ALL "en_US.utf8") + ;; First process the mono-node 'guix.html' files. (n-par-for-each (parallel-job-count) - (lambda (file) - (if (string-suffix? ".html" file) - (process-html file) - (copy-as-is file))) - (find-files #$input)))))) + (lambda (mono) + (let ((anchors (collect-anchors mono))) + (process-html mono anchors))) + (find-files #$input "^guix(\\.[a-zA-Z_-]+)?\\.html$")) + + ;; Next process the multi-node HTML files in two phases: (1) + ;; collect the list of anchors, and (2) perform + ;; syntax-highlighting. + (let* ((multi (find-files #$input "^html_node$" + #:directories? #t)) + (anchors (n-par-map (parallel-job-count) + (lambda (multi) + (cons multi + (fold collect-anchors vlist-null + (find-files multi html?)))) + multi))) + (n-par-for-each (parallel-job-count) + (lambda (file) + (let ((anchors (assoc-ref anchors (dirname file)))) + (process-html file anchors))) + (append-map (lambda (multi) + (find-files multi html?)) + multi))) + + ;; Last, copy non-HTML files as is. + (for-each copy-as-is + (find-files #$input (negate html?))))))) (computed-file name build)) -- cgit v1.2.3 From 2bf52398a76fc29a214ce7c3ea30cb39c9fbe1f4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:16:20 -0700 Subject: gnu: ocaml-mtime: Fix grammar "allows to measure" to "measures". * gnu/packages/ocaml (ocaml-mtime): Fix grammar. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8e48e3d8b6..f1cacfc9e7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1534,7 +1534,7 @@ (define-public ocaml-mtime (delete 'configure)))) (home-page "http://erratique.ch/software/mtime") (synopsis "Monotonic wall-clock time for OCaml") - (description "Access monotonic wall-clock time. It allows to measure time + (description "Access monotonic wall-clock time. It measures time spans without being subject to operating system calendar time adjustments.") (license license:isc))) -- cgit v1.2.3 From e49a6c82c22d5a005ae289d8c34a49952ebc8a8c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:17:34 -0700 Subject: gnu: ocamlify: Fix grammar of "allows to create" to "creates". * gnu/packages/ocaml (ocamlify): Fix grammar. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f1cacfc9e7..525854676f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2266,7 +2266,7 @@ (define-public ocamlify `(("ocamlbuild" ,ocamlbuild))) (home-page "https://forge.ocamlcore.org/projects/ocamlify") (synopsis "Include files in OCaml code") - (description "OCamlify allows to create OCaml source code by including + (description "OCamlify creates OCaml source code by including whole files into OCaml string or string list. The code generated can be compiled as a standard OCaml file. It allows embedding external resources as OCaml code.") -- cgit v1.2.3 From e0a0a6df11e524ab50ba3f330542fe00aed1be88 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:18:46 -0700 Subject: gnu: r-memoise: Fix grammar of "allows to cache" to "caches". * gnu/packages/statistics (r-memoise): Fix grammar. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d3f75ce57b..dfc04bb814 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1505,7 +1505,7 @@ (define-public r-memoise (home-page "https://github.com/hadley/memoise") (synopsis "Memoise functions for R") (description - "This R package allows to cache the results of a function so that when + "This R package caches the results of a function so that when you call it again with the same arguments it returns the pre-computed value.") (license license:expat))) -- cgit v1.2.3 From 9bbba9aad77cf0332b484fed4f06e1ad5a7ff8dd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:19:59 -0700 Subject: gnu: r-rcppprogress: Fix grammar of "allows to display" to "displays". * gnu/packages/statistics (r-rcppprogress): Fix grammar. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dfc04bb814..e4ca4c68f4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5257,7 +5257,7 @@ (define-public r-rcppprogress (home-page "https://github.com/kforner/rcpp_progress") (synopsis "Interruptible progress bar for C++ in R packages") (description - "This package allows to display a progress bar in the R console for long running + "This package displays a progress bar in the R console for long running computations taking place in C++ code, and support for interrupting those computations even in multithreaded code, typically using OpenMP.") (license license:gpl3+))) -- cgit v1.2.3 From 0dfe4c3d7e5c0c2757701039edb94d5a53bbb9e4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:21:17 -0700 Subject: gnu: scrot: Fix grammar of "allows to save" to "saves". * gnu/packages/xdisorg (scrot): Fix grammar. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4a8b7ebfe5..67c14a85f1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -635,7 +635,7 @@ (define-public scrot (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") (description - "Scrot allows to save a screenshot of a full screen, a window or a part + "Scrot saves a screenshot of a full screen, a window or a part of the screen selected by mouse.") ;; This license removes a clause about X Consortium from the original ;; X11 license. -- cgit v1.2.3 From 839f0229b43eeaea75c7626033c3184ba3e90aa1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:23:00 -0700 Subject: gnu: xcape: Fix grammar of "allows to use" to "uses a". * gnu/packages/xdisorg (xcape): Fix grammar. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 67c14a85f1..58e827505b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1055,7 +1055,7 @@ (define-public xcape (home-page "https://github.com/alols/xcape") (synopsis "Use a modifier key in X.org as another key") (description - "This utility for X.org allows to use modifier key as another key when + "This utility for X.org uses a modifier key as another key when pressed and released on its own. The default behaviour is to generate the Escape key when Left Control is pressed and released on its own.") (license license:gpl3+))) -- cgit v1.2.3 From 7f7a6e877e40780a3d2d675f72ef5cd72c673936 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:24:32 -0700 Subject: gnu: xss-lock: Fix grammar of "allows to automatically lock" to "automatically locks". * gnu/packages/xdisorg (xss-lock): Fix grammar. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 58e827505b..1be52247d3 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1731,7 +1731,7 @@ (define-public xss-lock `(#:tests? #f)) (synopsis "Use external screen locker on events") (description "@code{xss-lock} listens to X signals to fire up a -user-defined screensaver. In effect this allows to automatically lock the +user-defined screensaver. In effect this automatically locks the screen when closing a laptop lid or after a period of user inactivity (as set with @code{xset s TIMEOUT}). The notifier command, if specified, is executed first. Additionally, xss-lock uses the inhibition logic to lock the screen -- cgit v1.2.3 From 52fc6508f2f3746d9e70f56b8c0383e8dc946b5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Apr 2020 18:06:32 +0200 Subject: gnu: workrave: Update to 1.10.42. * gnu/packages/gnome.scm (workrave): Update to 1.10.42. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7d94e358f9..820811f8fa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9200,7 +9200,7 @@ (define-public soundconverter (define-public workrave (package (name "workrave") - (version "1.10.37") + (version "1.10.42") (source (origin (method git-fetch) @@ -9211,7 +9211,7 @@ (define-public workrave version))))) (file-name (git-file-name name version)) (sha256 - (base32 "01cxy7606hx9wgxl550l4p2xa9hsy0rk7swsp58hyi842z2z0y13")))) + (base32 "03i9kk8r1wgrfkkbwikx8wxaw4r4kn62vismr2zdq5g34fkkjh95")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. -- cgit v1.2.3 From c9b6b82fae6bbc062153f7ff260719bd0e2f6ea1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 12 Apr 2020 16:41:15 -0700 Subject: gnu: perl-attribute-util: Fix grammar for "This package". * gnu/packages/perl (perl-attribute-util): Fix grammar. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index beb3567ff0..35c59cce7d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -352,7 +352,7 @@ (define-public perl-attribute-util (build-system perl-build-system) (home-page "https://metacpan.org/pod/Attribute::Util") (synopsis "Assorted general utility attributes") - (description "This packages provides various utility functions. When used + (description "This package provides various utility functions. When used without argument, this module provides four universally accessible attributes of general interest as follows: @itemize -- cgit v1.2.3 From c2480d10422f176bf06081de9d601f3b7249a83c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Apr 2020 02:09:09 +0200 Subject: doc: Avoid invalid 'match' pattern in 'syntax-highlighted-html'. This is a followup to da9deba13d551e316f5a99a614834efa27ddc7d1. Last-minute modification of the 'match' pattern would lead to an error: "multiple ellipsis patterns not allowed at same level" * doc/build.scm (syntax-highlighted-html)[build](collect-anchors): Add 'worthy-entry?' procedure and use it instead of the unsupported pattern for ('dt ...). --- doc/build.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index c3d61f837b..ca81d813a9 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -373,17 +373,26 @@ (define string-or-entity? (('*ENTITY* _ ...) #t) (_ #f))) + (define (worthy-entry? lst) + ;; Attempt to match: + ;; Scheme Variable: x + ;; but not: + ;; cups-configuration parameter: … + (let loop ((lst lst)) + (match lst + (((? string-or-entity?) rest ...) + (loop rest)) + ((('strong _ ...) _ ...) + #t) + (_ #f)))) + (let ((shtml (call-with-input-file file html->shtml))) (let loop ((shtml shtml) (vhash vhash)) (match shtml - ;; Attempt to match: - ;;
Scheme Variable: x
- ;; but not: - ;;
cups-configuration parameter: …
- (('dt ('@ ('id id)) - (? string-or-entity?) ... ('strong _ ...) _ ...) - (if (string-prefix? "index-" id) + (('dt ('@ ('id id)) rest ...) + (if (and (string-prefix? "index-" id) + (worthy-entry? rest)) (vhash-cons (anchor-id->key id) (string-append (basename file) "#" id) -- cgit v1.2.3 From 3b522de7099eb38fa78ec9cc3301401ebbf51cac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 02:01:38 +0200 Subject: gnu: lightdm-gtk-greeter: Update to 2.0.7. * gnu/packages/display-managers.scm (lightdm-gtk-greeter): Update to 2.0.7. --- gnu/packages/display-managers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index bfe1a8f6dd..51605e09aa 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Sou Bunnbu ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -199,7 +199,7 @@ (define-public lightdm (define-public lightdm-gtk-greeter (package (name "lightdm-gtk-greeter") - (version "2.0.2") + (version "2.0.7") (source (origin (method url-fetch) (uri (string-append @@ -208,7 +208,7 @@ (define-public lightdm-gtk-greeter "/+download/lightdm-gtk-greeter-" version ".tar.gz")) (sha256 (base32 - "1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf")))) + "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms")))) (build-system gnu-build-system) (native-inputs `(("exo" ,exo) -- cgit v1.2.3 From 4d07ce0cf520843c8cdab33fae33092a3a1649d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 03:14:02 +0200 Subject: gnu: diffoscope: Update to 139. * gnu/packages/diffoscope.scm (diffoscope): Update to 139. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index b835fb4510..37f8f74b7b 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -68,7 +68,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "138")) + (let ((version "139")) (package (name "diffoscope") (version version) @@ -80,7 +80,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "1lsxwyqaaxmin8h06l0352f0kh0l9brbqfn0zv8hmb64bp5r20nr")))) + "1k4yjyvmn5nfdapkwgkr9gzpn18kr4c58n0f32pfkx4yakfqkk4i")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 73e560bce3748a60231d06502368dee832769a66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:44:05 +0200 Subject: gnu: ssdeep: Update home page. * gnu/packages/datastructures.scm (ssdeep)[home-page]: Update and use HTTPS. --- gnu/packages/datastructures.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index e7833b8e70..fdee1d2af7 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -115,7 +115,7 @@ (define-public ssdeep (base32 "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f")))) (build-system gnu-build-system) - (home-page "http://ssdeep.sourceforge.net") + (home-page "https://ssdeep-project.github.io") (synopsis "Context-triggered piecewise hashing algorithm") (description "ssdeep computes and matches context triggered piecewise hashes (CTPH), also called fuzzy checksums. It can identify similar files -- cgit v1.2.3 From ffd57da15ae2371d65b773b9838301a6bc48948b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:56:18 +0200 Subject: gnu: ssdeep: Update to 2.14.1. * gnu/packages/datastructures.scm (ssdeep): Update to 2.14.1. [source]: Use new home page. --- gnu/packages/datastructures.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index fdee1d2af7..3406c0ca1d 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -105,15 +105,15 @@ (define-public sparsehash (define-public ssdeep (package (name "ssdeep") - (version "2.13") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/ssdeep/" - name "-" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f")))) + (version "2.14.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/ssdeep-project/ssdeep/" + "releases/download/release-" version "/" + "ssdeep-" version ".tar.gz")) + (sha256 + (base32 "04qkjc6kksxkv7xbnk32rwmf3a8czdv2vvrdzfs0kw06h73snbpz")))) (build-system gnu-build-system) (home-page "https://ssdeep-project.github.io") (synopsis "Context-triggered piecewise hashing algorithm") -- cgit v1.2.3 From 6be0d9f4a689e382a735c8f0e44124ce963c8dd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:58:06 +0200 Subject: gnu: ssdeep: Don't install static libfuzzy.a. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/datastructures.scm (ssdeep)[arguments]: Pass the ‘--disable-static’ flag to configure. --- gnu/packages/datastructures.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 3406c0ca1d..5f3e12bb77 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -115,6 +115,9 @@ (define-public ssdeep (sha256 (base32 "04qkjc6kksxkv7xbnk32rwmf3a8czdv2vvrdzfs0kw06h73snbpz")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static"))) (home-page "https://ssdeep-project.github.io") (synopsis "Context-triggered piecewise hashing algorithm") (description "ssdeep computes and matches context triggered piecewise -- cgit v1.2.3 From 862af2fe213ad67dbdde002de84fffd526b6ceb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:31:25 +0200 Subject: gnu: ndctl: Update to 68. * gnu/packages/disk.scm (ndctl): Update to 68. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index fb35799e65..0f23852971 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -622,7 +622,7 @@ (define-public volume-key (define-public ndctl (package (name "ndctl") - (version "67") + (version "68") (source (origin (method git-fetch) (uri (git-reference @@ -631,7 +631,7 @@ (define-public ndctl (file-name (git-file-name name version)) (sha256 (base32 - "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n")))) + "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From b9cd4056668ecd5349e482b3f67d7fb8faad5cc7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:33:18 +0200 Subject: gnu: liburcu: Update to 0.12.0. * gnu/packages/datastructures.scm (liburcu): Update to 0.12.0. --- gnu/packages/datastructures.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 5f3e12bb77..1685dfa086 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Efraim Flashner ;;; @@ -129,14 +129,14 @@ (define-public ssdeep (define-public liburcu (package (name "liburcu") - (version "0.11.1") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "https://www.lttng.org/files/urcu/" "userspace-rcu-" version ".tar.bz2")) (sha256 (base32 - "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj")))) + "15wzk3nyy6gh6i7xhksxzs8fjar1g4ddz51iahk1v7lq0vjip6s0")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ; for tests -- cgit v1.2.3 From 6655e2e238d9c9d73b9453342b2ecb31de000a5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:40:09 +0200 Subject: gnu: uthash: Fix documentation directory. * gnu/packages/datastructures.scm (uthash)[arguments]: Install documentation to a versioned directory. --- gnu/packages/datastructures.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 1685dfa086..4505d82e38 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -181,7 +181,7 @@ (define-public uthash ;; There is no top-level Makefile to do this for us. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name)) + (doc (string-append out "/share/doc/" ,name "-" ,version)) (include (string-append out "/include"))) ;; Don't install HTML files: they're just the below .txt files ;; dolled up, can be stale, and regeneration requires asciidoc. -- cgit v1.2.3 From e5d193da69be4737b633f7aefa23d8d76c373f3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:40:24 +0200 Subject: gnu: uthash: Update to 2.1.0. * gnu/packages/datastructures.scm (uthash): Update to 2.1.0. --- gnu/packages/datastructures.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 4505d82e38..3c8814348f 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -152,7 +152,7 @@ (define-public liburcu (define-public uthash (package (name "uthash") - (version "2.0.2") + (version "2.1.0") (source (origin (method git-fetch) @@ -161,8 +161,7 @@ (define-public uthash (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0kslz8k6lssh7fl7ayzwlj62p0asxs3dq03357ls5ywjad238gqg")))) + (base32 "0k80bjbb6ss5wpmfmfji6xbyjm990hg9kcshwwnhdnh73vxkcd1m")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 6729488f59c402fef575629d2f9490480995bd64 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 04:58:29 +0200 Subject: gnu: debootstrap: Update to 1.0.123. * gnu/packages/debian.scm (debootstrap): Update to 1.0.123. --- gnu/packages/debian.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index db8c9695f4..ff4cccb03d 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,7 +117,7 @@ (define-public ubuntu-keyring (define-public debootstrap (package (name "debootstrap") - (version "1.0.119") + (version "1.0.123") (source (origin (method git-fetch) @@ -126,8 +126,7 @@ (define-public debootstrap (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4")))) + (base32 "0fr5ir8arzisx71jybbk4xz85waz50lf2y052nfimzh6vv9dx54c")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5687fdb7c0882aa7c38d6d306ec3c14034a7bee3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 05:48:18 +0200 Subject: gnu: e2fsprogs: Update to 1.45.6. * gnu/packages/linux.scm (e2fsprogs): Update to 1.45.6. [source]: Hard-code NAME. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0be50c11e0..3bad3e6f2b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1505,16 +1505,16 @@ (define-public usbutils (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.45.5") + (version "1.45.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/people/tytso/" - name "/v" version "/" - name "-" version ".tar.xz")) + "e2fsprogs/v" version "/" + "e2fsprogs-" version ".tar.xz")) (sha256 (base32 - "1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr")))) + "0mj2yizwygs7xww8jfy5mxjn8ww4pvc0b1hg1p2vsnirailsx9zz")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 873b9ddb5ee90602e2f9b6f5673e5d0f519d7feb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 06:34:39 +0200 Subject: gnu: java-xmlgraphics-commons: Update to 2.4. * gnu/packages/batik.scm (java-xmlgraphics-commons): Update to 2.4. --- gnu/packages/batik.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index cd77c9a12b..c8f4a34c72 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -198,7 +199,7 @@ (define-public java-w3c-sac (define-public java-xmlgraphics-commons (package (name "java-xmlgraphics-commons") - (version "2.3") + (version "2.4") (source (origin (method url-fetch) @@ -206,8 +207,7 @@ (define-public java-xmlgraphics-commons "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-" version "-src.tar.gz")) (sha256 - (base32 - "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23")) + (base32 "0zdkngb896cr35jq1v859j2kpqyn6a87k6a893h394hgvnz7yi3v")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3 From 62f7f0d636d3b3ff796263ab892ebf53263539fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Apr 2020 06:40:28 +0200 Subject: gnu: http-parser: Update to 2.9.4. * gnu/packages/web.scm (http-parser): Update to 2.9.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0092477679..bad8f033bb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5811,7 +5811,7 @@ (define-public python2-pytest-httpbin (define-public http-parser (package (name "http-parser") - (version "2.9.3") + (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5834,7 +5834,7 @@ (define-public http-parser "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) (sha256 (base32 - "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From f6145358c7d33e73c0708bbe400e6e8e65512ef3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 13 Apr 2020 10:37:15 +0200 Subject: gnu: guile-parted: Update to 0.0.3. * gnu/packages/guile-xyz.scm (guile-parted): Update to 0.0.3, [source]: remove snippet for Guile 3.0 that is now supported. --- gnu/packages/guile-xyz.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 02404db679..e1fcc12229 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016, 2019 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson -;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe +;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -1123,7 +1123,7 @@ (define-public guile-mastodon (define-public guile-parted (package (name "guile-parted") - (version "0.0.2") + (version "0.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -1132,20 +1132,8 @@ (define-public guile-parted (file-name (git-file-name name version)) (sha256 (base32 - "01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2 2.0])\n")) - - ;; Remove "guile.m4" since it contains an obsolete version - ;; of 'GUILE_PKG' that doesn't work with development - ;; versions such as 2.9. - (delete-file "m4/guile.m4") - #t)))) + "0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From deac7bf6ac7a943c9685949bf4dda7a2b1ba56c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Apr 2020 12:27:17 +0200 Subject: doc: Improve anchor collection. This allows us to catch "operating_002dsystem-1", for instance. * doc/build.scm (syntax-highlighted-html)[build](anchor-id->key): Drop "-1" & co. from ID. --- doc/build.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index ca81d813a9..994b94eae2 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -221,6 +221,7 @@ (define build (syntax-highlight lexers) (guix build utils) (srfi srfi-1) + (srfi srfi-26) (ice-9 match) (ice-9 threads) (ice-9 vlist)) @@ -358,9 +359,14 @@ (define (underscore-decode str) (define (anchor-id->key id) ;; Convert ID, an anchor ID such as ;; "index-pam_002dlimits_002dservice" to the corresponding key, - ;; "pam-limits-service" in this example. - (underscore-decode - (string-drop id (string-length "index-")))) + ;; "pam-limits-service" in this example. Drop the suffix of + ;; duplicate anchor IDs like "operating_002dsystem-1". + (let ((id (if (any (cut string-suffix? <> id) + '("-1" "-2" "-3" "-4" "-5")) + (string-drop-right id 2) + id))) + (underscore-decode + (string-drop id (string-length "index-"))))) (define* (collect-anchors file #:optional (vhash vlist-null)) ;; Collect the anchors that appear in FILE, a makeinfo-generated -- cgit v1.2.3 From e9ead1a4bbf5f377d8dd86bec8bb1eaf60d0e50d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Apr 2020 16:32:16 +0200 Subject: gnu: keepassxc: Update to 2.5.4. * gnu/packages/password-utils.scm (keepassxc): Update to 2.5.4. --- gnu/packages/password-utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 27e032d827..2a570691a4 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017, 2019 Eric Bavier -;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2017, 2020 Nicolas Goaziou ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Marius Bakke @@ -119,7 +119,7 @@ (define-public pwgen (define-public keepassxc (package (name "keepassxc") - (version "2.5.3") + (version "2.5.4") (source (origin (method url-fetch) @@ -127,7 +127,7 @@ (define-public keepassxc "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "1sx647mp1xikig50p9bb6vxv18ymdfj3wkxj6qfdr1zfcv7gn005")))) + (base32 "0jndssyvpl8bc5i2q3d6kq1ppynchxx9nvp1qhd2pc0qqc0hhpm5")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" -- cgit v1.2.3 From 95d9c1d7c93bb29aaf8e50f77205afc1173f0985 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 13 Apr 2020 17:58:19 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20200413. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20200413. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9dd2b5409d..ec32c06fd9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3046,10 +3046,10 @@ (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "4832c99c31e0eb1fcce3779d119343ae8a423952")) + (let ((commit "d97115ca601838dfa60ea7afbb88641d7a526dba")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "1" commit)) + (version (git-version "2.4" "2" commit)) (source (origin (method git-fetch) @@ -3059,7 +3059,7 @@ (define-public sbcl-cl-webkit (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "0sn7m181wfg1q49q45dlsry8c38x7pziqcs0frnymk6yvgndybxd")))) + "0sdb2l2h5xv5c1m2mfq31i9yl6zjf512fvwwzlvk9nvisyhc4xi3")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From 2fa04968afe204c61cd37d6c7b77d52818663062 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 13 Apr 2020 18:10:51 +0200 Subject: gnu: Add sbcl-enchant. * gnu/packages/lisp-xyz.scm (cl-enchant, sbcl-enchant): New variables. --- gnu/packages/lisp-xyz.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ec32c06fd9..9bda4afab5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018, 2020 Pierre Neidhardt ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve @@ -53,6 +53,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages enchant) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages imagemagick) @@ -11312,3 +11313,42 @@ (define-public sbcl-trivial-package-local-nicknames (define-public cl-trivial-package-local-nicknames (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames)) + +(define-public sbcl-enchant + (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa")) + (package + (name "sbcl-enchant") + (version (git-version "0.0.0" "1" commit)) + (home-page "https://github.com/tlikonen/cl-enchant") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19yh5ihirzi1d8xqy1cjqipzd6ly3245cfxa5s9xx496rryz0s01")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("enchant" ,enchant) + ("cffi" ,sbcl-cffi))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "load-enchant.lisp" + (("libenchant") + (string-append + (assoc-ref inputs "enchant") "/lib/libenchant-2")))))))) + (synopsis "Common Lisp interface for the Enchant spell-checker library") + (description + "Enchant is a Common Lisp interface for the Enchant spell-checker +library. The Enchant library is a generic spell-checker library which uses +other spell-checkers transparently as back-end. The library supports the +multiple checkers, including Aspell and Hunspell.") + (license license:public-domain)))) + +(define-public cl-enchant + (sbcl-package->cl-source-package sbcl-enchant)) -- cgit v1.2.3 From 37eaefe84fdf00bd8b6046986bc00d5a956b1b9b Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 13 Apr 2020 15:50:36 +0200 Subject: gnu: dnsmasq: Update to 2.81. * gnu/packages/dns.scm (dnsmasq): Update to 2.81. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/dns.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index af45ec2a82..77f27fddfb 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2019 Rutger Helling +;;; Copyright © 2020 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ (define-module (gnu packages dns) (define-public dnsmasq (package (name "dnsmasq") - (version "2.80") + (version "2.81") (source (origin (method url-fetch) (uri (string-append @@ -83,7 +84,7 @@ (define-public dnsmasq version ".tar.xz")) (sha256 (base32 - "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd")))) + "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8d85ad6c6d8c0dfc2ffbd9668c5b714a511fe0b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 18:10:54 +0200 Subject: gnu: python-parameterized: Update to 0.7.3. * gnu/packages/check.scm (python-parameterized): Update to 0.7.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d83e4b448b..1cd40d9b13 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -581,14 +581,14 @@ (define-public cpputest (define-public python-parameterized (package (name "python-parameterized") - (version "0.7.1") + (version "0.7.3") (source (origin (method url-fetch) (uri (pypi-uri "parameterized" version)) (sha256 (base32 - "1vapry9lyfb2mlpgk2wh9079hzxzq5120bsczncxxay663mdp53a")))) + "0g1q6n7fkanjv7i1djzw62f46xf573jvza7afabh3baqjqxy7rpd")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bad368b0d794689f3a8a11b58f1ea4987938682e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 20:18:52 +0200 Subject: Revert "gnu: http-parser: Update to 2.9.4." It fails to build on armhf-linux; see . This reverts commit 62f7f0d636d3b3ff796263ab892ebf53263539fa. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bad8f033bb..0092477679 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5811,7 +5811,7 @@ (define-public python2-pytest-httpbin (define-public http-parser (package (name "http-parser") - (version "2.9.4") + (version "2.9.3") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5834,7 +5834,7 @@ (define-public http-parser "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) (sha256 (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) + "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3