* [Telegram-Desktop]: Help with packaging
@ 2021-01-08 1:54 Raghav Gururajan
2021-01-08 1:59 ` Raghav Gururajan
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Raghav Gururajan @ 2021-01-08 1:54 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
Hello Guix!
I have almost finished packaging telegram-desktop application. Here is
the patch-set, https://issues.guix.gnu.org/issue/45721
With this email, I have attached the complete diff, which is to be
applied on top of master.
While building the package 'tdesktop', I get this error,
https://paste.debian.net/plain/1180116
Any ideas on how to rectify this?
Regards,
RG.
[-- Attachment #2: telegram.diff --]
[-- Type: text/x-patch, Size: 655771 bytes --]
diff --git a/Makefile.am b/Makefile.am
index aec2bb1474..51ff9c9ec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -397,6 +397,8 @@ EXAMPLES = \
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
nobase_dist_guilemodule_DATA = \
+ guix/d3.v3.js \
+ guix/graph.js \
guix/store/schema.sql \
$(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \
$(MISC_DISTRO_FILES)
@@ -611,8 +613,6 @@ EXTRA_DIST += \
build-aux/test-driver.scm \
build-aux/update-guix-package.scm \
build-aux/update-NEWS.scm \
- d3.v3.js \
- graph.js \
tests/test.drv \
tests/signing-key.pub \
tests/signing-key.sec \
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 4195cb4105..d0ab08336a 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -166,14 +166,15 @@ actually installing them. So that you can distinguish between your
``end-user'' hat and your ``motley'' costume.
To that end, all the command-line tools can be used even if you have not
-run @code{make install}. To do that, you first need to have an environment
-with all the dependencies available (@pxref{Building from Git}), and then
-simply prefix each command with
-@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the
-top build tree of Guix; it is generated by @command{./configure}).
-As an example, here is how you would build the @code{hello} package as
-defined in your working tree (this assumes @command{guix-daemon} is
-already running on your system; it's OK if it's a different version):
+run @code{make install}. To do that, you first need to have an
+environment with all the dependencies available (@pxref{Building from
+Git}), and then simply prefix each command with @command{./pre-inst-env}
+(the @file{pre-inst-env} script lives in the top build tree of Guix; it
+is generated by running @command{./bootstrap} followed by
+@command{./configure}). As an example, here is how you would build the
+@code{hello} package as defined in your working tree (this assumes
+@command{guix-daemon} is already running on your system; it's OK if it's
+a different version):
@example
$ ./pre-inst-env guix build hello
diff --git a/doc/guix.texi b/doc/guix.texi
index 1081ed26a3..884224fce6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -21,7 +21,7 @@
@set SUBSTITUTE-URL https://@value{SUBSTITUTE-SERVER}
@copying
-Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@*
+Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès@*
Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@*
Copyright @copyright{} 2013 Nikita Karetnikov@*
Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
@@ -13359,7 +13359,8 @@ The default label includes the kernel name and version.
@item @code{keyboard-layout} (default: @code{#f})
This field specifies the keyboard layout to use in the console. It can be
either @code{#f}, in which case the default keyboard layout is used (usually
-US English), or a @code{<keyboard-layout>} record.
+US English), or a @code{<keyboard-layout>} record. @xref{Keyboard Layout},
+for more information.
This keyboard layout is in effect as soon as the kernel has booted. For
instance, it is the keyboard layout in effect when you type a passphrase if
@@ -31548,10 +31549,12 @@ each other:
@table @code
@item extension-graph
-Emit in Dot/Graphviz format to standard output the @dfn{service
+Emit to standard output the @dfn{service
extension graph} of the operating system defined in @var{file}
(@pxref{Service Composition}, for more information on service
-extensions).
+extensions). By default the output is in Dot/Graphviz format, but you
+can choose a different format with @option{--graph-backend}, as with
+@command{guix graph} (@pxref{Invoking guix graph, @option{--backend}}):
The command:
@@ -31563,11 +31566,14 @@ shows the extension relations among services.
@anchor{system-shepherd-graph}
@item shepherd-graph
-Emit in Dot/Graphviz format to standard output the @dfn{dependency
+Emit to standard output the @dfn{dependency
graph} of shepherd services of the operating system defined in
@var{file}. @xref{Shepherd Services}, for more information and for an
example graph.
+Again, the default output format is Dot/Graphviz, but you can pass
+@option{--graph-backend} to select a different one.
+
@end table
@node Invoking guix deploy
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 9015f40bb6..94c04aa646 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -7,6 +7,7 @@
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
+# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
#
# This file is part of GNU Guix.
#
@@ -454,14 +455,12 @@ sys_create_init_profile()
cat <<"EOF" > /etc/profile.d/guix.sh
# _GUIX_PROFILE: `guix pull` profile
_GUIX_PROFILE="$HOME/.config/guix/current"
-if [ -L $_GUIX_PROFILE ]; then
- export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
- # Export INFOPATH so that the updated info pages can be found
- # and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
- # When INFOPATH is unset, add a trailing colon so that Emacs
- # searches 'Info-default-directory-list'.
- export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
-fi
+export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
+# Export INFOPATH so that the updated info pages can be found
+# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
+# When INFOPATH is unset, add a trailing colon so that Emacs
+# searches 'Info-default-directory-list'.
+export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
# GUIX_PROFILE: User's default profile
GUIX_PROFILE="$HOME/.guix-profile"
diff --git a/gnu/local.mk b/gnu/local.mk
index dfd44ac769..788f1d736e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -39,6 +39,7 @@
# Copyright © 2020 Martin Becze <mjbecze@riseup.net>
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
+# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
#
# This file is part of GNU Guix.
#
@@ -533,6 +534,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/task-management.scm \
%D%/packages/tbb.scm \
%D%/packages/tcl.scm \
+ %D%/packages/telegram.scm \
%D%/packages/telephony.scm \
%D%/packages/terminals.scm \
%D%/packages/terraform.scm \
@@ -1113,8 +1115,7 @@ dist_patch_DATA = \
%D%/packages/patches/go-skip-gc-test.patch \
%D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpodder-disable-updater.patch \
- %D%/packages/patches/gpsbabel-minizip.patch \
- %D%/packages/patches/gpsbabel-qstring.patch \
+ %D%/packages/patches/gpsbabel-fix-i686-test.patch \
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
@@ -1124,6 +1125,7 @@ dist_patch_DATA = \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
+ %D%/packages/patches/gsl-gtest.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
@@ -1288,8 +1290,7 @@ dist_patch_DATA = \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
- %D%/packages/patches/libtgvoip-disable-sse2.patch \
- %D%/packages/patches/libtgvoip-disable-webrtc.patch \
+ %D%/packages/patches/libtgvoip-pkgconfig.patch \
%D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtirpc-hurd-client.patch \
@@ -1451,6 +1452,7 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-header-guard.patch \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \
+ %D%/packages/patches/smalltalk-multiplication-overflow.patch \
%D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
%D%/packages/patches/patchutils-test-perms.patch \
@@ -1595,6 +1597,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.19-mrustc.patch \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-1.45-linker-locale.patch \
+ %D%/packages/patches/rust-1.48-linker-locale.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 08c653ba17..997d673e75 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
-;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -346,6 +346,14 @@ by MACHINE."
;;; System deployment.
;;;
+(define not-config?
+ ;; Select (guix …) and (gnu …) modules, except (guix config).
+ (match-lambda
+ (('guix 'config) #f)
+ (('guix _ ...) #t)
+ (('gnu _ ...) #t)
+ (_ #f)))
+
(define (machine-boot-parameters machine)
"Monadic procedure returning a list of 'boot-parameters' for the generations
of MACHINE's system profile, ordered from most recent to oldest."
@@ -354,9 +362,10 @@ of MACHINE's system profile, ordered from most recent to oldest."
(define remote-exp
(with-extensions (list guile-gcrypt)
- (with-imported-modules (source-module-closure
- `(((guix config) => ,(make-config.scm))
- (guix profiles)))
+ (with-imported-modules `(((guix config) => ,(make-config.scm))
+ ,@(source-module-closure
+ '((guix profiles))
+ #:select? not-config?))
#~(begin
(use-modules (guix config)
(guix profiles)
diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index 5180f88bae..f3bd094c92 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
@@ -95,15 +95,14 @@ terminals.")
(define-public brltty
(package
(name "brltty")
- (version "6.1")
+ (version "6.2")
(source
(origin
(method url-fetch)
(uri
- (string-append "https://brltty.app/archive/"
- name "-" version ".tar.gz"))
+ (string-append "https://brltty.app/archive/brltty-" version ".tar.gz"))
(sha256
- (base32 "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"))))
+ (base32 "0m0cq3p1cwp52n81si621gij82w3mdqwgr39m6bs652pmk5na72l"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; No target
@@ -138,7 +137,8 @@ terminals.")
"PYTHON_ROOT=/"
(string-append "TCL_DIR="
(assoc-ref %outputs "out")
- "/lib"))
+ "/lib")
+ "INSTALL_WRITABLE_DIRECTORY=no-thanks")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-errors
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index e45e228624..375073363f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -9,11 +9,11 @@
;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@@ -929,14 +929,14 @@ recursive runs on the generated subnets. (also IPv6)
(define-public alive
(package
(name "alive")
- (version "2.0.2")
+ (version "2.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/alive/alive-"
version ".tar.xz"))
(sha256
(base32
- "1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j"))))
+ "053hfp7s66lnilm1ii4jrjmy44wpa2cwwh6f0sl8cyz0mm813x4b"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("alive_cv_nice_ping=yes")))
(inputs `(("guile" ,guile-2.0)
@@ -2110,7 +2110,7 @@ various ways that may be running with too much privilege.")
(define-public smartmontools
(package
(name "smartmontools")
- (version "7.1")
+ (version "7.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2118,7 +2118,7 @@ various ways that may be running with too much privilege.")
version "/smartmontools-" version ".tar.gz"))
(sha256
(base32
- "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"))))
+ "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"))))
(build-system gnu-build-system)
(inputs `(("libcap-ng" ,libcap-ng)))
(home-page "https://www.smartmontools.org/")
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index a5eef508cd..214878949e 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
@@ -355,7 +355,7 @@ precision.")
(define-public giac
(package
(name "giac")
- (version "1.6.0-31")
+ (version "1.6.0-41")
(source
(origin
(method url-fetch)
@@ -367,7 +367,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
- (base32 "1dr1y88sx2gzldn0zl6p8b1ngjjcmh89iv4kzyhi2cf74j3yw85m"))))
+ (base32 "1z5b3jm6ffxk3yvdqzwn9icbna68brkrz5kspgacq823d03jfklc"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)
diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 7a6d20116f..76089333ce 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
-;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
@@ -476,15 +476,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
(define-public ispell
(package
(name "ispell")
- (version "3.4.00")
+ (version "3.4.01")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
version ".tar.gz"))
(sha256
- (base32
- "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"))))
+ (base32 "103vscg4bc7x2q84y18x1l75k54yhkw8lpza3qh8xxhcz5b0w7jb"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-build? #f
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 18ed96f7fd..9485fe600f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
@@ -159,7 +159,7 @@ programs for the manipulation and analysis of astronomical data.")
(define-public stellarium
(package
(name "stellarium")
- (version "0.20.3")
+ (version "0.20.4")
(source
(origin
(method url-fetch)
@@ -167,7 +167,7 @@ programs for the manipulation and analysis of astronomical data.")
"/releases/download/v" version
"/stellarium-" version ".tar.gz"))
(sha256
- (base32 "0z5r7b1ac43l330xphxnw54xg7jm87ajix8yl4hkq82cs5ja7097"))))
+ (base32 "1253zlr0mi4kdbj119spxk7spg4rkahb4rlpd0hz1d81mnv3n0v3"))))
(build-system cmake-build-system)
(inputs
`(("qtbase" ,qtbase)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 87c7e6f4de..a4f5170a92 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 okapi <okapi@firemail.cc>
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -2343,14 +2343,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.")
(define-public lilv
(package
(name "lilv")
- (version "0.24.8")
+ (version "0.24.10")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/lilv-"
version ".tar.bz2"))
(sha256
(base32
- "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"))))
+ "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -4832,16 +4832,15 @@ edited, converted, compressed and saved.")
(define-public lsp-dsp-lib
(package
(name "lsp-dsp-lib")
- (version "0.5.8")
+ (version "0.5.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/sadko4u/lsp-dsp-lib/"
- "releases/download/lsp-dsp-lib-" version
+ "releases/download/" version
"/lsp-dsp-lib-" version "-src.tar.gz"))
(sha256
- (base32
- "07w3d2i0z0xmvi1ngcgs7lc5a0da8jvf7rv4dnjk01md43b7fkh1"))))
+ (base32 "0lkar6r9jfrrqswi8nnndlm5a9kfwqjn92d81gp2yhc3p46xsswz"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -4849,6 +4848,11 @@ edited, converted, compressed and saved.")
(list (string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'omit-static-library
+ (lambda _
+ (substitute* "src/Makefile"
+ ((".*@.*ARTIFACT_SLIB.*") "") ; don't install it
+ ((" \\$\\(ARTIFACT_SLIB\\)") "")))) ; don't build it
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "config"
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index e45bbb6b26..bd40a6eb5c 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@@ -33,14 +33,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
- (version "2.6.4")
+ (version "2.6.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(sha256
- (base32 "116na9nncpwshl3ww8w3llzwk49igilplxcjy1k6jzl3mmg2bimz"))))
+ (base32 "06f21smb412xads4lygvyb47fcpvhdns0k6h880m9pbzgq6141yj"))))
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 47fca7c494..b8301828cc 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -52,13 +52,16 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages gettext)
+ #:use-module (guix i18n)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (ice-9 format)
#:use-module (ice-9 match)
+ #:use-module (ice-9 optargs)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (glibc
@@ -1106,9 +1109,16 @@ to the @code{share/locale} sub-directory of this package.")
,(version-major+minor
(package-version glibc)))))))))))
-(define-public (make-glibc-utf8-locales glibc)
+(define %default-utf8-locales
+ ;; These are the locales commonly used for tests---e.g., in Guile's i18n
+ ;; tests.
+ '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+(define*-public (make-glibc-utf8-locales glibc #:key
+ (locales %default-utf8-locales)
+ (name "glibc-utf8-locales"))
+ (define default-locales? (equal? locales %default-utf8-locales))
(package
- (name "glibc-utf8-locales")
+ (name name)
(version (package-version glibc))
(source #f)
(build-system trivial-build-system)
@@ -1142,17 +1152,22 @@ to the @code{share/locale} sub-directory of this package.")
(symlink (string-append locale ".utf8")
(string-append localedir "/"
locale ".UTF-8")))
-
- ;; These are the locales commonly used for
- ;; tests---e.g., in Guile's i18n tests.
- '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+ ',locales)
#t))))
(native-inputs `(("glibc" ,glibc)
("gzip" ,gzip)))
- (synopsis "Small sample of UTF-8 locales")
+ (synopsis (if default-locales?
+ (P_ "Small sample of UTF-8 locales")
+ (P_ "Customized sample of UTF-8 locales")))
(description
- "This package provides a small sample of UTF-8 locales mostly useful in
+ (if default-locales?
+ (P_ "This package provides a small sample of UTF-8 locales mostly useful in
test environments.")
+ (format #f (P_ "This package provides the following UTF-8 locales:
+@itemize
+~{@item ~a~%~}
+@end itemize~%")
+ locales)))
(home-page (package-home-page glibc))
(license (package-license glibc))))
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 2ea9c2ac51..d9e5e4d7de 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -189,15 +189,18 @@ language with thin bindings for other languages.")
(name "udunits")
;; Four-part version numbers are development snapshots, not releases. See
;; <https://github.com/Unidata/UDUNITS-2/issues/99#issuecomment-732323472>.
- (version "2.2.26")
+ (version "2.2.28")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp.unidata.ucar.edu/pub/udunits/"
"udunits-" version ".tar.gz"))
(sha256
(base32
- "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"))))
+ "17jpbp6f0rr132jn2gqy8ry8mv1w27v6dyhfq1igv8v1674aw2sr"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "--disable-static")))
(inputs
`(("expat" ,expat)))
(home-page "https://www.unidata.ucar.edu/software/udunits/")
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 56b32792fe..ab74650066 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -31,6 +31,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
@@ -43,6 +44,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
#:use-module (gnu packages hurd)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization)
@@ -52,6 +54,33 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
+(define-public cmake-shared
+ (package
+ (name "cmake-shared")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/cmake-shared.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ; No target
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (synopsis "Shared CMake functions and macros")
+ (description "CMake-Shared are shared functions and macros for projects
+using the CMake build system.")
+ (home-page "https://github.com/lirios/cmake-shared/")
+ (license license:bsd-3)))
+
;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system.
(define %common-build-phases
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index d7b821228a..7294a2eda6 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -621,14 +621,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
(define-public lziprecover
(package
(name "lziprecover")
- (version "1.21")
+ (version "1.22")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/lziprecover/"
"lziprecover-" version ".tar.gz"))
(sha256
(base32
- "094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2"))))
+ "0qh8dnhr5rly2k9dnx43qqynqwqzi5kfb15pyd29qwppfl4qm5gx"))))
(build-system gnu-build-system)
(home-page "https://www.nongnu.org/lzip/lziprecover.html")
(synopsis "Recover and decompress data from damaged lzip files")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 00e006928e..4295e6cc3d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -39,16 +39,19 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
@@ -63,6 +66,96 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
+(define-public rlottie
+ (package
+ (name "rlottie")
+ (version "0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Samsung/rlottie.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-Dlog=true"
+ "-Dtest=true")))
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Lottie Animation Library")
+ (description "Rlottie is a platform independent standalone c++ library for
+rendering vector based animations and art in realtime.")
+ (home-page "https://github.com/Samsung/rlottie/")
+ (license license:expat)))
+
+(define-public range-v3
+ (package
+ (name "range-v3")
+ (version "0.11.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/ericniebler/range-v3.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("perl" ,perl)))
+ (inputs
+ `(("boost" ,boost)))
+ (synopsis "Range library for C++14/17/20")
+ (description "Range-v3 is the range library for C++14/17/20. This code was
+the basis of a formal proposal to add range support to the C++ standard library.")
+ (home-page "https://github.com/ericniebler/range-v3/")
+ (license
+ (list
+ ;; Dual-Licensed
+ license:expat
+ license:ncsa))))
+
+(define-public gsl
+ (package
+ (name "gsl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/microsoft/GSL.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (patches
+ (search-patches "gsl-gtest.patch"))
+ (sha256
+ (base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Guidelines Support Library")
+ (description "GSL contains functions and types that are suggested for use by
+the C++ Core Guidelines maintained by the Standard C++ Foundation.")
+ (home-page "https://github.com/microsoft/GSL/")
+ (license license:expat)))
+
(define-public libzen
(package
(name "libzen")
@@ -334,7 +427,8 @@ as ordering relation.")
(build-system cmake-build-system)
(arguments
'(#:configure-flags
- (list (string-append "-DJSON_TestDataDirectory="
+ (list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp.
+ (string-append "-DJSON_TestDataDirectory="
(assoc-ref %build-inputs "json_test_data")))
#:phases (modify-phases %standard-phases
;; XXX: When tests are enabled, the install phase will cause
diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index ac80a30f38..ebe2a4e45b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
@@ -773,7 +773,7 @@
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-heck" ,rust-heck-0.3)
("rust-itertools" ,rust-itertools-0.9)
("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ab90ec141b..e3571ab595 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
-;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
-;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -89,6 +89,652 @@
library in Rust.")
(license license:expat)))
+(define-public rust-actix-0.10
+ (package
+ (name "rust-actix")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0q6cd08d0xikilj9l3gfsyhva5b91y55lfxy7yd7w7ivizw43qhv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;doc test fails
+ #:cargo-inputs
+ (("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-derive" ,rust-actix-derive-0.5)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-util" ,rust-tokio-util-0.3)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.19)
+ ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.19))))
+ (home-page "https://actix.rs")
+ (synopsis "Actor framework for Rust")
+ (description "This package provides Actix actor framework for Rust.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-codec-0.3
+ (package
+ (name "rust-actix-codec")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-codec" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0w7506qd2f8q83z6l5lqx1363ks0ysx8f7qgvy8fknrq70xq7lbq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-util" ,rust-tokio-util-0.3))))
+ (home-page "https://actix.rs")
+ (synopsis "Codec utilities for working with framed protocols")
+ (description
+ "This package provides codec utilities for working with framed
+protocols.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-codec-0.2
+ (package
+ (inherit rust-actix-codec-0.3)
+ (name "rust-actix-codec")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-codec" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "100k0n155fnnjqjz2s1gnwim2fp7s1mw942x0famg89cbh55zr89"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-util" ,rust-tokio-util-0.2))))))
+
+(define-public rust-actix-connect-1
+ (package
+ (name "rust-actix-connect")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-connect" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0v77m394gzbrrzg12xkqgli11vwhig0zcxy3yhmq1s91j9bcjp69"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; XXX: The crate fails to't build with: "error[E0432]: unresolved import
+ ;; `trust_dns_resolver::Background`". I assume it really expects
+ ;; trust-dns-resolver at version 0.18-alpha.2, which we do not provide.
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-utils" ,rust-actix-utils-1)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-either" ,rust-either-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-tokio-openssl" ,rust-tokio-openssl-0.4)
+ ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)
+ ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.18)
+ ("rust-webpki" ,rust-webpki-0.21))
+ #:cargo-development-inputs
+ (("rust-actix-testing" ,rust-actix-testing-1))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-version-requirements
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("0.18.0-alpha.2")
+ ,(package-version rust-trust-dns-proto-0.18)))
+ #t)))))
+ (home-page "https://actix.rs")
+ (synopsis "TCP connector service for Actix ecosystem")
+ (description
+ "This package provides a TCP connector service for Actix ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-derive-0.5
+ (package
+ (name "rust-actix-derive")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0k1kg4gkp2jhi5fgdfd0cq2qfbyy3gfgwqjrvzq1hzrjmynwwnmr"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;bootsrapping issues with rust-actix
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ ;; #:cargo-development-inputs
+ ;; (("rust-actix" ,rust-actix-0.8))
+ ))
+ (home-page "https://github.com/actix/actix-derive/")
+ (synopsis "Proc macros for Actix Rust actor framework")
+ (description
+ "This package provides proc macros for the Rust actor framework Actix.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-http-1
+ (package
+ (name "rust-actix-http")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-http" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06chrs9asbxmxzgiw5sw7ky97yrin9g88nmd6w407a6y9z668rn1"))))
+ (build-system cargo-build-system)
+ ;; XXX: The crate fails to't build with with the same error as
+ ;; rust-actix-connect. Skip build for now.
+ (arguments
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-connect" ,rust-actix-connect-1)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-threadpool" ,rust-actix-threadpool-0.3)
+ ("rust-actix-tls" ,rust-actix-tls-1)
+ ("rust-actix-utils" ,rust-actix-utils-1)
+ ("rust-base64" ,rust-base64-0.11)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-brotli2" ,rust-brotli2-0.3)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-copyless" ,rust-copyless-0.1)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-either" ,rust-either-1)
+ ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-flate2" ,rust-flate2-1)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-fxhash" ,rust-fxhash-0.2)
+ ("rust-h2" ,rust-h2-0.2)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-httparse" ,rust-httparse-1)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-language-tags" ,rust-language-tags-0.2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-mime" ,rust-mime-0.3)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-ring" ,rust-ring-0.16)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.6)
+ ("rust-sha1" ,rust-sha1-0.6)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-time" ,rust-time-0.1))
+ #:cargo-development-inputs
+ (("rust-actix-http-test" ,rust-actix-http-test-1))))
+ (home-page "https://actix.rs")
+ (synopsis "HTTP primitives for the Actix ecosystem")
+ (description
+ "This package provides HTTP primitives for the Actix ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-http-test-1
+ (package
+ (name "rust-actix-http-test")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-http-test" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06z6iy9ffsjcw3g8zwwghky5zpyg7c1z823x35lgc4y1yjzxfizq"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; XXX: The crate fails to't build with with the same error as
+ ;; rust-actix-connect. Skip build for now.
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-connect" ,rust-actix-connect-1)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-server" ,rust-actix-server-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-testing" ,rust-actix-testing-1)
+ ("rust-actix-utils" ,rust-actix-utils-1)
+ ("rust-awc" ,rust-awc-1)
+ ("rust-base64" ,rust-base64-0.11)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-env-logger" ,rust-env-logger-0.6)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-net2" ,rust-net2-0.2)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.6)
+ ("rust-sha1" ,rust-sha1-0.6)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-time" ,rust-time-0.1))
+ #:cargo-development-inputs
+ (("rust-actix-http" ,rust-actix-http-1))))
+ (home-page "https://actix.rs")
+ (synopsis "Helpers for Actix applications to use during testing")
+ (description
+ "This package provides various helpers for Actix applications to use
+during testing.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-macros-0.1
+ (package
+ (name "rust-actix-macros")
+ (version "0.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0mfnprr8gy1gb5xcr18iwsv781hysvh7sr5xxg6ghyi61gh8rjml"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://actix.rs")
+ (synopsis "Actix runtime macros")
+ (description "This package provides Actix runtime macros.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-router-0.2
+ (package
+ (name "rust-actix-router")
+ (version "0.2.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-router" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0df2626hk4n4yki6j88v3k0gcm8pi5hdnm1mldyvyi8nvbdzgldv"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; Tests fail with "error[E0432]: unresolved import `serde_derive`".
+ `(#:tests? #false
+ #:cargo-inputs
+ (("rust-bytestring" ,rust-bytestring-0.1)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-serde" ,rust-serde-1))))
+ (home-page "https://actix.rs")
+ (synopsis "Resource path matching library")
+ (description "This package provides resource path matching library.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-rt-1
+ (package
+ (name "rust-actix-rt")
+ (version "1.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-rt" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09xj7pxy0ng13rd6hya1md98dhk0586p4bsfrwmxxlg028lwqgql"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-actix-macros" ,rust-actix-macros-0.1)
+ ("rust-actix-threadpool" ,rust-actix-threadpool-0.3)
+ ("rust-copyless" ,rust-copyless-0.1)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-tokio" ,rust-tokio-0.2))))
+ (home-page "https://actix.rs")
+ (synopsis "Actix runtime")
+ (description "This package provides Actix runtime.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-server-1
+ (package
+ (name "rust-actix-server")
+ (version "1.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-server" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "13khzd6pz9pqksxmw2syipfwq2gi5v9warx6pa24g8iccxp7wh25"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; Tests fail with "error[E0432]: unresolved import `bytes`" error.
+ `(#:tests? #false
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.3)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-utils" ,rust-actix-utils-2)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-mio" ,rust-mio-0.6)
+ ("rust-mio-uds" ,rust-mio-uds-0.6)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-socket2" ,rust-socket2-0.3))))
+ (home-page "https://actix.rs")
+ (synopsis "General purpose TCP server built for the Actix ecosystem")
+ (description
+ "This package provides a general purpose TCP server built for the Actix
+ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-service-1
+ (package
+ (name "rust-actix-service")
+ (version "1.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-service" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fw2b1cpxrpqk778mpvxv0cazj0pwjyb6khzs4syhnqvb1fl6lh0"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-pin-project" ,rust-pin-project-0.4))
+ #:cargo-development-inputs
+ (("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-criterion" ,rust-criterion-0.3))))
+ (home-page "https://actix.rs")
+ (synopsis
+ "Service trait and combinators for asynchronous request/response")
+ (description
+ "This package provides a service trait and combinators for representing
+asynchronous request/response operations.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-testing-1
+ (package
+ (name "rust-actix-testing")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-testing" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "073r3rlnz9km7w7zfhpj6snb453hhp7d354adbp79awrhyirq8s7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-actix-macros" ,rust-actix-macros-0.1)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-server" ,rust-actix-server-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-socket2" ,rust-socket2-0.3))))
+ (home-page "https://actix.rs")
+ (synopsis "Actix testing utils")
+ (description "This package provides Actix testing utils.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-threadpool-0.3
+ (package
+ (name "rust-actix-threadpool")
+ (version "0.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-threadpool" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0c0frk19ml94d01mvgv5g60mhq86gfi34c3lsfpvjm18016z02fj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-threadpool" ,rust-threadpool-1))))
+ (home-page "https://actix.rs")
+ (synopsis "Actix thread pool for sync code")
+ (description "This package provides Actix thread pool for sync code.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-tls-1
+ (package
+ (name "rust-actix-tls")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-tls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1a4m96jz6vzmknpk5m803c337c6dillnqq4w71nrlphhmzxb9rd4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-utils" ,rust-actix-utils-1)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-either" ,rust-either-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-native-tls" ,rust-native-tls-0.2)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-tokio-openssl" ,rust-tokio-openssl-0.4)
+ ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
+ ("rust-tokio-tls" ,rust-tokio-tls-0.3)
+ ("rust-webpki" ,rust-webpki-0.21)
+ ("rust-webpki-roots" ,rust-webpki-roots-0.17))
+ #:cargo-development-inputs
+ (("rust-actix-testing" ,rust-actix-testing-1))))
+ (home-page "https://actix.rs")
+ (synopsis "TLS acceptor services for Actix ecosystem")
+ (description
+ "This package provides TLS acceptor services for Actix ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-utils-2
+ (package
+ (name "rust-actix-utils")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-utils" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0nkby6wpwcmjr3zcghd962l2hyjry0aayncyjzbx2ck6qpg2541f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.3)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-either" ,rust-either-1)
+ ("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-slab" ,rust-slab-0.4))))
+ (home-page "https://actix.rs")
+ (synopsis "Network related services and utilities for the Actix ecosystem")
+ (description
+ "This package provides various network related services and utilities for
+the Actix ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-utils-1
+ (package
+ (inherit rust-actix-utils-2)
+ (name "rust-actix-utils")
+ (version "1.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-utils" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0kkz2hfz8r2k1gxcjk2qq1h1qxlb487g023q4v1dw6ph3dizby7w"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-either" ,rust-either-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-slab" ,rust-slab-0.4))))))
+
+(define-public rust-actix-web-2
+ (package
+ (name "rust-actix-web")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-web" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0dgnn7xiw2yhvrx7l7b57gwra7yfqawka5xz1lpq4h0h8qifhn1i"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; XXX: The crate fails to't build with with the same error as
+ ;; rust-actix-connect. Skip build for now.
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-http" ,rust-actix-http-1)
+ ("rust-actix-macros" ,rust-actix-macros-0.1)
+ ("rust-actix-router" ,rust-actix-router-0.2)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-server" ,rust-actix-server-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-actix-testing" ,rust-actix-testing-1)
+ ("rust-actix-threadpool" ,rust-actix-threadpool-0.3)
+ ("rust-actix-tls" ,rust-actix-tls-1)
+ ("rust-actix-utils" ,rust-actix-utils-1)
+ ("rust-actix-web-codegen" ,rust-actix-web-codegen-0.2)
+ ("rust-awc" ,rust-awc-1)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-fxhash" ,rust-fxhash-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-mime" ,rust-mime-0.3)
+ ("rust-net2" ,rust-net2-0.2)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-pin-project" ,rust-pin-project-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.6)
+ ("rust-time" ,rust-time-0.1)
+ ("rust-url" ,rust-url-2))))
+ (home-page "https://actix.rs")
+ (synopsis "Powerful, pragmatic, and fast web framework for Rust")
+ (description
+ "Actix Web is a powerful, pragmatic, and fast web framework for
+Rust.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-actix-web-codegen-0.2
+ (package
+ (name "rust-actix-web-codegen")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "actix-web-codegen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0rjpzwsm51nfjqsz269jwbkiic9d454bnsk9ng882wp0rdsz86x7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-web" ,rust-actix-web-2))))
+ (home-page "https://actix.rs")
+ (synopsis "Actix web proc macros")
+ (description "This package provides Actix web proc macros.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-addr2line-0.11
(package
(name "rust-addr2line")
@@ -496,7 +1142,7 @@ using AES-NI for high performance.")
`(#:cargo-inputs
(("rust-memchr" ,rust-memchr-2))
#:cargo-development-inputs
- (("rust-csv" ,rust-csv-1.1)
+ (("rust-csv" ,rust-csv-1)
("rust-docopt" ,rust-docopt-1.1)
("rust-memmap" ,rust-memmap-0.6)
("rust-quickcheck" ,rust-quickcheck-0.7)
@@ -655,6 +1301,49 @@ be used with the stdlib.")
(description "This package provides the glue for the Android JNI.")
(license license:expat)))
+(define-public rust-android-log-sys-0.1
+ (package
+ (name "rust-android-log-sys")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "android_log-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0klq7cp4lm74gjf9p12zdjcr159blbicrfvadmaqvfxbi8njw1dq"))))
+ (arguments `(#:skip-build? #true)) ;XXX: Android only
+ (build-system cargo-build-system)
+ (home-page "https://github.com/nercury/android_log-sys-rs")
+ (synopsis "FFI bindings to Android log Library")
+ (description "This package provides FFI bindings to Android log Library.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-android-logger-0.8
+ (package
+ (name "rust-android-logger")
+ (version "0.8.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "android_logger" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0kj8i03fqqwxd803hrk27j2399v27ajjj9zxi2nnyml0s4nm9gcc"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-android-log-sys" ,rust-android-log-sys-0.1)
+ ("rust-env-logger" ,rust-env-logger-0.7)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4))))
+ (home-page "https://github.com/Nercury/android_logger-rs")
+ (synopsis "Logging implementation for @code{log}")
+ (description
+ "This library is a drop-in replacement for @code{env_logger}. Instead,
+it outputs messages to Android's logcat.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-ansi-parser-0.6
(package
(name "rust-ansi-parser")
@@ -700,10 +1389,10 @@ escape codes.")
(license (list license:asl2.0
license:expat))))
-(define-public rust-anyhow-1.0
+(define-public rust-anyhow-1
(package
(name "rust-anyhow")
- (version "1.0.34")
+ (version "1.0.37")
(source
(origin
(method url-fetch)
@@ -712,11 +1401,10 @@ escape codes.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1mwz0vg77yqz3w616bl890xihh7dsixwgn27nr9qd8ms9ddwp3dz"))))
+ "11kaqp25lchr2ckyc46zm6blzndnw0w2w8qv0sp8z4xcxqgw2rzf"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-development-inputs
+ `(#:cargo-development-inputs
(("rust-futures" ,rust-futures-0.3)
("rust-rustversion" ,rust-rustversion-1)
("rust-thiserror" ,rust-thiserror-1)
@@ -1133,6 +1821,36 @@ standard library.")
"File system fixtures and assertions for testing.")
(license (list license:expat license:asl2.0))))
+(define-public rust-assert-json-diff-1
+ (package
+ (name "rust-assert-json-diff")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "assert-json-diff" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1h2w4n8f8a1n9sc8snka0arzw5x95ky5k8i7603z3lhkcplwnna2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-extend" ,rust-extend-0.1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1))
+ #:cargo-development-inputs
+ (("rust-version-sync" ,rust-version-sync-0.8))))
+ (home-page "https://github.com/davidpdrsn/assert-json-diff")
+ (synopsis "Easily compare two JSON values and get great output")
+ (description
+ "This crate includes macros for comparing two serializable values
+by diffing their JSON representations. It is designed to give much
+more helpful error messages than the standard @code{assert_eq!}. It
+basically does a diff of the two objects and tells you the exact
+differences. This is useful when asserting that two large JSON
+objects are the same.")
+ (license license:expat)))
+
(define-public rust-assert-matches-1.3
(package
(name "rust-assert-matches")
@@ -1178,6 +1896,58 @@ standard library.")
(description "This package provides a libsyntax ast builder.")
(license (list license:expat license:asl2.0))))
+(define-public rust-async-attributes-1
+ (package
+ (name "rust-async-attributes")
+ (version "1.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-attributes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "08w41342hybxhln7j7hjsf7v04p3r9d6qdczfwp8d53xj5bd3lzg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-async-std" ,rust-async-std-0.99))))
+ (home-page "https://github.com/async-rs/async-attributes")
+ (synopsis "Experimental language-level polyfills for Async Rust")
+ (description
+ "This package provides experimental language-level polyfills for Async
+Rust.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-async-channel-1
+ (package
+ (name "rust-async-channel")
+ (version "1.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-channel" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1ffn42ig82az8ndgjb545imifarcavwxs9dff6psbdkdjj1hsx2r"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-concurrent-queue" ,rust-concurrent-queue-1)
+ ("rust-event-listener" ,rust-event-listener-2)
+ ("rust-futures-core" ,rust-futures-core-0.3))
+ #:cargo-development-inputs
+ (("rust-blocking" ,rust-blocking-0.6)
+ ("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-futures-lite" ,rust-futures-lite-1))))
+ (home-page "https://github.com/stjepang/async-channel")
+ (synopsis "Async multi-producer multi-consumer channel")
+ (description
+ "Async multi-producer multi-consumer channel")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-async-compression-0.3
(package
(name "rust-async-compression")
@@ -1221,6 +1991,503 @@ standard library.")
and Rust's modern asynchronous IO types.")
(license (list license:expat license:asl2.0))))
+(define-public rust-async-dup-1
+ (package
+ (name "rust-async-dup")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-dup" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0z3grxarv9wpck6jm31qayib9barf12a47gvii9934n0ilms29vl"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-simple-mutex" ,rust-simple-mutex-1))
+ #:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-smol" ,rust-smol-0.1))))
+ (home-page "https://github.com/stjepang/async-dup")
+ (synopsis "Duplicate an async I/O handle")
+ (description
+ "This crate provides two tools, Arc and Mutex. Arc implements
+AsyncRead, AsyncWrite, and AsyncSeek if a reference to the inner type
+does. A reference to Mutex implements AsyncRead, AsyncWrite, and
+AsyncSeek if the inner type does.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-executor-1
+ (package
+ (name "rust-async-executor")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-executor" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ilivvzc082ynr096xxghc8hdmlmacxilcpn738ylh5lqxq7k1zb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-task" ,rust-async-task-4)
+ ("rust-concurrent-queue" ,rust-concurrent-queue-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-vec-arena" ,rust-vec-arena-1))
+ #:cargo-development-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-async-io" ,rust-async-io-1)
+ ("rust-easy-parallel" ,rust-easy-parallel-3))))
+ (home-page "https://github.com/stjepang/async-executor")
+ (synopsis "Async executor")
+ (description "This library provides async executors.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-global-executor-1
+ (package
+ (name "rust-async-global-executor")
+ (version "1.4.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-global-executor" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "017s1lik153s587l6q9x5bf9i1n7gxqcg3zn2mdgvf16rm4rn1vk"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-executor" ,rust-async-executor-1)
+ ("rust-async-io" ,rust-async-io-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio" ,rust-tokio-0.3))
+ #:cargo-development-inputs
+ (("rust-doc-comment" ,rust-doc-comment-0.3))))
+ (home-page "https://github.com/async-rs/async-global-executor")
+ (synopsis "Global executor built on top of @code{async-executor} and
+@code{async-io}")
+ (description
+ "This package provides a global executor built on top of
+@code{async-executor} and @code{async-io}.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-io-1
+ (package
+ (name "rust-async-io")
+ (version "1.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-io" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1zg0bvb58615qar6ih3ddr1cyjh0fsrfdhpy90z1qxjnfpqgh5ck"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-concurrent-queue" ,rust-concurrent-queue-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nb-connect" ,rust-nb-connect-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking" ,rust-parking-2)
+ ("rust-polling" ,rust-polling-2)
+ ("rust-vec-arena" ,rust-vec-arena-1)
+ ("rust-waker-fn" ,rust-waker-fn-1)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-async-net" ,rust-async-net-1)
+ ("rust-inotify" ,rust-inotify-0.8)
+ ("rust-nix" ,rust-nix-0.18)
+ ("rust-signal-hook" ,rust-signal-hook-0.1)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-timerfd" ,rust-timerfd-1)
+ ("rust-uds-windows" ,rust-uds-windows-0.1))))
+ (home-page "https://github.com/stjepang/async-io")
+ (synopsis "Async I/O and timers")
+ (description
+ "This crate provides two tools: Async, an adapter for standard networking
+types (and many other types) to use in async programs, and Timer, a future
+that expires at a point in time.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-log-1
+ (package
+ (name "rust-async-log")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-log" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "16ymra7f8169br9ss9m9n4l6rjcav9ns6r9mv4nr4r9i9wq37fpm"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-log-attributes" ,rust-async-log-attributes-1)
+ ("rust-backtrace" ,rust-backtrace-0.3)
+ ("rust-log" ,rust-log-0.4))))
+ (home-page "https://github.com/async-rs/async-log")
+ (synopsis "Async tracing capabilities for the @code{log} crate")
+ (description
+ "This crate provides extension types and hooks to @code{log} to enable
+asynchronous logging.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-async-log-attributes-1
+ (package
+ (name "rust-async-log-attributes")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-log-attributes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0b9nysb5yxf772cinl5rsyhl2zazj2qfhbckv1kjz9qr3gkgi5ys"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-0.4)
+ ("rust-quote" ,rust-quote-0.6)
+ ("rust-syn" ,rust-syn-0.15))))
+ (home-page "https://github.com/rustasync/runtime")
+ (synopsis
+ "Proc Macro attributes for the async-log crate.")
+ (description
+ "This package provides proc macro attributes for the @code{async-log}
+crate.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-async-macros-1
+ (package
+ (name "rust-async-macros")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fib4wxiym9f045xqb8a2gyfa8yym3hb62g4jqjfmzn14jdxa8g4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false
+ #:cargo-inputs
+ (("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
+ ("rust-pin-utils" ,rust-pin-utils-0.1))
+ #:cargo-development-inputs
+ (("rust-futures-preview" ,rust-futures-preview-0.3))))
+ (home-page "https://github.com/async-rs/async-macros")
+ (synopsis "Macros for async-std")
+ (description "Macros for async-std.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-async-mutex-1
+ (package
+ (name "rust-async-mutex")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-mutex" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0vhmsscqx48dmxw0yir6az0pbwcq6qjvcv2f43vdpn95vd9bi7a7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: enable when rust-async-std-1 is packaged
+ #:cargo-inputs
+ (("rust-event-listener" ,rust-event-listener-2))
+ #:cargo-development-inputs
+ (;("rust-async-std" ,rust-async-std-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-futures-intrusive" ,rust-futures-intrusive-0.3)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-smol" ,rust-smol-0.1)
+ ("rust-tokio" ,rust-tokio-0.2))))
+ (home-page "https://github.com/stjepang/async-lock")
+ (synopsis "Async synchronisation primitives")
+ (description "This crate provides the following async synchronisation
+primitives:
+
+@itemize
+@item Barrier: enables tasks to synchronize all together at the same time.
+@item Mutex: a mutual exclusion lock.
+@item RwLock: a reader-writer lock, allowing any number of readers or a single writer.
+@item Semaphore: limits the number of concurrent operations.
+@end itemize")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-native-tls-0.3
+ (package
+ (name "rust-async-native-tls")
+ (version "0.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-native-tls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cwv4vbrvcbv58b51y1azfbszzgzhrzxx92q5nl6hk6kkf97m7ly"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: build when rust-async-std-1 is packaged
+ #:cargo-inputs
+ (;;("rust-async-std" ,rust-async-std-1)
+ ("rust-native-tls" ,rust-native-tls-0.2)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-url" ,rust-url-2))
+ #:cargo-development-inputs
+ (("rust-threadpool" ,rust-threadpool-1))))
+ (home-page "https://docs.rs/crate/async-native-tls/")
+ (synopsis "Native TLS using futures")
+ (description "Native TLS using futures")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-async-net-1
+ (package
+ (name "rust-async-net")
+ (version "1.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-net" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1rgvvqb1l86hawl1j0jfyzq35yracbbh29109131izmghmf4gph6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-io" ,rust-async-io-1)
+ ("rust-blocking" ,rust-blocking-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1))))
+ (home-page "https://github.com/stjepang/async-net")
+ (synopsis "Async networking primitives for TCP/UDP/Unix communication")
+ (description
+ "Async networking primitives for TCP/UDP/Unix communication")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-process-1
+ (package
+ (name "rust-async-process")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-process" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1nmvqwqxzy0gv7n8agknaijns9dsxqj81bxms4bs647vq44ym32c"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags '("--release" "--"
+ "--skip=set_current_dir_works"
+ "--skip=signal_reported_right"
+ "--skip=stdin_works")
+ #:cargo-inputs
+ (("rust-async-io" ,rust-async-io-1)
+ ("rust-blocking" ,rust-blocking-1)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-event-listener" ,rust-event-listener-2)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-signal-hook" ,rust-signal-hook-0.1)
+ ("rust-winapi" ,rust-winapi-0.3))))
+ (home-page "https://github.com/stjepang/async-process")
+ (synopsis "Async interface for working with processes")
+ (description
+ "This crate is an async version of @code{std::process}. A background
+thread named @code{async-process} is lazily created on first use, which waits
+for spawned child processes to exit and then calls the @code{wait()} syscall
+to clean up the ``zombie'' processes.
+
+This is unlike the process API in the standard library, where dropping
+a running Child leaks its resources.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-std-0.99
+ (package
+ (name "rust-async-std")
+ (version "0.99.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-std" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1k34181r1xzalyf7alka0ibnbqll6s5l435ycydm7fv1g6gill24"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags '("--release" "--" "--skip=io_timeout")
+ #:cargo-inputs
+ (("rust-async-attributes" ,rust-async-attributes-1)
+ ("rust-async-macros" ,rust-async-macros-1)
+ ("rust-async-task" ,rust-async-task-1)
+ ("rust-broadcaster" ,rust-broadcaster-0.2)
+ ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3)
+ ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-timer" ,rust-futures-timer-1)
+ ("rust-kv-log-macro" ,rust-kv-log-macro-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-mio" ,rust-mio-0.6)
+ ("rust-mio-uds" ,rust-mio-uds-0.6)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.1)
+ ("rust-pin-utils" ,rust-pin-utils-0.1)
+ ("rust-slab" ,rust-slab-0.4))
+ #:cargo-development-inputs
+ (("rust-femme" ,rust-femme-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-tempdir" ,rust-tempdir-0.3))))
+ (home-page "https://async.rs")
+ (synopsis "Async version of the Rust standard library")
+ (description
+ "This crate provides an async version of @code{std}. It provides all the
+interfaces you are used to, but in an async version and ready for Rust's
+@code{async/await} syntax.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-stream-0.3
+ (package
+ (name "rust-async-stream")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-stream" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0p19qn5igblb86d35lda72q8vimk2iw8hk7r07wjj5y0rdqdyw1n"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-stream-impl" ,rust-async-stream-impl-0.3)
+ ("rust-futures-core" ,rust-futures-core-0.3))
+ #:cargo-development-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-test" ,rust-tokio-test-0.2)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://github.com/tokio-rs/async-stream")
+ (synopsis "Asynchronous streams using async & await notation")
+ (description
+ "This package provides asynchronous streams using async & await
+notation.")
+ (license license:expat)))
+
+(define-public rust-async-stream-impl-0.3
+ (package
+ (name "rust-async-stream-impl")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-stream-impl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0w0aif9aw103b5wrm1svkqdh7aaihjywa21819d8m3lzzj78nm53"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags '("--release" "--"
+ "--skip=try_stream"
+ "--skip=stream")
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-tokio" ,rust-tokio-0.2))))
+ (home-page "https://github.com/tokio-rs/async-stream")
+ (synopsis "Proc macros for async-stream crate")
+ (description
+ "This package provides proc macros for @code{rust-async-stream}
+crate.")
+ (license license:expat)))
+
+(define-public rust-async-task-4
+ (package
+ (name "rust-async-task")
+ (version "4.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-task" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1w0a1c8jim6s5bvcyiiwg9m4bdv3xnd4hbjm97ndgmphmgg32679"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-atomic-waker" ,rust-atomic-waker-1)
+ ("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-flume" ,rust-flume-0.10))))
+ (home-page "https://github.com/stjepang/async-task")
+ (synopsis "Task abstraction for building executors")
+ (description
+ "This package provides a task abstraction for building executors.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-async-task-3
+ (package
+ (inherit rust-async-task-4)
+ (name "rust-async-task")
+ (version "3.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-task" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1lrm7cm9dpashmkbqa8mvglbf85gadviqil7qnnrm0pjdqap4xy1"))))
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-crossbeam" ,rust-crossbeam-0.7)
+ ("rust-futures" ,rust-futures-0.3))))))
+
+(define-public rust-async-task-1
+ (package
+ (inherit rust-async-task-4)
+ (name "rust-async-task")
+ (version "1.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "async-task" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0p88087z43zvv924my16a17qd65kdlv1r59h80h73rvrn0bc1hha"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-crossbeam" ,rust-crossbeam-0.7)
+ ("rust-futures" ,rust-futures-0.3))))))
+
(define-public rust-async-trait-0.1
(package
(name "rust-async-trait")
@@ -1269,6 +2536,27 @@ methods.")
(description "This package provides a safe abstraction around AtomicPtr.")
(license license:asl2.0)))
+(define-public rust-atomic-waker-1
+ (package
+ (name "rust-atomic-waker")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "atomic-waker" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ansiq5vlw684fhks2x4a4is2rqlbv50q5mi8x0fxxvx5q2p8lq6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3))))
+ (home-page "https://github.com/stjepang/atomic-waker")
+ (synopsis "Synchronization primitive for task wakeup")
+ (description
+ "This package provides a synchronization primitive for task wakeup.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-atty-0.2
(package
(name "rust-atty")
@@ -1294,7 +2582,7 @@ methods.")
"This package provides a simple interface for querying atty.")
(license license:expat)))
-(define-public rust-autocfg-1.0
+(define-public rust-autocfg-1
(package
(name "rust-autocfg")
(version "1.0.1")
@@ -1317,7 +2605,7 @@ methods.")
(define-public rust-autocfg-0.1
(package
- (inherit rust-autocfg-1.0)
+ (inherit rust-autocfg-1)
(name "rust-autocfg")
(version "0.1.7")
(source
@@ -1422,6 +2710,51 @@ in Rust.")
("rust-serde-json" ,rust-serde-json-1)
("rust-streaming-stats" ,rust-streaming-stats-0.2))))))
+(define-public rust-awc-1
+ (package
+ (name "rust-awc")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "awc" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1idacmq7n3irmdjkbxc5kdwspxk9w1gip94pcmfk7wky3m6isq6p"))))
+ (build-system cargo-build-system)
+ ;; XXX: The crate fails to't build with with the same error as
+ ;; rust-actix-connect. Skip build for now.
+ (arguments
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-codec" ,rust-actix-codec-0.2)
+ ("rust-actix-http" ,rust-actix-http-1)
+ ("rust-actix-rt" ,rust-actix-rt-1)
+ ("rust-actix-service" ,rust-actix-service-1)
+ ("rust-base64" ,rust-base64-0.11)
+ ("rust-bytes" ,rust-bytes-0.5)
+ ("rust-derive-more" ,rust-derive-more-0.99)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-mime" ,rust-mime-0.3)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.6))
+ #:cargo-development-inputs
+ (("rust-actix-http-test" ,rust-actix-http-test-1)
+ ("rust-actix-web" ,rust-actix-web-2)
+ ("rust-brotli" ,rust-brotli-3))))
+ (home-page "https://actix.rs")
+ (synopsis "Async HTTP and WebSocket client library")
+ (description
+ "This package provides async HTTP and WebSocket client library
+built on the Actix ecosystem.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-az-1
(package
(name "rust-az")
@@ -2388,6 +3721,39 @@ behave like a set of bitflags.")
"Library for reading/writing un-aligned values from/to streams in big-endian and little-endian formats.")
(license (list license:expat license:asl2.0))))
+(define-public rust-bitvec-0.19
+ (package
+ (name "rust-bitvec")
+ (version "0.19.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bitvec" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "10bz751jbsy8fj203ibjwil07p2fwfzvx7b326wfssaravlkbfm7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-funty" ,rust-funty-1)
+ ("rust-radium" ,rust-radium-0.5)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-tap" ,rust-tap-1)
+ ("rust-wyz" ,rust-wyz-0.2))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-test" ,rust-serde-test-1)
+ ("rust-static-assertions" ,rust-static-assertions-1))))
+ (home-page "https://myrrlyn.net/crates/bitvec")
+ (synopsis "Manipulate memory, bit by bit")
+ (description
+ "This package provides a crate for manipulating memory, bit by bit.")
+ (license license:expat)))
+
(define-public rust-blake2-0.8
(package
(name "rust-blake2")
@@ -2715,6 +4081,75 @@ algorithms. This package is deprecated. Please use block-cipher instead")
`(#:cargo-inputs
(("rust-byte-tools" ,rust-byte-tools-0.3))))))
+(define-public rust-blocking-1
+ (package
+ (name "rust-blocking")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blocking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1s9myg9gqmwzrbc38p23bh4vkc8w4pbpddqrcrrl1xz1xpdp1qf5"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-async-task" ,rust-async-task-4)
+ ("rust-atomic-waker" ,rust-atomic-waker-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-once-cell" ,rust-once-cell-1))))
+ (home-page "https://github.com/stjepang/blocking")
+ (synopsis "Thread pool for isolating blocking I/O in async programs")
+ (description
+ "This package provides a thread pool for isolating blocking I/O in async
+programs.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-blocking-0.6
+ (package
+ (inherit rust-blocking-1)
+ (name "rust-blocking")
+ (version "0.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blocking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "13g1xlsd1ardf9wxkj1d03baxfy8f8kvgjz55l6zi1q4jn5f0c1z"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-atomic-waker" ,rust-atomic-waker-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-waker-fn" ,rust-waker-fn-1))))))
+
+(define-public rust-blocking-0.4
+ (package
+ (inherit rust-blocking-0.6)
+ (name "rust-blocking")
+ (version "0.4.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "blocking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0av1h5p6lb5bpzghmzsksx31icvdwrpxxzkq6r56n1l5pzvqyinj"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-channel" ,rust-async-channel-1)
+ ("rust-atomic-waker" ,rust-atomic-waker-1)
+ ("rust-futures-lite" ,rust-futures-lite-0.1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking" ,rust-parking-1)
+ ("rust-waker-fn" ,rust-waker-fn-1))))))
+
(define-public rust-bresenham-0.1
(package
(name "rust-bresenham")
@@ -2737,6 +4172,35 @@ algorithms. This package is deprecated. Please use block-cipher instead")
Bresenham's line algorithm.")
(license license:expat)))
+(define-public rust-broadcaster-0.2
+ (package
+ (name "rust-broadcaster")
+ (version "0.2.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "broadcaster" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1848lwapy955rs8kbiv87adj68vdlh6vlj8n4wq10vx541j49887"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3)
+ ("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
+ ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3)
+ ("rust-futures-util-preview" ,rust-futures-util-preview-0.3)
+ ("rust-parking-lot" ,rust-parking-lot-0.9)
+ ("rust-slab" ,rust-slab-0.4))
+ #:cargo-development-inputs
+ (("rust-futures-executor-preview" ,rust-futures-executor-preview-0.3))))
+ (home-page "https://github.com/leo60228/broadcaster")
+ (synopsis "Broadcasting futures mpmc channel")
+ (description
+ "This package provides a wrapper for any Stream and Sink implementing the
+@code{mpsc} pattern to enable broadcasting items.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-brotli-3
(package
(name "rust-brotli")
@@ -2789,6 +4253,52 @@ dependency on the rust stdlib. This makes it suitable for embedded devices
and kernels.")
(license (list license:bsd-3 license:expat))))
+(define-public rust-brotli-sys-0.3
+ (package
+ (name "rust-brotli-sys")
+ (version "0.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "brotli-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1kdfdbcba6zwa13xpjwgiplblkdf6vigxjbwwp6l2ascbylxwia4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/alexcrichton/brotli2-rs")
+ (synopsis "Raw bindings to libbrotli")
+ (description "This package provides raw bindings to libbrotli.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-brotli2-0.3
+ (package
+ (name "rust-brotli2")
+ (version "0.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "brotli2" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "13jnhpmfkqy2xar4lxrsk3rx3i12bgnarnsxq4arhc6yxb1kdc0c"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-brotli-sys" ,rust-brotli-sys-0.3)
+ ("rust-libc" ,rust-libc-0.2))
+ #:cargo-development-inputs
+ (("rust-quickcheck" ,rust-quickcheck-0.4))))
+ (home-page "https://github.com/alexcrichton/brotli2-rs")
+ (synopsis "Rust bindings to compression library libbrotli")
+ (description
+ "This package provides bindings to libbrotli to provide brotli
+decompression and compression to Rust.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-bs58-0.2
(package
(name "rust-bs58")
@@ -2844,7 +4354,7 @@ alphabet.")
#:cargo-development-inputs
(("rust-quickcheck" ,rust-quickcheck-0.8)
("rust-ucd-parse" ,rust-ucd-parse-0.1)
- ("rust-unicode-segmentation" ,rust-unicode-segmentation-1.3))))
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
(home-page "https://github.com/BurntSushi/bstr")
(synopsis
"String type that is not required to be valid UTF-8")
@@ -2961,6 +4471,29 @@ constants from build.rs or a script.")
(("rust-criterion" ,rust-criterion-0.2)
("rust-quickcheck" ,rust-quickcheck-0.8))))))
+(define-public rust-byte-pool-0.2
+ (package
+ (name "rust-byte-pool")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "byte-pool" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0yh96ral0pni02bzm3fhvicp1ixz1hz3c5m03hsyq66mk61fjf0y"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2)
+ ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+ (home-page "https://crates.io/crates/byte-pool")
+ (synopsis "Pool of byte slices, for efficient memory usage")
+ (description
+ "This package provides a pool of byte slices, for efficient
+memory usage.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-byte-tools-0.3
(package
(name "rust-byte-tools")
@@ -3174,29 +4707,48 @@ little-endian.")
(("rust-quickcheck" ,rust-quickcheck-0.2)
("rust-rand" ,rust-rand-0.3))))))
-(define-public rust-bytes-0.6
+(define-public rust-bytes-1
(package
(name "rust-bytes")
- (version "0.6.0")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytes" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "05ivrcbgl4f7z2zzm9hbsi8cy66spi70xlm6fp16zsq4ylsvrp70"))))
+ (base32 "0wpsy2jwmbrsn7x6vcd00hw9vvz071lv8nrb25wrspvmkna8w7xd"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-loom" ,rust-loom-0.3)
+ (("rust-loom" ,rust-loom-0.4)
("rust-serde-test" ,rust-serde-test-1))))
(home-page "https://github.com/tokio-rs/bytes")
(synopsis "Types and traits for working with bytes")
(description "This package is a utility library for working with bytes.")
(license license:expat)))
+(define-public rust-bytes-0.6
+ (package
+ (inherit rust-bytes-1)
+ (name "rust-bytes")
+ (version "0.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bytes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "05ivrcbgl4f7z2zzm9hbsi8cy66spi70xlm6fp16zsq4ylsvrp70"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-loom" ,rust-loom-0.3)
+ ("rust-serde-test" ,rust-serde-test-1))))))
+
(define-public rust-bytes-0.5
(package
(inherit rust-bytes-0.6)
@@ -3258,6 +4810,30 @@ little-endian.")
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.3))))))
+(define-public rust-bytestring-0.1
+ (package
+ (name "rust-bytestring")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bytestring" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qzkncgky5p5vsdb9msmfg6d92dcs9idcjcr5nk7inkja7x0az7w"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bytes" ,rust-bytes-0.5)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-serde-json" ,rust-serde-json-1))))
+ (home-page "https://actix.rs")
+ (synopsis "UTF-8 encoded string with Bytes as a storage")
+ (description
+ "This package provides a UTF-8 encoded string with Bytes as a storage.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-bzip2-0.4
(package
(name "rust-bzip2")
@@ -3385,6 +4961,29 @@ exposed as Reader/Writer streams.")
"The ChaCha family of stream ciphers.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-cache-padded-1
+ (package
+ (name "rust-cache-padded")
+ (version "1.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cache-padded" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fkdwv9vjazm6fs3s5v56mm4carwswdmw8fcwm9ygrcvihcya6k3"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/stjepang/cache-padded")
+ (synopsis "Prevent once piece of data invalidating other cached data")
+ (description
+ "In concurrent programming, sometimes it is desirable to make sure
+commonly accessed shared data is not all placed into the same cache line.
+Updating an atomic value invalides the whole cache line it belongs to, which
+makes the next access to the same cache line slower for other CPU cores. Use
+CachePadded to ensure updating one piece of data doesn't invalidate other
+cached data.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-cachedir-0.1
(package
(name "rust-cachedir")
@@ -4306,6 +5905,39 @@ CMAKE environmental variable is set.")
(base32
"0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp"))))))
+(define-public rust-codespan-reporting-0.9
+ (package
+ (name "rust-codespan-reporting")
+ (version "0.9.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "codespan-reporting" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "07g86hv1lp5bbr6w6hsa3mgdmavs36igc7k5pi1fvc86ad2n41vf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-serde" ,rust-serde-1)
+ ("rust-termcolor" ,rust-termcolor-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
+ #:cargo-development-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-insta" ,rust-insta-0.16)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-peg" ,rust-peg-0.6)
+ ("rust-rustyline" ,rust-rustyline-6)
+ ("rust-structopt" ,rust-structopt-0.3)
+ ("rust-unindent" ,rust-unindent-0.1))))
+ (home-page "https://github.com/brendanzab/codespan")
+ (synopsis "Diagnostic reporting for text-based programming languages")
+ (description "This package provides diagnostic reporting for text-based
+programming languages.")
+ (license license:asl2.0)))
+
(define-public rust-color-quant-1.0
(package
(name "rust-color-quant")
@@ -4541,6 +6173,31 @@ harness.")
("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
("rust-tempdir" ,rust-tempdir-0.3))))))
+(define-public rust-concurrent-queue-1
+ (package
+ (name "rust-concurrent-queue")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "concurrent-queue" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18w6hblcjjk9d0my3657ra1zdj79gwfjmzvc0b3985g01dahgv9h"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cache-padded" ,rust-cache-padded-1))
+ #:cargo-development-inputs
+ (("rust-easy-parallel" ,rust-easy-parallel-3)
+ ("rust-fastrand" ,rust-fastrand-1))))
+ (home-page "https://github.com/stjepang/concurrent-queue")
+ (synopsis "Concurrent multi-producer multi-consumer queue")
+ (description
+ "This package provides a concurrent multi-producer multi-consumer
+queue.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-console-0.13
(package
(name "rust-console")
@@ -4907,6 +6564,25 @@ the path and domain matching rules specified in RFC6265.
Split from the user_agent crate.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-copyless-0.1
+ (package
+ (name "rust-copyless")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "copyless" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0dmmxsq3m0i6g9s2kj96n777qhmm7vjgv4r7agc2v6w6bl7rdpx2"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/kvark/copyless")
+ (synopsis "Ways to eliminate @code{memcpy} calls")
+ (description
+ "This package provides ways to eliminate @code{memcpy} calls when using
+the standard library.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-cordic-0.1
(package
(name "rust-cordic")
@@ -5108,6 +6784,26 @@ intrinsics.")
("rust-libc" ,rust-libc-0.2)
("rust-uuid" ,rust-uuid-0.5))))))
+(define-public rust-core-foundation-0.2
+ (package
+ (inherit rust-core-foundation-0.6)
+ (name "rust-core-foundation")
+ (version "0.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "core-foundation" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0rvcn7ab5r69wvn7gby745jlpy8pirfywcdxbiypy083s93dggr5"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+ ("rust-libc" ,rust-libc-0.2))))))
+
(define-public rust-core-foundation-sys-0.8
(package
(name "rust-core-foundation-sys")
@@ -5152,6 +6848,24 @@ intrinsics.")
(base32
"0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7"))))))
+(define-public rust-core-foundation-sys-0.2
+ (package
+ (inherit rust-core-foundation-sys-0.6)
+ (name "rust-core-foundation-sys")
+ (version "0.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "core-foundation-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "13f7f3kblyj6yxcxm74yg84vj9ahaprlc1vgblagmj6bzmzmsnh6"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2))))))
+
(define-public rust-core-text-13
(package
(name "rust-core-text")
@@ -5333,7 +7047,7 @@ to @code{is_x86_feature_detected}.")
("rust-cast" ,rust-cast-0.2)
("rust-clap" ,rust-clap-2)
("rust-criterion-plot" ,rust-criterion-plot-0.4)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-itertools" ,rust-itertools-0.9)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-num-traits" ,rust-num-traits-0.2)
@@ -5378,7 +7092,7 @@ to @code{is_x86_feature_detected}.")
("rust-cast" ,rust-cast-0.2)
("rust-clap" ,rust-clap-2)
("rust-criterion-plot" ,rust-criterion-plot-0.3)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-itertools" ,rust-itertools-0.8)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
@@ -5619,7 +7333,7 @@ criterion.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
("rust-lazy-static" ,rust-lazy-static-1)
@@ -5708,8 +7422,35 @@ criterion.")
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.6))))))
+(define-public rust-crossbeam-utils-0.8
+ (package
+ (name "rust-crossbeam-utils")
+ (version "0.8.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "crossbeam-utils" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "13fvrqlap7bgvlnpqr5gjcxdhx1jv99pkfg5xdlq5xcy30g6vn82"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-lazy-static" ,rust-lazy-static-1))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.7))))
+ (home-page
+ "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
+ (synopsis "Utilities for concurrent programming")
+ (description
+ "This crate provides miscellaneous tools for concurrent programming.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-crossbeam-utils-0.7
(package
+ (inherit rust-crossbeam-utils-0.8)
(name "rust-crossbeam-utils")
(version "0.7.2")
(source
@@ -5721,20 +7462,13 @@ criterion.")
(sha256
(base32
"1a31wbrda1320gj2a6az1lin2d34xfc3xf88da4c17qy5lxcgiy3"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-lazy-static" ,rust-lazy-static-1))
#:cargo-development-inputs
- (("rust-rand" ,rust-rand-0.6))))
- (home-page
- "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
- (synopsis "Utilities for concurrent programming")
- (description
- "Utilities for concurrent programming.")
- (license (list license:expat license:asl2.0))))
+ (("rust-rand" ,rust-rand-0.6))))))
(define-public rust-crossbeam-utils-0.6
(package
@@ -6043,10 +7777,10 @@ reallocations.")
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))))
-(define-public rust-csv-1.1
+(define-public rust-csv-1
(package
(name "rust-csv")
- (version "1.1.3")
+ (version "1.1.5")
(source
(origin
(method url-fetch)
@@ -6055,11 +7789,10 @@ reallocations.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0yd2z55m2pg4al4yng4nl2y7c9dw2v7yhg5ynihxyrmmd9zzxbq0"))))
+ "15wydz6klf1shh1ac5n6rsihc4xrz1lzi8vjmhava94v54rqdmgr"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-bstr" ,rust-bstr-0.2)
("rust-csv-core" ,rust-csv-core-0.1)
("rust-itoa" ,rust-itoa-0.4)
@@ -6075,7 +7808,7 @@ reallocations.")
(define-public rust-csv-0.14
(package
- (inherit rust-csv-1.1)
+ (inherit rust-csv-1)
(name "rust-csv")
(version "0.14.7")
(source
@@ -6244,10 +7977,50 @@ Transparency logs for use with sct crate.")
use with bindgen.")
(license (list license:expat license:asl2.0))))
+(define-public rust-curl-0.4
+ (package
+ (name "rust-curl")
+ (version "0.4.34")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "curl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0vkm6fyizf8m9yxpv3n5pm9ag3bwlyqa6nz2ga8qkzm5y4m1cs72"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;require internet access
+ #:cargo-inputs
+ (("rust-curl-sys" ,rust-curl-sys-0.4)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-openssl-probe" ,rust-openssl-probe-0.1)
+ ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+ ("rust-schannel" ,rust-schannel-0.1)
+ ("rust-socket2" ,rust-socket2-0.3)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-mio" ,rust-mio-0.6)
+ ("rust-mio-extras" ,rust-mio-extras-2))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("nghttp2" ,nghttp2)
+ ("openssl" ,openssl)
+ ("zlib" ,zlib)))
+ (home-page "https://github.com/alexcrichton/curl-rust")
+ (synopsis "Rust bindings to libcurl for making HTTP requests")
+ (description
+ "This package provides Rust bindings to libcurl for making HTTP
+requests")
+ (license license:expat)))
+
(define-public rust-curl-sys-0.4
(package
(name "rust-curl-sys")
- (version "0.4.20")
+ (version "0.4.39+curl-7.74.0")
(source
(origin
(method url-fetch)
@@ -6255,7 +8028,7 @@ use with bindgen.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "02542zmvl3fpdqf7ai4cqnamm4albx9j645dkjx5qr1myq8ax42y"))
+ "0x7qhq7c3b1vmp3740yiigzm09qvkzpdf578jjrs0s3v3s3cxa07"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "curl") #t))))
@@ -6265,11 +8038,14 @@ use with bindgen.")
(("rust-libc" ,rust-libc-0.2)
("rust-libnghttp2-sys" ,rust-libnghttp2-sys-0.1)
("rust-libz-sys" ,rust-libz-sys-1)
+ ("rust-mesalink" ,rust-mesalink-1)
("rust-openssl-sys" ,rust-openssl-sys-0.9)
("rust-winapi" ,rust-winapi-0.3)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
- ("rust-vcpkg" ,rust-vcpkg-0.2))))
+ ("rust-vcpkg" ,rust-vcpkg-0.2))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -6337,6 +8113,166 @@ ristretto255 and Curve25519")
attributes.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-cxx-0.5
+ (package
+ (name "rust-cxx")
+ (version "0.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxx" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1alj19zf8jm5j8c8hynqb36f0vyjqs8yhwmxpcapfmb5lav4ipgb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Cannot compile cxx-test-suite.
+ #:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-cxxbridge-flags" ,rust-cxxbridge-flags-0.5)
+ ("rust-cxxbridge-macro" ,rust-cxxbridge-macro-0.5)
+ ("rust-link-cplusplus" ,rust-link-cplusplus-1))
+ #:cargo-development-inputs
+ (("rust-cxx-build" ,rust-cxx-build-0.5)
+ ("rust-cxx-gen" ,rust-cxx-gen-0.6)
+ ("rust-cxx-test-suite" ,rust-cxx-test-suite-0.0.0)
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://cxx.rs")
+ (synopsis "Safe interop between Rust and C++")
+ (description "This package provides a safe interop between Rust and C++.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cxx-build-0.5
+ (package
+ (name "rust-cxx-build")
+ (version "0.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxx-build" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "01109arjlj8wdq2rcyy3s76a5aidkn7zvhhhvhvkg1cxgqza9p22"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-codespan-reporting" ,rust-codespan-reporting-0.9)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-scratch" ,rust-scratch-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-cxx-gen" ,rust-cxx-gen-0.6)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))))
+ (home-page "https://cxx.rs")
+ (synopsis "C++ code generator")
+ (description
+ "This package provides a C++ code generator for integrating the @code{cxx}
+crate into a Cargo build.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cxx-gen-0.6
+ (package
+ (name "rust-cxx-gen")
+ (version "0.6.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxx-gen" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0avkca16wjy0paplq1ycaf04bj62agfj0awyhyzxyfpdn9rm45j2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cc" ,rust-cc-1)
+ ("rust-codespan-reporting" ,rust-codespan-reporting-0.9)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://cxx.rs")
+ (synopsis "C++ code generator")
+ (description
+ "This package provides a C++ code generator for integrating the @code{cxx}
+crate into higher level tools.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cxx-test-suite-0.0.0
+ (package
+ (name "rust-cxx-test-suite")
+ (version "0.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxx-test-suite" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1pkf4ay1210g9wqyqhkgvlcsv4i6kgdcmgnh19mrymylznv7pcal"))))
+ (build-system cargo-build-system)
+ (arguments '(#:skip-build? #t)) ; Not meant to be built independantly.
+ (home-page "https://github.com/dtolnay/cxx")
+ (synopsis "Test suite of the cxx crate")
+ (description "This package provides the test suite of the cxx crate.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cxxbridge-flags-0.5
+ (package
+ (name "rust-cxxbridge-flags")
+ (version "0.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxxbridge-flags" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0jfwsm85s5kalgqbqlg1kq79zcb5zwk375h0qw7ycz5i6v3c8j0k"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/dtolnay/cxx")
+ (synopsis "Compiler configuration of the `cxx` crate")
+ (description "This package provides a compiler configuration of the `cxx`
+crate (implementation detail).")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cxxbridge-macro-0.5
+ (package
+ (name "rust-cxxbridge-macro")
+ (version "0.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cxxbridge-macro" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "05mhvchmcb8dpgcqkl5vyxycywp2x42vw1qh2hyxxyi576nmmxsr"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-cxx" ,rust-cxx-0.5))))
+ (home-page "https://cxx.rs")
+ (synopsis "Implementation detail of the `cxx` crate")
+ (description
+ "This package provides an implementation detail of the @code{cxx} crate.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-darling-0.10
(package
(name "rust-darling")
@@ -7888,6 +9824,26 @@ floating-point primitives to an @code{io::Write}.")
"This package provides lightweight binding to DirectWrite.")
(license license:mpl2.0)))
+(define-public rust-easy-parallel-3
+ (package
+ (name "rust-easy-parallel")
+ (version "3.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "easy-parallel" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1x28z540fc4g8fqm1sbpqbpdfbi40mkas4xr57s3yn0jjbbszm0x"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/stjepang/easy-parallel")
+ (synopsis "Run closures in parallel")
+ (description
+ "This crate provides a simple primitive for spawning threads in bulk and
+waiting for them to complete. Threads are allowed to borrow local variables
+from the main thread.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-ed25519-1
(package
(name "rust-ed25519")
@@ -8001,7 +9957,7 @@ signing, and verification in pure Rust.")
(define-public rust-embed-resource-1.3
(package
(name "rust-embed-resource")
- (version "1.3.1")
+ (version "1.3.3")
(source
(origin
(method url-fetch)
@@ -8009,8 +9965,7 @@ signing, and verification in pure Rust.")
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "0v1adsw9mq7gjjjhx4hcjhqppdf4vm0gbcgh7sxirbxh99la9axv"))))
+ (base32 "0pbif8kl6xcvfnp8gibqsw0w14l28vfkff9k6byw506s0d20nsqz"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -8368,8 +10323,58 @@ accessor functions on enums.")
("rust-quote" ,rust-quote-0.6)
("rust-syn" ,rust-syn-0.15))))))
+(define-public rust-enum-to-u8-slice-derive-0.1
+ (package
+ (name "rust-enum-to-u8-slice-derive")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "enum_to_u8_slice_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0hvzi74pnh5a7f4klrk0dz45l0mgcy5l3zajjhjsxzws28js4yc4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-quote" ,rust-quote-0.3)
+ ("rust-syn" ,rust-syn-0.11))))
+ (home-page "https://github.com/mesalock-linux/enum_to_u8_slice_derive")
+ (synopsis "Convert enum to u8 slice ref")
+ (description
+ "This package provides a simple fork of @code{enum_to_str_derive},
+convert enum to u8 slice ref.")
+ (license license:bsd-3)))
+
+(define-public rust-env-logger-0.8
+ (package
+ (name "rust-env-logger")
+ (version "0.8.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "env-logger" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "07k6m6igz02g2b1v7nims7vd8azwxrav43xl14a6rjmxnikcnvpj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-atty" ,rust-atty-0.2)
+ ("rust-humantime" ,rust-humantime-2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-termcolor" ,rust-termcolor-1))))
+ (home-page "https://github.com/sebasmagri/env_logger/")
+ (synopsis "Logging implementation for @code{log}")
+ (description
+ "This package provides a logging implementation for @code{log} which
+is configured via an environment variable.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-env-logger-0.7
(package
+ (inherit rust-env-logger-0.8)
(name "rust-env-logger")
(version "0.7.1")
(source
@@ -8381,7 +10386,6 @@ accessor functions on enums.")
(sha256
(base32
"0djx8h8xfib43g5w94r1m1mkky5spcw4wblzgnhiyg5vnfxknls4"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -8389,13 +10393,7 @@ accessor functions on enums.")
("rust-humantime" ,rust-humantime-1)
("rust-log" ,rust-log-0.4)
("rust-regex" ,rust-regex-1)
- ("rust-termcolor" ,rust-termcolor-1))))
- (home-page "https://github.com/sebasmagri/env_logger/")
- (synopsis "Logging implementation for @code{log}")
- (description
- "This package provides a logging implementation for @code{log} which
-is configured via an environment variable.")
- (license (list license:expat license:asl2.0))))
+ ("rust-termcolor" ,rust-termcolor-1))))))
(define-public rust-env-logger-0.6
(package
@@ -8744,6 +10742,30 @@ variables.")
(("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1))))))
+(define-public rust-event-listener-2
+ (package
+ (name "rust-event-listener")
+ (version "2.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "event-listener" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ndyp41pb2cx7gxijqh4ymnc47nyrvhvir7rvjlw6x09ayb10lzp"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-waker-fn" ,rust-waker-fn-1))))
+ (home-page "https://github.com/stjepang/event-listener")
+ (synopsis "Notify async tasks or threads")
+ (description
+ "This is a synchronization primitive similar to @code{eventcounts}.
+You can use this crate to turn non-blocking data structures into async or
+blocking data structures.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-exitfailure-0.5
(package
(name "rust-exitfailure")
@@ -8824,6 +10846,34 @@ variables.")
testing.")
(license (list license:expat license:asl2.0))))
+(define-public rust-extend-0.1
+ (package
+ (name "rust-extend")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "extend" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "01azyniinxrwng13hkj450gplp1ajslbqzksjg4dk6655sks6zgl"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags '("--release" "--" "--skip=test::test_ui" )
+ #:cargo-inputs
+ (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-trybuild" ,rust-trybuild-1))))
+ (home-page "https://github.com/davidpdrsn/extend")
+ (synopsis "Create extensions for types you don't own")
+ (description
+ "This crates creates extensions for types you don't own with extension
+traits but without the boilerplate.")
+ (license license:expat)))
+
(define-public rust-fake-simd-0.1
(package
(name "rust-fake-simd")
@@ -8979,6 +11029,86 @@ implement features such as look-around and backtracking, which are not
supported in purely NFA-based implementations.")
(license license:expat)))
+(define-public rust-fastrand-1
+ (package
+ (name "rust-fastrand")
+ (version "1.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fastrand" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1qvz1i7g5mb2hcsaawrvxx88b8vwrsr85qr98ffmrkj5fh2sypya"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-instant" ,rust-instant-0.1))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.7))))
+ (home-page "https://github.com/stjepang/fastrand")
+ (synopsis "Simple and fast random number generator")
+ (description
+ "This package provides a simple and fast random number generator.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-femme-2
+ (package
+ (name "rust-femme")
+ (version "2.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "femme" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0d7h1lzbcrqcn8v5l6m7i15lkbbaaz394l6vavbr8nhs757s5w9a"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-js-sys" ,rust-js-sys-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-web-sys" ,rust-web-sys-0.3))
+ #:cargo-development-inputs
+ (("rust-kv-log-macro" ,rust-kv-log-macro-1))))
+ (home-page "https://github.com/lrlna/femme")
+ (synopsis "Pretty-printer and @code{ndjson} logger for @code{log} crate")
+ (description
+ "This package provides a pretty-printer and @code{ndjson} logger for
+@code{log} crate.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-femme-1
+ (package
+ (inherit rust-femme-2)
+ (name "rust-femme")
+ (version "1.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "femme" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0spf66m22dvnz6x077znybk906lh4p5z30nh8c37mad2c3dc56jd"))))
+ (arguments
+ `(#:tests? #false
+ #:cargo-inputs
+ (("rust-async-log" ,rust-async-log-1)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-console" ,rust-console-0.7)
+ ("rust-js-sys" ,rust-js-sys-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-web-sys" ,rust-web-sys-0.3))))))
+
(define-public rust-fern-0.6
(package
(name "rust-fern")
@@ -9414,6 +11544,59 @@ streams.")
crate.")
(license license:asl2.0)))
+(define-public rust-flume-0.10
+ (package
+ (name "rust-flume")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "flume" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "14dvj6d2r6vgsy3adv4lncbddjwc59rgl0rcwc1kdnsmqkh7lwhy"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: remove when rust-async-std-1 is packaged
+ #:cargo-inputs
+ (("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-nanorand" ,rust-nanorand-0.5)
+ ("rust-spinning-top" ,rust-spinning-top-0.2))
+ #:cargo-development-inputs
+ (;("rust-async-std" ,rust-async-std-1)
+ ("rust-criterion" ,rust-criterion-0.3)
+ ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-waker-fn" ,rust-waker-fn-1))))
+ (home-page "https://github.com/zesterer/flume")
+ (synopsis "Fast multi-producer channel")
+ (description
+ "This package provides a fast multi-producer channel.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-flume-0.9
+ (package
+ (inherit rust-flume-0.10)
+ (name "rust-flume")
+ (version "0.9.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "flume" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ck1w9881848xjjk93nxqsvnxfp4xsaysxxn23a210bg2amsvsqv"))))
+ (arguments
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-nanorand" ,rust-nanorand-0.4)
+ ("rust-spinning-top" ,rust-spinning-top-0.2))))))
+
(define-public rust-fnv-1
(package
(name "rust-fnv")
@@ -9947,6 +12130,31 @@ pseudorandom number generator")
(description "Low-level Rust bindings for the Zircon kernel.")
(license license:bsd-3)))
+(define-public rust-funty-1
+ (package
+ (name "rust-funty")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "funty" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "19wx3p3jmv863y0mjb56sr4qf1kvqhl3fsyslkd92zli0p8lrlzy"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-static-assertions" ,rust-static-assertions-1))))
+ (home-page "https://github.com/myrrlyn/funty")
+ (synopsis "Trait generalization over the primitive types")
+ (description
+ "Prior to 1.0, Rust had traits for the numeric primitive types to permit
+code to generalize over which specific type it accepted. This was never
+stabilized, and eventually removed. This library reïnstates these traits.")
+ (license license:expat)))
+
(define-public rust-futf-0.1
(package
(name "rust-futf")
@@ -10202,6 +12410,32 @@ the computation on the threads themselves.")
library.")
(license (list license:expat license:asl2.0))))
+(define-public rust-futures-intrusive-0.3
+ (package
+ (name "rust-futures-intrusive")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "futures-intrusive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "00qpir3q6j7blwpnpffj7ypf1z8wc87ldn62qr7sapymgg82j5dw"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: need rust-async-std-1
+ #:cargo-inputs
+ (("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-lock-api" ,rust-lock-api-0.3)
+ ("rust-parking-lot" ,rust-parking-lot-0.10))))
+ (home-page "https://github.com/Matthias247/futures-intrusive")
+ (synopsis "Futures based on intrusive data structures")
+ (description
+ "This crate provides a variety of Futures-based and
+@code{async/await} compatible types that are based on the idea of
+intrusive collections.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-futures-io-0.3
(package
(name "rust-futures-io")
@@ -10269,6 +12503,59 @@ for the futures-rs library.")
@code{try_join!} macro.")
(license (list license:expat license:asl2.0))))
+(define-public rust-futures-lite-1
+ (package
+ (name "rust-futures-lite")
+ (version "1.11.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "futures-lite" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1ywmyvpy4f348jri8rxhpj59a7bvy12pspm59x5207fys061sj5l"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-parking" ,rust-parking-2)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+ ("rust-waker-fn" ,rust-waker-fn-1))
+ #:cargo-development-inputs
+ (("rust-spin-on" ,rust-spin-on-0.1))))
+ (home-page "https://github.com/stjepang/futures-lite")
+ (synopsis "Futures, streams, and async I/O combinators")
+ (description
+ "This crate is a subset of @code{futures} that compiles an order of
+magnitude faster, fixes minor warts in its API, fills in some obvious gaps,
+and removes almost all unsafe code from it.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-futures-lite-0.1
+ (package
+ (inherit rust-futures-lite-1)
+ (name "rust-futures-lite")
+ (version "0.1.11")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "futures-lite" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1lnflz8ysp0vlq1sxzz1sw9cq7s33lh12cm9rc68z04v29q9k6cp"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-parking" ,rust-parking-2)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.1)
+ ("rust-waker-fn" ,rust-waker-fn-1))))))
+
(define-public rust-futures-macro-0.3
(package
(name "rust-futures-macro")
@@ -10298,7 +12585,7 @@ for the futures-rs library.")
(define-public rust-futures-preview-0.3
(package
(name "rust-futures-preview")
- (version "0.3.0-alpha.17")
+ (version "0.3.0-alpha.19")
(source
(origin
(method url-fetch)
@@ -10307,7 +12594,7 @@ for the futures-rs library.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0rsq8d1ciyg37i5ysd9dynwmklwy4sx466z9a72687wsi8fgj9dz"))))
+ "0vnp63aicm9vgapn4hm45ag9lrsf9f3bma3mzz3abbb708mcw79v"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f
@@ -10317,12 +12604,15 @@ for the futures-rs library.")
("rust-futures-executor-preview" ,rust-futures-executor-preview-0.3)
("rust-futures-io-preview" ,rust-futures-io-preview-0.3)
("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3)
- ("rust-futures-util-preview" ,rust-futures-util-preview-0.3))))
+ ("rust-futures-util-preview" ,rust-futures-util-preview-0.3))
+ #:cargo-development-inputs
+ (("rust-futures-join-macro-preview"
+ ,rust-futures-join-macro-preview-0.3))))
(home-page "https://rust-lang-nursery.github.io/futures-rs")
- (synopsis "An implementation of futures and streams")
+ (synopsis "Implementation of futures and streams")
(description
- "An implementation of futures and streams featuring zero allocations,
-composability, and iterator-like interfaces.")
+ "This package provides an implementation of futures and streams featuring
+zero allocations, composability, and iterator-like interfaces.")
(license (list license:expat license:asl2.0))))
(define-public rust-futures-select-macro-preview-0.3
@@ -10447,25 +12737,44 @@ futures-rs library.")
components built off futures-rs.")
(license (list license:expat license:asl2.0))))
-(define-public rust-futures-timer-0.1
+(define-public rust-futures-timer-1
(package
(name "rust-futures-timer")
- (version "0.1.1")
+ (version "1.0.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-timer" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0hw0nlyrq5an6l6y8md1rg6r380zrddvmh9cg0h64xfwnvlxzkm5"))))
+ (base32 "0idyz2k72jbl9z0wj48n15wjv6qgxgsgvs6k8lrhkzr9jj728ikr"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1))))
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-futures-core-preview" ,rust-futures-core-preview-0.3)
+ ("rust-pin-utils" ,rust-pin-utils-0.1))))
(home-page "https://github.com/async-rs/futures-timer")
(synopsis "Timeouts for futures")
- (description "Timeouts for futures.")
+ (description "This package is a general purpose crate for working with
+timeouts and delays with futures.")
(license (list license:expat license:asl2.0))))
+(define-public rust-futures-timer-0.1
+ (package
+ (inherit rust-futures-timer-1)
+ (name "rust-futures-timer")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "futures-timer" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0hw0nlyrq5an6l6y8md1rg6r380zrddvmh9cg0h64xfwnvlxzkm5"))))
+ (arguments
+ `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1))))))
+
(define-public rust-futures-util-0.3
(package
(name "rust-futures-util")
@@ -10543,6 +12852,30 @@ for the futures-rs library.")
futures-rs library.")
(license (list license:expat license:asl2.0))))
+(define-public rust-fuzzy-matcher-0.3
+ (package
+ (name "rust-fuzzy-matcher")
+ (version "0.3.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fuzzy-matcher" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "153csv8rsk2vxagb68kpmiknvdd3bzqj03x805khckck28rllqal"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-thread-local" ,rust-thread-local-1))
+ #:cargo-development-inputs
+ (("rust-termion" ,rust-termion-1.5))))
+ (home-page "https://github.com/lotabout/fuzzy-matcher")
+ (synopsis "Fuzzy Matching Library")
+ (description "This package provides a fuzzy matching library in Rust.")
+ (license license:expat)))
+
(define-public rust-fxhash-0.2
(package
(name "rust-fxhash")
@@ -10811,8 +13144,39 @@ API library @code{gdi32}.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-getrandom-0.2
+ (package
+ (name "rust-getrandom")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "getrandom" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1x3clmvj5k2h9qv3ihbyif1rns3pf5y5n66f5jjyc5zr6v7jb07f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+ ("rust-stdweb" ,rust-stdweb-0.4)
+ ("rust-wasi" ,rust-wasi-0.9)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+ #:cargo-development-inputs
+ (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+ (home-page "https://github.com/rust-random/getrandom")
+ (synopsis "Retrieve random data from system source")
+ (description
+ "This package provides a small cross-platform library for
+retrieving random data from system source.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-getrandom-0.1
(package
+ (inherit rust-getrandom-0.2)
(name "rust-getrandom")
(version "0.1.14")
(source
@@ -10824,7 +13188,6 @@ API library @code{gdi32}.")
(sha256
(base32
"1sq30li71h19rhnhs1h6576ja68insajx8wvh1nn088r8pc8vg3s"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
@@ -10835,13 +13198,7 @@ API library @code{gdi32}.")
("rust-log" ,rust-log-0.4)
("rust-stdweb" ,rust-stdweb-0.4)
("rust-wasi" ,rust-wasi-0.9)
- ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
- (home-page "https://github.com/rust-random/getrandom")
- (synopsis "Retrieve random data from system source")
- (description
- "This package provides a small cross-platform library for
-retrieving random data from system source.")
- (license (list license:expat license:asl2.0))))
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
(define-public rust-gettext-rs-0.5
(package
@@ -11306,6 +13663,36 @@ open file descriptors.")
(("rust-docmatic" ,rust-docmatic-0.1)
("rust-tempdir" ,rust-tempdir-0.3))))))
+(define-public rust-gloo-timers-0.2
+ (package
+ (name "rust-gloo-timers")
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "gloo-timers" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "07w999jm1r1i8r574qbmsa3l4w3gxhyx04cbllg0m4pzm934l827"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-js-sys" ,rust-js-sys-0.3)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-web-sys" ,rust-web-sys-0.3))
+ #:cargo-development-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
+ ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+ (home-page "https://github.com/rustwasm/gloo")
+ (synopsis "Convenience crate for working with JavaScript timers")
+ (description
+ "This package is a convenience crate for working with JavaScript
+timers.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-goblin-0.2
(package
(name "rust-goblin")
@@ -11554,7 +13941,7 @@ standard printing of search results, similar to grep itself.")
("rust-log" ,rust-log-0.4)
("rust-regex" ,rust-regex-1)
("rust-regex-syntax" ,rust-regex-syntax-0.6)
- ("rust-thread-local" ,rust-thread-local-1.0))))
+ ("rust-thread-local" ,rust-thread-local-1))))
(home-page "https://github.com/BurntSushi/ripgrep")
(synopsis "Use Rust's regex library with the grep crate")
(description
@@ -12149,7 +14536,7 @@ total runtime size of an object on the heap")
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-unicode-segmentation" ,rust-unicode-segmentation-1.3))))
+ (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
(home-page "https://github.com/withoutboats/heck")
(synopsis "Case conversion library")
(description
@@ -12631,7 +15018,7 @@ or response body.")
(define-public rust-httparse-1
(package
(name "rust-httparse")
- (version "1.3.3")
+ (version "1.3.4")
(source
(origin
(method url-fetch)
@@ -12640,11 +15027,10 @@ or response body.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "10vsfx1b8drhif08fbi0ha9d3v1f3h80w42rxh0y3hrvzl64nwz8"))))
+ "1yf23ldnjwfkkhkca7f4w15mky9961gjz28dlwyybhphc7l9l5yd"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-development-inputs
+ `(#:cargo-development-inputs
(("rust-pico-sys" ,rust-pico-sys-0.0))))
(home-page "https://github.com/seanmonstar/httparse")
(synopsis "Zero-copy HTTP/1.x parser")
@@ -13084,7 +15470,7 @@ let} expressions.")
("rust-memchr" ,rust-memchr-2)
("rust-regex" ,rust-regex-1)
("rust-same-file" ,rust-same-file-1.0)
- ("rust-thread-local" ,rust-thread-local-1.0)
+ ("rust-thread-local" ,rust-thread-local-1)
("rust-walkdir" ,rust-walkdir-2)
("rust-winapi-util" ,rust-winapi-util-0.1))
#:cargo-development-inputs
@@ -13112,7 +15498,7 @@ ignore files such as .gitignore against file paths.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-hashbrown" ,rust-hashbrown-0.9)
("rust-serde" ,rust-serde-1)
("rust-rayon" ,rust-rayon-1))
@@ -13136,6 +15522,57 @@ removals, and it allows lookup of its elements by either hash table key
or numerical index. A corresponding hash set type is also provided.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-indicatif-0.15
+ (package
+ (name "rust-indicatif")
+ (version "0.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "indicatif" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1r4n50mclyi4c7b9c9mlma1rhchjamw71r3z8vgqcmp24mhvbakv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-console" ,rust-console-0.13)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-number-prefix" ,rust-number-prefix-0.3)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.7)
+ ("rust-tokio" ,rust-tokio-0.2))))
+ (home-page "https://github.com/mitsuhiko/indicatif")
+ (synopsis "Progress bar and CLI reporting library for Rust")
+ (description
+ "This package provides a progress bar and CLI reporting library for
+Rust.")
+ (license license:expat)))
+
+(define-public rust-infer-0.2
+ (package
+ (name "rust-infer")
+ (version "0.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "infer" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1b4ziqcv0d1wga5yfqf620dkgzijsdw3ylnzq61bfaxla2d85sb4"))))
+ (build-system cargo-build-system)
+ (arguments `(#:tests? #false)) ;missing files
+ (home-page "https://github.com/bojand/infer")
+ (synopsis "Infer file types based on its magic number signature")
+ (description
+ "This crate infers a file types based on its magic number
+signature.")
+ (license license:expat)))
+
(define-public rust-inflate-0.4
(package
(name "rust-inflate")
@@ -13182,8 +15619,39 @@ deordinalize, demodulize, foreign key, and pluralize/singularize are supported
as both traits and pure functions acting on String types.")
(license license:bsd-2)))
+(define-public rust-inotify-0.8
+ (package
+ (name "rust-inotify")
+ (version "0.8.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "inotify" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1m74znskinrvfcp0hczwwdxvc7kvnrrailngkivk1iwknfa0mpa6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-inotify-sys" ,rust-inotify-sys-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-mio" ,rust-mio-0.6)
+ ("rust-tokio" ,rust-tokio-0.2))
+ #:cargo-development-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-tempdir" ,rust-tempdir-0.3)
+ ("rust-tokio" ,rust-tokio-0.2))))
+ (home-page "https://github.com/inotify-rs/inotify")
+ (synopsis "Idiomatic wrapper for inotify")
+ (description "This package provides an idiomatic wrapper for inotify
+written in Rust.")
+ (license license:isc)))
+
(define-public rust-inotify-0.7
(package
+ (inherit rust-inotify-0.8)
(name "rust-inotify")
(version "0.7.1")
(source
@@ -13195,7 +15663,6 @@ as both traits and pure functions acting on String types.")
(sha256
(base32
"0byhq4x4b2rlbkmfrab5dni39wiq2ls1hv1nhggp7rla5inwc5j8"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
@@ -13207,12 +15674,7 @@ as both traits and pure functions acting on String types.")
("rust-tokio-io" ,rust-tokio-io-0.1)
("rust-tokio-reactor" ,rust-tokio-reactor-0.1))
#:cargo-development-inputs
- (("rust-tempdir" ,rust-tempdir-0.3))))
- (home-page "https://github.com/inotify-rs/inotify")
- (synopsis "Idiomatic wrapper for inotify")
- (description "This package provides an idiomatic wrapper for inotify written
-in Rust.")
- (license license:isc)))
+ (("rust-tempdir" ,rust-tempdir-0.3))))))
(define-public rust-inotify-0.6
(package
@@ -13293,6 +15755,35 @@ in Rust.")
(description "This package provides a snapshot testing library for Rust.")
(license license:asl2.0)))
+(define-public rust-insta-0.12
+ (package
+ (inherit rust-insta-0.16)
+ (name "rust-insta")
+ (version "0.12.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "insta" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0j8k8rfcbdvh2s3jfj9hj7mspl32rqxqa393cw55jhg8cb09sj8d"))))
+ (arguments
+ `(#:cargo-test-flags
+ '("--release"
+ "--"
+ "--skip=runtime::test_format_rust_expression")
+ #:cargo-inputs
+ (("rust-console" ,rust-console-0.9)
+ ("rust-difference" ,rust-difference-2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-pest" ,rust-pest-2)
+ ("rust-pest-derive" ,rust-pest-derive-2)
+ ("rust-ron" ,rust-ron-0.5)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+ ("rust-uuid" ,rust-uuid-0.8))))))
+
(define-public rust-insta-0.8
(package
(inherit rust-insta-0.16)
@@ -13502,6 +15993,66 @@ network configuration for Windows.")
enum like Option/Result.")
(license license:expat)))
+(define-public rust-isahc-0.9
+ (package
+ (name "rust-isahc")
+ (version "0.9.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "isahc" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "12iqz5fj0509pr813pds2fgdk649a0b6ipvy3pqjwb1ywh68m572"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; Build fails with "failed to run custom build command for `curl-sys
+ ;; v0.4.39+curl-7.74.0`". Skip for now.
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-bytes" ,rust-bytes-0.5)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-curl" ,rust-curl-0.4)
+ ("rust-curl-sys" ,rust-curl-sys-0.4)
+ ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+ ("rust-flume" ,rust-flume-0.9)
+ ("rust-futures-lite" ,rust-futures-lite-1)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-mime" ,rust-mime-0.3)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-publicsuffix" ,rust-publicsuffix-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-sluice" ,rust-sluice-0.5)
+ ("rust-tracing" ,rust-tracing-0.1)
+ ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+ ("rust-url" ,rust-url-2)
+ ("rust-waker-fn" ,rust-waker-fn-1))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.8)
+ ("rust-indicatif" ,rust-indicatif-0.15)
+ ("rust-structopt" ,rust-structopt-0.3)
+ ("rust-test-case" ,rust-test-case-1)
+ ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("openssl" ,openssl)
+ ("zlib" ,zlib)))
+ (home-page "https://github.com/sagebind/isahc")
+ (synopsis "Practical HTTP client")
+ (description
+ "Isahc is an acronym that stands for Incredible Streaming Asynchronous
+HTTP Client. It is an asynchronous HTTP client for the Rust language. It
+uses libcurl as an HTTP engine inside, and provides an easy-to-use API on top
+that integrates with Rust idioms.")
+ (license license:expat)))
+
(define-public rust-ipnet-2
(package
(name "rust-ipnet")
@@ -13931,6 +16482,79 @@ primitives to an @code{io::Write}.")
(native-inputs
`(("jemalloc" ,jemalloc)))))
+(define-public rust-jni-0.14
+ (package
+ (name "rust-jni")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "jni" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "00jl4jzzbbcf1nyziras5drp501xsk89g0132pwg194ilh6k308r"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cesu8" ,rust-cesu8-1)
+ ("rust-combine" ,rust-combine-3)
+ ("rust-error-chain" ,rust-error-chain-0.12)
+ ("rust-jni-sys" ,rust-jni-sys-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-walkdir" ,rust-walkdir-2))
+ #:cargo-development-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1))))
+ (home-page "https://github.com/jni-rs/jni-rs")
+ (synopsis "Rust bindings to the JNI")
+ (description
+ "This package provides Rust bindings to the JNI. It permits to
+implement native Java methods for JVM and Android in Rust, call Java
+code from Rust, embed JVM in Rust applications and use any Java
+libraries.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-jni-glue-0.0
+ (package
+ (name "rust-jni-glue")
+ (version "0.0.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "jni-glue" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "054kc2hkdfjiihy7ssrn97s9hs35c2v32ph2h0jlv4vkazx39ddb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-jni-sys" ,rust-jni-sys-0.3)
+ ("rust-lazy-static" ,rust-lazy-static-1))))
+ (home-page "https://github.com/MaulingMonkey/jni-bindgen")
+ (synopsis "Glue code to accompany the jni-bindgen code generator")
+ (description
+ "This package provides manually written glue code to accompany
+the jni-bindgen code generator for binding to JVM APIs from Rust.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-jni-sys-0.3
+ (package
+ (name "rust-jni-sys")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "jni-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0c01zb9ygvwg9wdx2fii2d39myzprnpqqhy7yizxvjqp5p04pbwf"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/sfackler/rust-jni-sys")
+ (synopsis "Rust definitions corresponding to @file{jni.h}")
+ (description
+ "This package provides Rust definitions corresponding to
+@file{jni.h}.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-jobserver-0.1
(package
(name "rust-jobserver")
@@ -14072,6 +16696,29 @@ kernel32.")
"The Khronos XML API Registry, exposed as byte string constants.")
(license license:asl2.0)))
+(define-public rust-kv-log-macro-1
+ (package
+ (name "rust-kv-log-macro")
+ (version "1.0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "kv-log-macro" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0zwp4bxkkp87rl7xy2dain77z977rvcry1gmr5bssdbn541v7s0d"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-log" ,rust-log-0.4))
+ #:cargo-development-inputs
+ (("rust-femme" ,rust-femme-1))))
+ (home-page "https://github.com/yoshuawuyts/kv-log-macro")
+ (synopsis "Log macro for log's kv-unstable backend")
+ (description
+ "This package provides a Log macro for log's kv-unstable backend.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-language-tags-0.2
(package
(name "rust-language-tags")
@@ -15104,6 +17751,28 @@ libraries have.
"Efficiently insert line separators.")
(license license:asl2.0)))
+(define-public rust-link-cplusplus-1
+ (package
+ (name "rust-link-cplusplus")
+ (version "1.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "link-cplusplus" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0m7365ig7r88x7b4gkzj5m7b6wiq42pi1ign7mvyq63jr22sfspr"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
+ (home-page "https://github.com/dtolnay/link-cplusplus")
+ (synopsis "Link libstdc++ or libc++ automatically or manually")
+ (description "This crate helps link to libstdc++ or libc++ automatically or
+manually from Rust.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-linked-hash-map-0.5
(package
(name "rust-linked-hash-map")
@@ -15491,24 +18160,27 @@ by inspecting the system for user preference.")
`(#:cargo-inputs
(("rust-log" ,rust-log-0.4))))))
-(define-public rust-loom-0.3
+(define-public rust-loom-0.4
(package
(name "rust-loom")
- (version "0.3.6")
+ (version "0.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "loom" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1vabpqzdhcqy1d64kcyzgfwigiak0dr18whq0lkic8915w7lds50"))))
+ (base32 "1941ji91nvriqqkgzlx285kq38zg74sw68gb2x4pnjbfcfs76k6l"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ;; FIXME: build phase fails with the error: "the
+ ;; `#[track_caller]` attribute is an experimental feature".
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1)
("rust-futures-util" ,rust-futures-util-0.3)
("rust-generator" ,rust-generator-0.6)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/tokio-rs/loom")
@@ -15520,6 +18192,27 @@ memory model. It uses state reduction techniques to avoid combinatorial
explosion.")
(license license:expat)))
+(define-public rust-loom-0.3
+ (package
+ (inherit rust-loom-0.4)
+ (name "rust-loom")
+ (version "0.3.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "loom" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1vabpqzdhcqy1d64kcyzgfwigiak0dr18whq0lkic8915w7lds50"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-generator" ,rust-generator-0.6)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1))))))
+
(define-public rust-loom-0.2
(package/inherit rust-loom-0.3
(name "rust-loom")
@@ -16395,6 +19088,50 @@ proofs. It automates the Fiat-Shamir transform, so that by using Merlin,
non-interactive protocols can be implemented as if they were interactive.")
(license license:expat)))
+(define-public rust-mesalink-1
+ (package
+ (name "rust-mesalink")
+ (version "1.1.0-cratesio")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "mesalink" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "02lp27j5vxdc95bf5g983yr660cm6vljikk0yqry4j6cjvfnyq85"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--release"
+ "--"
+ "--skip=libssl::ssl::tests::early_data_to_mesalink_io"
+ "--skip=libssl::ssl::tests::get_ssl_fd"
+ "--skip=libssl::ssl::tests::ssl_on_nonblocking_socket")
+ #:cargo-inputs
+ (("rust-base64" ,rust-base64-0.10)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-enum-to-u8-slice-derive" ,rust-enum-to-u8-slice-derive-0.1)
+ ("rust-env-logger" ,rust-env-logger-0.6)
+ ("rust-jemallocator" ,rust-jemallocator-0.3)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-parking-lot" ,rust-parking-lot-0.9)
+ ("rust-ring" ,rust-ring-0.16)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-sct" ,rust-sct-0.6)
+ ("rust-untrusted" ,rust-untrusted-0.7)
+ ("rust-walkdir" ,rust-walkdir-2)
+ ("rust-webpki" ,rust-webpki-0.21)
+ ("rust-webpki-roots" ,rust-webpki-roots-0.17))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1))))
+ (home-page "https://github.com/mesalock-linux/mesalink")
+ (synopsis "Memory-safe and OpenSSL-compatible TLS library")
+ (description
+ "MesaLink is a memory-safe and OpenSSL-compatible TLS library
+based on Rustls and Ring.")
+ (license license:bsd-3)))
+
(define-public rust-metadeps-1.1
(package
(name "rust-metadeps")
@@ -16857,6 +19594,40 @@ IOCP and Async I/O abstractions.")
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.3))))))
+(define-public rust-mockito-0.23
+ (package
+ (name "rust-mockito")
+ (version "0.23.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "mockito" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0kh2wg24441miqcnrp2miaapphn8wgm18x23yjq45pajsjxfd0mf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--release"
+ "--"
+ "--skip=test_assert_with_last_unmatched_request"
+ "--skip=test_assert_with_last_unmatched_request_and_headers")
+ #:cargo-inputs
+ (("rust-assert-json-diff" ,rust-assert-json-diff-1)
+ ("rust-colored" ,rust-colored-1)
+ ("rust-difference" ,rust-difference-2)
+ ("rust-httparse" ,rust-httparse-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-serde-json" ,rust-serde-json-1))))
+ (home-page "https://github.com/lipanski/mockito")
+ (synopsis "HTTP mocking for Rust")
+ (description "This crate provides HTTP mocking for Rust.")
+ (license license:expat)))
+
(define-public rust-model-0.1
(package
(name "rust-model")
@@ -16956,6 +19727,60 @@ a default trait implementation you've defined.")
libmysqlclient.")
(license (list license:expat license:asl2.0))))
+(define-public rust-nanorand-0.5
+ (package
+ (name "rust-nanorand")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nanorand" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1ryi6jdfsfij4di33f269099g7m32rlr7sv7j4pklnjcj2xxfwri"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;error with pre-release randomize
+ #:cargo-inputs
+ (("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-zeroize" ,rust-zeroize-1))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-hex" ,rust-hex-0.4)
+ ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
+ ("rust-randomize" ,rust-randomize-4))))
+ (home-page "https://github.com/aspenluxxxy/nanorand-rs")
+ (synopsis "Tiny, fast, zero-dep library for random number generation")
+ (description
+ "This library is meant for fast, random number generation with
+quick compile time, and minimal dependencies.")
+ (license license:zlib)))
+
+(define-public rust-nanorand-0.4
+ (package
+ (inherit rust-nanorand-0.5)
+ (name "rust-nanorand")
+ (version "0.4.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nanorand" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1ifpjgir1a6lw64jkb6la5hb8j5jvqq70nmxgzjj0cjf13jd3kys"))))
+ (arguments
+ `(#:skip-build? #true ;error with pre-release randomize
+ #:cargo-inputs
+ (("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-zeroize" ,rust-zeroize-1))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-hex" ,rust-hex-0.4)
+ ("rust-random-fast-rng" ,rust-random-fast-rng-0.1)
+ ("rust-randomize" ,rust-randomize-4))))))
+
(define-public rust-nasm-rs-0.2
(package
(name "rust-nasm-rs")
@@ -17304,6 +20129,33 @@ IO of Windows's named pipes.")
"This package provides a crate to perform natural ordering for Rust.")
(license license:expat)))
+(define-public rust-nb-connect-1
+ (package
+ (name "rust-nb-connect")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nb-connect" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1649m71wc0cg1rqgl8vbh0489znkhpwgl0isjd5x8mz470ash8w1"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-polling" ,rust-polling-2))))
+ (home-page "https://github.com/stjepang/nb-connect")
+ (synopsis "Non-blocking TCP or Unix connect")
+ (description
+ "This crate allows you to create a TcpStream or a UnixStream in
+a non-blocking way, without waiting for the connection to become fully
+established.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-ndarray-0.12
(package
(name "rust-ndarray")
@@ -17337,6 +20189,61 @@ general elements and for numerics.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-ndk-0.2
+ (package
+ (name "rust-ndk")
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ndk" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0wvf4hy18lpfkr4bap846qv2cx1vdg3x0d4hcfba9l5yzv0ngcay"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: Android only
+ #:cargo-inputs
+ (("rust-jni" ,rust-jni-0.14)
+ ("rust-jni-glue" ,rust-jni-glue-0.0)
+ ("rust-jni-sys" ,rust-jni-sys-0.3)
+ ("rust-ndk-sys" ,rust-ndk-sys-0.2)
+ ("rust-num-enum" ,rust-num-enum-0.4)
+ ("rust-thiserror" ,rust-thiserror-1))))
+ (home-page "https://github.com/rust-windowing/android-ndk-rs")
+ (synopsis "Safe Rust bindings to the Android NDK")
+ (description
+ "This package provides safe Rust bindings to the Android NDK.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-ndk-glue-0.2
+ (package
+ (name "rust-ndk-glue")
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ndk-glue" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0hajn6nsg6i3khi7yr2ayafpiznm5z3k5v64afqnz753nyw9kwxx"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;XXX: Android only
+ #:cargo-inputs
+ (("rust-android-logger" ,rust-android-logger-0.8)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-ndk" ,rust-ndk-0.2)
+ ("rust-ndk-macro" ,rust-ndk-macro-0.2)
+ ("rust-ndk-sys" ,rust-ndk-sys-0.2))))
+ (home-page "https://github.com/rust-windowing/android-ndk-rs")
+ (synopsis "Startup code for Android binaries")
+ (description
+ "This package provides startup code for Android binaries.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-ndk-macro-0.2
(package
(name "rust-ndk-macro")
@@ -17543,6 +20450,34 @@ The goal is to not provide a 100% unified interface, but to unify what can be
while still providing platform specific APIs.")
(license license:expat)))
+(define-public rust-nix-0.18
+ (package
+ (inherit rust-nix-0.19)
+ (name "rust-nix")
+ (version "0.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nix" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0m8h9bskjjqx9sk687z8bxqg2kpwhdh78jq6zfaxsb8llvk0yic3"))))
+ (arguments
+ `(#:tests? #f ; test suite hangs
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-cc" ,rust-cc-1)
+ ("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-libc" ,rust-libc-0.2))
+ #:cargo-development-inputs
+ (("rust-bytes" ,rust-bytes-0.4)
+ ("rust-caps" ,rust-caps-0.3)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-rand" ,rust-rand-0.6)
+ ("rust-semver" ,rust-semver-0.9)
+ ("rust-sysctl" ,rust-sysctl-0.1)
+ ("rust-tempfile" ,rust-tempfile-3))))))
+
(define-public rust-nix-0.17
(package
(inherit rust-nix-0.19)
@@ -17683,10 +20618,10 @@ implementation (which is unstable / requires nightly).")
(license (list license:asl2.0
license:expat))))
-(define-public rust-nom-5
+(define-public rust-nom-6
(package
(name "rust-nom")
- (version "5.1.2")
+ (version "6.0.1")
(source
(origin
(method url-fetch)
@@ -17695,20 +20630,21 @@ implementation (which is unstable / requires nightly).")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z"))))
+ "1w0ppq112myzwk23c8m0wmq0nv73xvn0g9gl2kfm83aadgylq0w8"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Tests require example directory, not included in tarball.
#:cargo-inputs
- (("rust-lazy-static" ,rust-lazy-static-1)
+ (("rust-bitvec" ,rust-bitvec-0.19)
+ ("rust-lazy-static" ,rust-lazy-static-1)
("rust-lexical-core" ,rust-lexical-core-0.7)
("rust-memchr" ,rust-memchr-2)
("rust-regex" ,rust-regex-1)
("rust-version-check" ,rust-version-check-0.9))
#:cargo-development-inputs
- (("rust-criterion" ,rust-criterion-0.2)
+ (("rust-criterion" ,rust-criterion-0.3)
("rust-doc-comment" ,rust-doc-comment-0.3)
- ("rust-jemallocator" ,rust-jemallocator-0.1))
+ ("rust-jemallocator" ,rust-jemallocator-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'override-jemalloc
@@ -17727,6 +20663,41 @@ implementation (which is unstable / requires nightly).")
combinators library.")
(license license:expat)))
+(define-public rust-nom-5
+ (package
+ (inherit rust-nom-6)
+ (name "rust-nom")
+ (version "5.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "nom" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z"))))
+ (arguments
+ `(#:tests? #f ; Tests require example directory, not included in tarball.
+ #:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-lexical-core" ,rust-lexical-core-0.7)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-version-check" ,rust-version-check-0.9))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.2)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-jemallocator" ,rust-jemallocator-0.1))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'override-jemalloc
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((jemalloc (assoc-ref inputs "jemalloc")))
+ (setenv "JEMALLOC_OVERRIDE"
+ (string-append jemalloc "/lib/libjemalloc_pic.a")))
+ #t)))))))
+
(define-public rust-nom-4.2
(package
(inherit rust-nom-5)
@@ -18100,7 +21071,7 @@ including bigint, complex, rational, range iterators, generic integers, and more
("rust-quickcheck" ,rust-quickcheck-0.9)
("rust-rand" ,rust-rand-0.7)
("rust-serde" ,rust-serde-1)
- ("rust-autocfg" ,rust-autocfg-1.0))))
+ ("rust-autocfg" ,rust-autocfg-1))))
(home-page "https://github.com/rust-num/num-bigint")
(synopsis "Big integer implementation for Rust")
(description
@@ -18129,7 +21100,7 @@ including bigint, complex, rational, range iterators, generic integers, and more
("rust-quickcheck-macros" ,rust-quickcheck-macros-0.8)
("rust-rand" ,rust-rand-0.5)
("rust-serde" ,rust-serde-1)
- ("rust-autocfg" ,rust-autocfg-1.0))
+ ("rust-autocfg" ,rust-autocfg-1))
#:cargo-development-inputs
(("rust-serde-test" ,rust-serde-test-1))))))
@@ -18236,7 +21207,7 @@ for Rust")
(("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.5)
("rust-serde" ,rust-serde-1)
- ("rust-autocfg" ,rust-autocfg-1.0))))))
+ ("rust-autocfg" ,rust-autocfg-1))))))
(define-public rust-num-complex-0.1
(package
@@ -18338,6 +21309,31 @@ for Rust")
(description "Numeric syntax extensions in Rust.")
(license (list license:expat license:asl2.0))))
+(define-public rust-num-enum-0.4
+ (package
+ (name "rust-num-enum")
+ (version "0.4.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "num_enum" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1r1nisdzm9m7xm0389nwyi85jhx1bnh5pwllai44ngbgy1ymlmna"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;missing files
+ #:cargo-inputs
+ (("rust-derivative" ,rust-derivative-2)
+ ("rust-num-enum" ,rust-num-enum-0.4)
+ ("rust-num-enum-derive" ,rust-num-enum-derive-0.4))))
+ (home-page "https://github.com/illicitonion/num_enum")
+ (synopsis "Macros easing inter-operation between primitives and enums")
+ (description
+ "This library provides procedural macros to make inter-operation between
+primitives and enums easier.")
+ (license license:bsd-3)))
+
(define-public rust-num-enum-derive-0.4
(package
(name "rust-num-enum-derive")
@@ -18381,7 +21377,7 @@ primitives and enums easier.")
(arguments
`(#:cargo-inputs
(("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-autocfg" ,rust-autocfg-1.0))))
+ ("rust-autocfg" ,rust-autocfg-1))))
(home-page "https://github.com/rust-num/num-integer")
(synopsis "Integer traits and functions")
(description "Integer traits and functions.")
@@ -18406,7 +21402,7 @@ primitives and enums easier.")
`(#:cargo-inputs
(("rust-num-integer" ,rust-num-integer-0.1)
("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-autocfg" ,rust-autocfg-1.0))))
+ ("rust-autocfg" ,rust-autocfg-1))))
(home-page "https://github.com/rust-num/num-iter")
(synopsis "External iterators for generic mathematics")
(description
@@ -18434,7 +21430,7 @@ primitives and enums easier.")
("rust-num-integer" ,rust-num-integer-0.1)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-serde" ,rust-serde-1)
- ("rust-autocfg" ,rust-autocfg-1.0))))
+ ("rust-autocfg" ,rust-autocfg-1))))
(home-page "https://github.com/rust-num/num-rational")
(synopsis "Rational numbers implementation for Rust")
(description
@@ -18461,7 +21457,7 @@ primitives and enums easier.")
("rust-num-integer" ,rust-num-integer-0.1)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-serde" ,rust-serde-1)
- ("rust-autocfg" ,rust-autocfg-1.0))))))
+ ("rust-autocfg" ,rust-autocfg-1))))))
(define-public rust-num-rational-0.1
(package
@@ -18501,7 +21497,7 @@ primitives and enums easier.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-libm" ,rust-libm-0.2))))
(home-page "https://github.com/rust-num/num-traits")
(synopsis "Numeric traits for generic mathematics")
@@ -18948,7 +21944,10 @@ other crates to create safe wrappers around Oniguruma.")
(home-page "https://github.com/matklad/once_cell")
(synopsis "Single assignment cells and lazy values")
(description
- "Single assignment cells and lazy values.")
+ "This package provides two new cell-like types, @code{unsync::OnceCell}
+and @code{sync::OnceCell}. OnceCell might store arbitrary non-copy types, can
+be assigned to at most once and provide direct access to the stored
+contents.")
(license (list license:expat license:asl2.0))))
(define-public rust-once-cell-0.1
@@ -19156,7 +22155,7 @@ system for OpenSSL.")
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
;; Build dependencies:
- ("rust-autocfg" ,rust-autocfg-1.0)
+ ("rust-autocfg" ,rust-autocfg-1)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2))))
@@ -19620,6 +22619,40 @@ deserialization, and interpreter in Rust.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-parking-2
+ (package
+ (name "rust-parking")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "parking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0wnxxnizfxlax3n709s5r83f4n8awy3m4a18q4fdk0z7z693hz22"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-easy-parallel" ,rust-easy-parallel-3))))
+ (home-page "https://github.com/stjepang/parking")
+ (synopsis "Thread parking and unparking")
+ (description "This packages provides methods for thread parking and
+unparking.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-parking-1
+ (package
+ (inherit rust-parking-2)
+ (name "rust-parking")
+ (version "1.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "parking" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0z6q9rxm98vrp3fimw8b5syzwgf8l0pnn6y0cqm4lbblf7r01cvc"))))))
+
(define-public rust-parking-lot-0.11
(package
(name "rust-parking-lot")
@@ -20147,7 +23180,7 @@ in pure Rust.")
(("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4)
("rust-pcre2-sys" ,rust-pcre2-sys-0.2)
- ("rust-thread-local" ,rust-thread-local-1.0))))
+ ("rust-thread-local" ,rust-thread-local-1))))
(native-inputs
`(("pcre2" ,pcre2)
("pkg-config" ,pkg-config)))
@@ -21218,6 +24251,34 @@ applications.")
"Additional trait for Read and Write to read and write Plain Old Data.")
(license (list license:expat license:asl2.0))))
+(define-public rust-polling-2
+ (package
+ (name "rust-polling")
+ (version "2.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "polling" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1r5xm3f6qs84ibg09nw1cz78r883521l3jaiakj35ri959mvr9x2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-wepoll-sys" ,rust-wepoll-sys-3)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-easy-parallel" ,rust-easy-parallel-3))))
+ (home-page "https://github.com/stjepang/polling")
+ (synopsis "Portable interface to epoll, kqueue, event ports, and wepoll")
+ (description
+ "This package provides a portable interface to @code{epoll},
+@code{kqueue}, @code{event ports}, and @code{wepoll}.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-polyval-0.4
(package
(name "rust-polyval")
@@ -21267,6 +24328,27 @@ for constructing a Message Authentication Code (MAC).")
overloading without macros in Rust.")
(license license:expat)))
+(define-public rust-portpicker-0.1
+ (package
+ (name "rust-portpicker")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "portpicker" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1fgb5pdayxy5nlx1lh60r7gx7wx45zza802w8hwhkq3gq42psjav"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-rand" ,rust-rand-0.6))))
+ (home-page "https://github.com/Dentosal/portpicker-rs")
+ (synopsis "Pick a free unused port")
+ (description
+ "This crate provides picks a free port, that is unused on both TCP and
+UDP.")
+ (license license:unlicense)))
+
(define-public rust-ppv-lite86-0.2
(package
(name "rust-ppv-lite86")
@@ -21598,7 +24680,7 @@ replacements, adding colorful diffs.")
(arguments
`(#:cargo-inputs
(("rust-atty" ,rust-atty-0.2)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-encode-unicode" ,rust-encode-unicode-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-term" ,rust-term-0.5)
@@ -22793,6 +25875,30 @@ Racer.")
fashion. It is mostly used in Racer.")
(license license:expat)))
+(define-public rust-radium-0.5
+ (package
+ (name "rust-radium")
+ (version "0.5.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "radium" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1f5vj5zy4kcsw8p87y976dm5pln6v6jfw5f0fkj7qbwfipbsj6wl"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-static-assertions" ,rust-static-assertions-1))))
+ (home-page "https://github.com/mystor/radium")
+ (synopsis "Portable interfaces for maybe-atomic types")
+ (description
+ "@code{radium} provides abstractions and graceful degradation for behavior
+that must be shared-mutable, but merely may use atomic instructions to do so.")
+ (license license:expat)))
+
(define-public rust-radix-fmt-1
(package
(name "rust-radix-fmt")
@@ -23431,6 +26537,74 @@ random number generators.")
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.6))))))
+(define-public rust-random-fast-rng-0.1
+ (package
+ (name "rust-random-fast-rng")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "random-fast-rng" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18q577c8j2j9j044b5fnj1xw1lwkyjrkl3agzp3lvx3iln24wy4m"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-random-trait" ,rust-random-trait-0.1))))
+ (home-page "https://github.com/elichai/random-rs")
+ (synopsis "Library for fast non cryptographic random number generator")
+ (description
+ "This package is a Rust library for fast non cryptographic random number
+generator.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-random-trait-0.1
+ (package
+ (name "rust-random-trait")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "random-trait" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0iw4laa9i97x1m1mc72rx0km0j6pjdrb75b0c93fdaq45spqcc8d"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-doc-comment" ,rust-doc-comment-0.3))))
+ (home-page "https://crates.io/crates/random-trait")
+ (synopsis "Rust library for a random trait")
+ (description
+ "This package is a Rust library for a random trait meant to produce
+random generic types.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-randomize-4
+ (package
+ (name "rust-randomize")
+ (version "4.0.0-alpha.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "randomize" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0m4vkgm161q51ww9bvf0kram9cxg8j3p80rl9w1fzpgkwcwbqhpm"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-getrandom" ,rust-getrandom-0.1))))
+ (home-page "https://github.com/Lokathor/randomize")
+ (synopsis "Minimalist randomization library")
+ (description
+ "This package provides a minimalist randomization library.")
+ (license
+ (list license:zlib license:asl2.0 license:expat))))
+
(define-public rust-raw-cpuid-8
(package
(name "rust-raw-cpuid")
@@ -23541,7 +26715,7 @@ accessors.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
("rust-either" ,rust-either-1)
("rust-rayon-core" ,rust-rayon-core-1))
@@ -23608,7 +26782,7 @@ accessors.")
(("rust-libc" ,rust-libc-0.2)
("rust-rand" ,rust-rand-0.7)
("rust-rand-xorshift" ,rust-rand-xorshift-0.2)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0))))
+ ("rust-scoped-tls" ,rust-scoped-tls-1))))
(home-page "https://github.com/rayon-rs/rayon")
(synopsis "Core APIs for Rayon")
(description "Core APIs for Rayon.")
@@ -23884,7 +27058,7 @@ functionality.")
(("rust-aho-corasick" ,rust-aho-corasick-0.7)
("rust-memchr" ,rust-memchr-2)
("rust-regex-syntax" ,rust-regex-syntax-0.6)
- ("rust-thread-local" ,rust-thread-local-1.0))
+ ("rust-thread-local" ,rust-thread-local-1))
#:cargo-development-inputs
(("rust-lazy-static" ,rust-lazy-static-1)
("rust-quickcheck" ,rust-quickcheck-0.8)
@@ -24650,7 +27824,7 @@ console applications.")
(("rust-bitflags" ,rust-bitflags-1)
("rust-byteorder" ,rust-byteorder-1)
("rust-chrono" ,rust-chrono-0.4)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
("rust-fallible-streaming-iterator"
,rust-fallible-streaming-iterator-0.1)
@@ -24703,7 +27877,7 @@ console applications.")
(("rust-bitflags" ,rust-bitflags-1)
("rust-byteorder" ,rust-byteorder-1)
("rust-chrono" ,rust-chrono-0.4)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
("rust-fallible-streaming-iterator"
,rust-fallible-streaming-iterator-0.1)
@@ -25009,7 +28183,7 @@ It is automatically published using the compiler repository at
("rust-rustc-ap-rustc-macros" ,rust-rustc-ap-rustc-macros-654)
("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654)
("rust-rustc-ap-rustc-span" ,rust-rustc-ap-rustc-span-654)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-smallvec" ,rust-smallvec-1))))
(home-page "https://github.com/alexcrichton/rustc-auto-publish")
(synopsis
@@ -25173,7 +28347,7 @@ It is automatically published using the compiler repository at
("rust-rustc-ap-rustc-index" ,rust-rustc-ap-rustc-index-654)
("rust-rustc-ap-rustc-macros" ,rust-rustc-ap-rustc-macros-654)
("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-sha-1" ,rust-sha-1-0.8)
("rust-unicode-width" ,rust-unicode-width-0.1))))
(home-page "https://github.com/alexcrichton/rustc-auto-publish")
@@ -25372,7 +28546,7 @@ should be using the real rayon crate, not rustc-rayon.")
(("rust-libc" ,rust-libc-0.2)
("rust-rand" ,rust-rand-0.6)
("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0))))
+ ("rust-scoped-tls" ,rust-scoped-tls-1))))
(home-page "https://github.com/rust-lang/rustc-rayon")
(synopsis "Core APIs for Rayon - fork for rustc")
(description
@@ -25943,6 +29117,69 @@ sub-processes using a fork-like interface.")
("rust-tempfile" ,rust-tempfile-3)
("rust-wait-timeout" ,rust-wait-timeout-0.2))))))
+(define-public rust-rustyline-6
+ (package
+ (name "rust-rustyline")
+ (version "6.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "04w4k0nwsra84h90rvwkr6vmjp3nshjqaj9rakfym8qr09xmw3bg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-dirs-next" ,rust-dirs-next-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-nix" ,rust-nix-0.18)
+ ("rust-scopeguard" ,rust-scopeguard-1)
+ ("rust-skim" ,rust-skim-0.7)
+ ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-utf8parse" ,rust-utf8parse-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-assert-matches" ,rust-assert-matches-1.3)
+ ("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-env-logger" ,rust-env-logger-0.7)
+ ("rust-rustyline-derive" ,rust-rustyline-derive-0.3)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/kkawakam/rustyline")
+ (synopsis "Readline implementation in Rust")
+ (description
+ "Rustyline, a readline implementation based on the linenoise package.")
+ (license license:expat)))
+
+(define-public rust-rustyline-derive-0.3
+ (package
+ (name "rust-rustyline-derive")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustyline-derive" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0daj9szvfi442vj2fhm7qb92wmzv7g75qsjq9a6ycnqac4lhx9al"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/kkawakam/rustyline")
+ (synopsis "Rustyline macros implementation in Rust")
+ (description "This package provides Rustyline macros implementation in Rust.")
+ (license license:expat)))
+
(define-public rust-ryu-1
(package
(name "rust-ryu")
@@ -26178,7 +29415,7 @@ non-'static references in parallel.")
(license (list license:asl2.0
license:expat))))
-(define-public rust-scoped-tls-1.0
+(define-public rust-scoped-tls-1
(package
(name "rust-scoped-tls")
(version "1.0.0")
@@ -26202,7 +29439,7 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to
(define-public rust-scoped-tls-0.1
(package
- (inherit rust-scoped-tls-1.0)
+ (inherit rust-scoped-tls-1)
(name "rust-scoped-tls")
(version "0.1.2")
(source
@@ -26267,6 +29504,29 @@ with one of the implemented strategies.")
(base32
"09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl"))))))
+(define-public rust-scratch-1
+ (package
+ (name "rust-scratch")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "scratch" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0sff4rvfalp0ip98pl3xa32n7lhzcr4zqn8fgamaalbb64v4a4by"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-fs2" ,rust-fs2-0.4))))
+ (home-page "https://github.com/dtolnay/scratch")
+ (synopsis "Compile-time temporary directory")
+ (description "This crate exposes a compile-time temporary directory sharable
+by multiple crates in a build graph and erased by @code{cargo clean}.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-scrypt-0.3
(package
(name "rust-scrypt")
@@ -26640,6 +29900,31 @@ macOS and iOS.")
(("rust-hex" ,rust-hex-0.3)
("rust-tempdir" ,rust-tempdir-0.3))))))
+(define-public rust-security-framework-0.1
+ (package
+ (inherit rust-security-framework-0.2)
+ (name "rust-security-framework")
+ (version "0.1.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "security-framework" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z"))))
+ (arguments
+ `(#:skip-build? #t ; MacOS specific
+ #:cargo-inputs
+ (("rust-core-foundation" ,rust-core-foundation-0.2)
+ ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-security-framework-sys" ,rust-security-framework-sys-0.1))
+ #:cargo-development-inputs
+ (("rust-hex" ,rust-hex-0.2)
+ ("rust-tempdir" ,rust-tempdir-0.3))))))
+
(define-public rust-security-framework-sys-2
(package
(name "rust-security-framework-sys")
@@ -26716,6 +30001,25 @@ macOS and iOS.")
(("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6)
("rust-libc" ,rust-libc-0.2))))))
+(define-public rust-security-framework-sys-0.1
+ (package
+ (inherit rust-security-framework-sys-0.2)
+ (name "rust-security-framework-sys")
+ (version "0.1.16")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "security-framework-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al"))))
+ (arguments
+ `(#:skip-build? #t ; MacOS specific
+ #:cargo-inputs
+ (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2)
+ ("rust-libc" ,rust-libc-0.2))))))
+
(define-public rust-selectors-0.22
(package
(name "rust-selectors")
@@ -27002,7 +30306,7 @@ rules are rather complex. This crate implements the whole grammar." )
(define-public rust-serde-1
(package
(name "rust-serde")
- (version "1.0.117")
+ (version "1.0.118")
(source
(origin
(method url-fetch)
@@ -27010,10 +30314,13 @@ rules are rather complex. This crate implements the whole grammar." )
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "06nwyyma9hch1abjqj0y9cb09m1y6lbzbsc7jff6483pvs1sk3xq"))))
+ "0028kv3dh3ix5g7jfws22zb9hcqq4cnpwn2lnlpam1wxhmil5ih6"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ ;; Tests fail with "error: cannot find derive macro `Deserialize` in this
+ ;; scope".
+ `(#:tests? #false
+ #:cargo-inputs
(("rust-serde-derive" ,rust-serde-derive-1))
#:cargo-development-inputs
(("rust-serde-derive" ,rust-serde-derive-1))))
@@ -27272,7 +30579,7 @@ for the serde framework.")
(define-public rust-serde-derive-1
(package
(name "rust-serde-derive")
- (version "1.0.117")
+ (version "1.0.118")
(source
(origin
(method url-fetch)
@@ -27280,7 +30587,7 @@ for the serde framework.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0kn7ais3zv9ajbyc216qm14r61zwlm229815yd4anjmlmmraxlfb"))))
+ "1pvj4v8k107ichsnm7jgm9kxyi2lf971x52bmxhm5mcwd4k3akf8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -27416,6 +30723,41 @@ for the serde framework.")
"Macros to auto-generate implementations for the serde framework.")
(license (list license:expat license:asl2.0))))
+(define-public rust-serde-qs-0.7
+ (package
+ (name "rust-serde-qs")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "serde_qs" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1jz6gpr02d393f8cwdxbgfl3jhx5svr1z5ilxhdh16slqvijvy2s"))))
+ (build-system cargo-build-system)
+ (arguments
+ ;; XXX: The crate fails to't build with with the same error as
+ ;; rust-actix-connect. Skip build for now.
+ `(#:skip-build? #true
+ #:cargo-inputs
+ (("rust-actix-web" ,rust-actix-web-2)
+ ("rust-data-encoding" ,rust-data-encoding-2)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-thiserror" ,rust-thiserror-1))
+ #:cargo-development-inputs
+ (("rust-csv" ,rust-csv-1)
+ ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7))))
+ (home-page "https://github.com/samscott89/serde_qs")
+ (synopsis "Querystrings for Serde")
+ (description
+ "This crate is a Rust library for serialising to and deserialising from
+querystrings. This crate is designed to extend @code{serde_urlencoded} when
+using nested parameters, similar to those used by @code{qs} for Node, and
+commonly used by Ruby on Rails via Rack.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-serde-stacker-0.1
(package
(name "rust-serde-stacker")
@@ -27616,8 +30958,33 @@ the application/x-www-form-urlencoded format.")
(description "YAML support for Serde.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-serial-test-0.5
+ (package
+ (name "rust-serial-test")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "serial-test" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0pchc7imdi9wv8xxnwkb9lzs6cg06ghs0gaajjb834y8837wpg70"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-serial-test-derive" ,rust-serial-test-derive-0.5))))
+ (home-page "https://github.com/palfrey/serial_test")
+ (synopsis "Allows for the creation of serialised Rust tests")
+ (description
+ "This package allows for the creation of serialised Rust tests.")
+ (license license:expat)))
+
(define-public rust-serial-test-0.1
(package
+ (inherit rust-serial-test-0.5)
(name "rust-serial-test")
(version "0.1.0")
(source
@@ -27629,18 +30996,38 @@ the application/x-www-form-urlencoded format.")
(sha256
(base32
"0qywhzjc4jh6dqqng90maai0mjlmafk9aa5rrl9g3d2g01wdn8ms"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1))))))
+
+(define-public rust-serial-test-derive-0.5
+ (package
+ (name "rust-serial-test-derive")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "serial_test_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1m8sd97xr8dn6p9by0xwfqm0rz8cbn1ghs5l1fv1xd6xzvgddb5j"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-lazy-static" ,rust-lazy-static-1))))
- (home-page "https://github.com/palfrey/serial_test/")
- (synopsis "Serialised Rust tests")
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.7))))
+ (home-page "https://github.com/palfrey/serial_test")
+ (synopsis "Helper crate for serial_test")
(description
- "Allows for the creation of serialised Rust tests.")
+ "This package is an helper crate for @code{rust-serial-test}.")
(license license:expat)))
(define-public rust-serial-test-derive-0.1
(package
+ (inherit rust-serial-test-derive-0.5)
(name "rust-serial-test-derive")
(version "0.1.0")
(source
@@ -27652,15 +31039,10 @@ the application/x-www-form-urlencoded format.")
(sha256
(base32
"17fkqrba233sjhdak986y4w3z4yjxa4idjkh46l7zxgcgjlvrnic"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-quote" ,rust-quote-0.6)
- ("rust-syn" ,rust-syn-0.15))))
- (home-page "https://github.com/palfrey/serial_test/")
- (synopsis "Helper crate for serial_test")
- (description "This package provides a helper crate for @code{serial_test}.")
- (license license:expat)))
+ ("rust-syn" ,rust-syn-0.15))))))
(define-public rust-servo-arc-0.1
(package
@@ -28072,6 +31454,32 @@ functions core functionality.")
picking compatible shaders.")
(license license:expat)))
+(define-public rust-sharded-slab-0.1
+ (package
+ (name "rust-sharded-slab")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "sharded-slab" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09r1i2adjkm4flsj4l0j7x79gdyxz0hvivxdh2d8j5jfj6z22jbv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-loom" ,rust-loom-0.3))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-criterion" ,rust-criterion-0.3)
+ ("rust-proptest" ,rust-proptest-0.9))))
+ (home-page "https://github.com/hawkw/sharded-slab")
+ (synopsis "Lock-free concurrent slab.")
+ (description "This package provides a lock-free concurrent slab.")
+ (license license:expat)))
+
(define-public rust-shared-child-0.3
(package
(name "rust-shared-child")
@@ -28197,7 +31605,7 @@ words, like Python's shlex.")
(define-public rust-signal-hook-0.1
(package
(name "rust-signal-hook")
- (version "0.1.13")
+ (version "0.1.16")
(source
(origin
(method url-fetch)
@@ -28206,13 +31614,13 @@ words, like Python's shlex.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0b0yh6hlb5hs5kq6adyk0bn168y1ncymxvlizlygaabad2hz7f8h"))))
+ "1v85mgs4dbgw0765b9nx0jd8lamv55425aawjbhxz6cb870hhib0"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-futures" ,rust-futures-0.1)
("rust-libc" ,rust-libc-0.2)
- ("rust-mio" ,rust-mio-0.6)
+ ("rust-mio" ,rust-mio-0.7)
("rust-mio-uds" ,rust-mio-uds-0.6)
("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
("rust-tokio-reactor" ,rust-tokio-reactor-0.1))
@@ -28414,6 +31822,32 @@ CPUs, as well as raw interfaces to platform-specific instructions.
"This package provides helpers to write more compact simd code.")
(license license:expat)))
+(define-public rust-simple-mutex-1
+ (package
+ (name "rust-simple-mutex")
+ (version "1.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "simple-mutex" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1mnwlgjajqmxjfgsdcr9imf23yg1zblny95zrvcflvbgzbmbpaiq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-event-listener" ,rust-event-listener-2))
+ #:cargo-development-inputs
+ (("rust-parking-lot" ,rust-parking-lot-0.10))))
+ (home-page "https://github.com/stjepang/simple-mutex")
+ (synopsis
+ "Mutex more efficient than @code{std} and simpler than
+@code{parking_lot}")
+ (description
+ "This package provides a mutex more efficient than @code{std} and
+simpler than @code{parking_lot}.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-siphasher-0.3
(package
(name "rust-siphasher")
@@ -28533,6 +31967,44 @@ variants in pure Rust.")
"Test your Rust markdown documentation via Cargo.")
(license (list license:expat license:asl2.0))))
+(define-public rust-skim-0.7
+ (package
+ (name "rust-skim")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "skim" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-clap" ,rust-clap-2)
+ ("rust-derive-builder" ,rust-derive-builder-0.9)
+ ("rust-env-logger" ,rust-env-logger-0.6)
+ ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nix" ,rust-nix-0.14)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-shlex" ,rust-shlex-0.1)
+ ("rust-time" ,rust-time-0.1)
+ ("rust-timer" ,rust-timer-0.2)
+ ("rust-tuikit" ,rust-tuikit-0.2)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-vte" ,rust-vte-0.3))))
+ (home-page "https://github.com/lotabout/skim")
+ (synopsis "Fuzzy Finder in Rust")
+ (description "This package provides a fuzzy finder in Rust.")
+ (license license:expat)))
+
(define-public rust-slab-0.4
(package
(name "rust-slab")
@@ -28609,6 +32081,36 @@ data type.")
license:expat
license:asl2.0))))
+(define-public rust-sluice-0.5
+ (package
+ (name "rust-sluice")
+ (version "0.5.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "sluice" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1w9brs9dqyvr2w7cs5nxkp2wggw2xh76bc4qq0p4yxwfvhgfs94f"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures-channel" ,rust-futures-channel-0.3)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-io" ,rust-futures-io-0.3))
+ #:cargo-development-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-criterion" ,rust-criterion-0.3)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-quickcheck" ,rust-quickcheck-0.9)
+ ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9))))
+ (home-page "https://github.com/sagebind/sluice")
+ (synopsis "Ring buffer for byte buffers, FIFO queues, and SPSC channels")
+ (description
+ "This package provides asynchronous byte buffers and pipes for concurrent
+I/O programming.")
+ (license license:expat)))
+
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
@@ -28656,6 +32158,46 @@ stack.")
#:cargo-development-inputs
(("rust-bincode" ,rust-bincode-1))))))
+(define-public rust-smol-0.1
+ (package
+ (name "rust-smol")
+ (version "0.1.18")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "smol" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1mdflwzgw1jxwrjffqn09lb4hn6d076s1ka8lb9mgnildqybn332"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-test-flags
+ '("--release" "--" "--skip=task::Task<Result<T, E>>")
+ #:cargo-inputs
+ (("rust-async-task" ,rust-async-task-3)
+ ("rust-blocking" ,rust-blocking-0.4)
+ ("rust-concurrent-queue" ,rust-concurrent-queue-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-socket2" ,rust-socket2-0.3)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-wepoll-sys-stjepang" ,rust-wepoll-sys-stjepang-1)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-piper" ,rust-piper-0.1)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://github.com/stjepang/smol")
+ (synopsis "Small and fast async runtime")
+ (description "This package provides a small and fast async runtime.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-socket2-0.3
(package
(name "rust-socket2")
@@ -28843,6 +32385,52 @@ initializers are available.")
"07ywqn1vrpi3c43fmvsx7pawk9h3rb77yyqbnhap2micl454kb6f"))))
(arguments '(#:skip-build? #t))))
+(define-public rust-spin-on-0.1
+ (package
+ (name "rust-spin-on")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "spin-on" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "18idc7jfa4m2cap721nh5lva19z3ykjyz1w2hfm6960vshz10vh7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-pin-utils" ,rust-pin-utils-0.1))))
+ (home-page "https://crates.io/crates/spin_on")
+ (synopsis "Simple, inefficient Future executor")
+ (description
+ "This crate contains what aims to be the simplest possible implementation
+of a valid executor. Instead of nicely parking the thread and waiting for the
+future to wake it up, it continuously polls the future until the future is
+ready. This will probably use a lot of CPU, so be careful when you use it.")
+ (license (list license:asl2.0 license:expat))))
+
+(define-public rust-spinning-top-0.2
+ (package
+ (name "rust-spinning-top")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "spinning_top" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0dmbb627i05qla1lnxy7r6hpiia76c8kb40zcgrbar0dx1rrslky"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lock-api" ,rust-lock-api-0.4))))
+ (home-page "https://github.com/rust-osdev/spinning_top")
+ (synopsis "Simple spinlock based on @code{lock_api}")
+ (description
+ "This package provides a simple spinlock crate based on the abstractions
+provided by @code{lock_api}.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-spmc-0.3
(package
(name "rust-spmc")
@@ -29886,13 +33474,13 @@ cryptographic implementations.")
("rust-regex" ,rust-regex-1)
("rust-relative-path" ,rust-relative-path-1)
("rust-retain-mut" ,rust-retain-mut-0.1)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-st-map" ,rust-st-map-0.1)
("rust-string-cache" ,rust-string-cache-0.8)
("rust-walkdir" ,rust-walkdir-2)
("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4))
#:cargo-development-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-env-logger" ,rust-env-logger-0.7)
("rust-num-bigint" ,rust-num-bigint-0.2)
("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
@@ -29976,7 +33564,7 @@ browsers.")
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1))
#:cargo-development-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-flate2" ,rust-flate2-1)
("rust-insta" ,rust-insta-0.16)
("rust-rayon" ,rust-rayon-1)
@@ -30615,6 +34203,26 @@ that exposes the same functionality at the command line.")
"This package provides a small wrapper around option.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-tap-1
+ (package
+ (name "rust-tap")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tap" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "13h7rw3zg3qyb4wrri8l6xbd1wrxd2rq29sqxnkd7zqs5mrlwirn"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/myrrlyn/tap")
+ (synopsis "Generic extensions for tapping values in Rust")
+ (description
+ "This package provides generic extensions for tapping values in Rust.")
+ (license license:expat)))
+
(define-public rust-tar-0.4
(package
(name "rust-tar")
@@ -31116,6 +34724,38 @@ return values to @code{std::io::Result} to indicate success or failure.")
streams.")
(license license:expat)))
+(define-public rust-test-case-1
+ (package
+ (name "rust-test-case")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "test-case" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1j33njgyr4cjhil14va909sg8s6ahzpgcmiaigdg7g22ica6950r"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;XXX: a single test fails, cannot skip it
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1)
+ ("rust-version-check" ,rust-version-check-0.9))
+ #:cargo-development-inputs
+ (("rust-insta" ,rust-insta-0.12)
+ ("rust-lazy-static" ,rust-lazy-static-1))))
+ (home-page "https://github.com/frondeus/test-case")
+ (synopsis "Procedural macro attribute for parametrized test cases")
+ (description
+ "This crate provides @code{#[test_case]} procedural macro attribute that
+generates multiple parametrized tests using one body with different input
+parameters. A test is generated for each data set passed in test_case
+attribute. Under the hood, all test cases that share same body are grouped
+into mod, giving clear and readable test results.")
+ (license license:expat)))
+
(define-public rust-tester-0.5
(package
(name "rust-tester")
@@ -31218,7 +34858,7 @@ handle Unicode characters correctly.")
#:cargo-inputs
(("rust-thiserror-impl" ,rust-thiserror-impl-1.0))
#:cargo-development-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-ref-cast" ,rust-ref-cast-1.0)
("rust-rustversion" ,rust-rustversion-1)
("rust-trybuild" ,rust-trybuild-1))))
@@ -31298,7 +34938,7 @@ different for every thread.")
(("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
("rust-libc" ,rust-libc-0.2))))))
-(define-public rust-thread-local-1.0
+(define-public rust-thread-local-1
(package
(name "rust-thread-local")
(version "1.0.1")
@@ -31322,7 +34962,7 @@ different for every thread.")
(define-public rust-thread-local-0.3
(package
- (inherit rust-thread-local-1.0)
+ (inherit rust-thread-local-1)
(name "rust-thread-local")
(version "0.3.6")
(source
@@ -31355,7 +34995,7 @@ different for every thread.")
`(#:cargo-inputs
(("rust-thread-id" ,rust-thread-id-2.0))))))
-(define-public rust-threadpool-1.7
+(define-public rust-threadpool-1
(package
(name "rust-threadpool")
(version "1.7.1")
@@ -31541,6 +35181,51 @@ crate.")
(description "This package provides a timeout mechanism for unit tests.")
(license license:asl2.0)))
+(define-public rust-timer-0.2
+ (package
+ (name "rust-timer")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "timer" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0srhqyp7fr91d1i43aqs7wc6yn1i3kdkh1pm05bicdw961v23m1i"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-chrono" ,rust-chrono-0.4))))
+ (home-page "https://github.com/Yoric/timer.rs")
+ (synopsis "Simple timer in Rust")
+ (description
+ "This package provides a simple timer. Use it to schedule execution of
+closures after a delay or at a given timestamp.")
+ (license license:mpl2.0)))
+
+(define-public rust-timerfd-1
+ (package
+ (name "rust-timerfd")
+ (version "1.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "timerfd" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "14gwkm2c38bm76ccpp4g20qqs77h86d1l81594i76pb751k3xd8b"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/main--/rust-timerfd")
+ (synopsis "Rust interface to the Linux kernel's @code{timerfd} API")
+ (description
+ "This package provides a Rust interface to the Linux kernel's
+@code{timerfd} API.")
+ (license license:expat)))
+
(define-public rust-tinytemplate-1
(package
(name "rust-tinytemplate")
@@ -31592,29 +35277,72 @@ crate.")
"A 100% safe crate of vec-like types.")
(license (list license:zlib license:asl2.0 license:expat))))
-(define-public rust-tokio-0.3
+(define-public rust-tokio-1
(package
(name "rust-tokio")
- (version "0.3.5")
+ (version "1.0.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "tokio" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0lj26zy5k1dbln0599bn918z5j16wz5iyzs8cjz33hp2ksrkwam1"))))
+ (base32 "1gd6qc9xvm568kicbkch40kjn5w0q2nsn527gcy80v3baqgj4n6j"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;FIXME: unresolved import
+ #:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-bytes" ,rust-bytes-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-mio" ,rust-mio-0.7)
+ ("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+ ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
+ ("rust-tokio-macros" ,rust-tokio-macros-1)
+ ("rust-tracing" ,rust-tracing-0.1)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-async-stream" ,rust-async-stream-0.3)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-loom" ,rust-loom-0.4)
+ ("rust-nix" ,rust-nix-0.19)
+ ("rust-proptest" ,rust-proptest-0.10)
+ ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+ ("rust-tokio-test" ,rust-tokio-test-0.4))))
+ (home-page "https://tokio.rs")
+ (synopsis "Event-driven, non-blocking I/O platform")
+ (description
+ "This package provides an event-driven, non-blocking I/O platform for
+writing asynchronous I/O backed applications.")
+ (license license:expat)))
+
+(define-public rust-tokio-0.3
+ (package
+ (inherit rust-tokio-1)
+ (name "rust-tokio")
+ (version "0.3.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0z78l7kn4y2qvghsp9dyqgvr1kjvv63pjq3d8nzi31q74lfa42vj"))))
(arguments
`(#:tests? #f ;FIXME: fail due to unresolved imports
#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1.0)
+ (("rust-autocfg" ,rust-autocfg-1)
("rust-bytes" ,rust-bytes-0.6)
("rust-futures-core" ,rust-futures-core-0.3)
- ("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-memchr" ,rust-memchr-2)
("rust-mio" ,rust-mio-0.7)
("rust-num-cpus" ,rust-num-cpus-1)
+ ("rust-once-cell" ,rust-once-cell-1)
("rust-parking-lot" ,rust-parking-lot-0.11)
("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
@@ -31627,13 +35355,7 @@ crate.")
("rust-loom" ,rust-loom-0.3)
("rust-nix" ,rust-nix-0.19)
("rust-proptest" ,rust-proptest-0.10)
- ("rust-tokio-test" ,rust-tokio-test-0.3))))
- (home-page "https://tokio.rs")
- (synopsis "Event-driven, non-blocking I/O platform")
- (description
- "This package provides an event-driven, non-blocking I/O platform for
-writing asynchronous I/O backed applications.")
- (license license:expat)))
+ ("rust-tokio-test" ,rust-tokio-test-0.3))))))
(define-public rust-tokio-0.2
(package
@@ -31995,8 +35717,32 @@ the current thread.")
futures efficiently")
(license (list license:asl2.0 license:expat))))
+(define-public rust-tokio-macros-1
+ (package
+ (name "rust-tokio-macros")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-macros" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "150l6wfcqw2rcjaf22qk3z6ca794x0s2c68n5ar18cfafllpsla2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;FIXME: undeclared type `tokio`
+ #:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://tokio.rs")
+ (synopsis "Tokio's proc macros")
+ (description "This package provides Tokio's proc macros.")
+ (license license:expat)))
+
(define-public rust-tokio-macros-0.3
(package
+ (inherit rust-tokio-macros-1)
(name "rust-tokio-macros")
(version "0.3.2")
(source
@@ -32006,18 +35752,13 @@ futures efficiently")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1dvd3gji7a0i1kgck2lwgbcbklk3qb1bsqgd2v9amj63kyjzzps6"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))
#:cargo-development-inputs
- (("rust-tokio" ,rust-tokio-0.3))))
- (home-page "https://tokio.rs")
- (synopsis "Tokio's proc macros")
- (description "This package provides Tokio's proc macros.")
- (license license:expat)))
+ (("rust-tokio" ,rust-tokio-0.3))))))
(define-public rust-tokio-macros-0.2
(package
@@ -32518,6 +36259,36 @@ Rust.")
("rust-once-cell" ,rust-once-cell-1)
("rust-tokio" ,rust-tokio-0.2))))))
+(define-public rust-tokio-stream-0.1
+ (package
+ (name "rust-tokio-stream")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-stream" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0airchgn5zwzynchygdr8m7i4nizhfmifjz0iw6224sbnw9yjfrz"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;FIXME: unresolved import
+ #:cargo-inputs
+ (("rust-async-stream" ,rust-async-stream-0.3)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+ ("rust-tokio" ,rust-tokio-1))
+ #:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-proptest" ,rust-proptest-0.10)
+ ("rust-tokio" ,rust-tokio-1))))
+ (home-page "https://tokio.rs")
+ (synopsis "Utilities to work with @code{Stream} and @code{tokio}")
+ (description
+ "This package provides utilities to work with @code{Stream} and
+@code{tokio}.")
+ (license license:expat)))
+
(define-public rust-tokio-sync-0.2
(package
(name "rust-tokio-sync")
@@ -32567,33 +36338,56 @@ Rust.")
("rust-tokio" ,rust-tokio-0.1)
("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1))))))
-(define-public rust-tokio-test-0.3
+(define-public rust-tokio-test-0.4
(package
(name "rust-tokio-test")
- (version "0.3.0")
+ (version "0.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "tokio-test" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "06nzdkjsxr16pbr5m80zm3vcr8dhcl9amjgb9l9vj4x72cmmmp3y"))))
+ (base32 "1gwrqdwlfih6ib66wxc7yaaq7a9mlsmnxj2ahag3zc2rdxgj0zbw"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bytes" ,rust-bytes-0.5)
+ (("rust-async-stream" ,rust-async-stream-0.3)
+ ("rust-bytes" ,rust-bytes-1)
("rust-futures-core" ,rust-futures-core-0.3)
- ("rust-tokio" ,rust-tokio-0.3))
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-tokio-stream" ,rust-tokio-stream-0.1))
#:cargo-development-inputs
(("rust-futures-util" ,rust-futures-util-0.3)
- ("rust-tokio" ,rust-tokio-0.3))))
+ ("rust-tokio" ,rust-tokio-1))))
(home-page "https://tokio.rs")
(synopsis "Testing utilities for Tokio- and futures-based code")
(description
- "This package provides testing utilities for Tokio- and futures-based
-code.")
+ "This package provides testing utilities for Tokio- and
+futures-based code.")
(license license:expat)))
+(define-public rust-tokio-test-0.3
+ (package
+ (inherit rust-tokio-test-0.4)
+ (name "rust-tokio-test")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-test" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06nzdkjsxr16pbr5m80zm3vcr8dhcl9amjgb9l9vj4x72cmmmp3y"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bytes" ,rust-bytes-0.5)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-tokio" ,rust-tokio-0.3))
+ #:cargo-development-inputs
+ (("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-tokio" ,rust-tokio-0.3))))))
+
(define-public rust-tokio-test-0.2
(package
(inherit rust-tokio-test-0.3)
@@ -32675,7 +36469,7 @@ code.")
#:cargo-development-inputs
(("rust-env-logger" ,rust-env-logger-0.5)
("rust-futures-cpupool" ,rust-futures-cpupool-0.1)
- ("rust-threadpool" ,rust-threadpool-1.7))))
+ ("rust-threadpool" ,rust-threadpool-1))))
(home-page "https://github.com/tokio-rs/tokio")
(synopsis
"Task scheduler backed by a work-stealing thread pool")
@@ -32897,6 +36691,32 @@ implementation of TLS for nonblocking I/O streams.")
Tokio.")
(license license:expat)))
+(define-public rust-tokio-util-0.2
+ (package
+ (inherit rust-tokio-util-0.3)
+ (name "rust-tokio-util")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-util" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0c39s4y0kvzkyarn1f9s8khqyajiqn7m4cjsa208f87ch88sa7ap"))))
+ (arguments
+ `(#:tests? #f
+ #:cargo-inputs
+ (("rust-bytes" ,rust-bytes-0.5)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.1)
+ ("rust-tokio" ,rust-tokio-0.2))
+ #:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-test" ,rust-tokio-test-0.2))))))
+
(define-public rust-toml-0.5
(package
(name "rust-toml")
@@ -33261,8 +37081,89 @@ with tracing (optional, enabled by the env-logger feature).
@end itemize")
(license license:expat)))
+(define-public rust-tracing-serde-0.1
+ (package
+ (name "rust-tracing-serde")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tracing-serde" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "12xjirg0b3cparjdhkd9pksrmv33gz7rdm4gfkvgk15v3x2flrgv"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-serde" ,rust-serde-1)
+ ("rust-tracing-core" ,rust-tracing-core-0.1))
+ #:cargo-development-inputs
+ (("rust-serde-json" ,rust-serde-json-1))))
+ (home-page "https://tokio.rs")
+ (synopsis "Compatibility layer for serializing trace data with
+@code{serde}")
+ (description
+ "This package provides a compatibility layer for serializing trace data
+with @code{serde}.")
+ (license license:expat)))
+
+(define-public rust-tracing-subscriber-0.2
+ (package
+ (name "rust-tracing-subscriber")
+ (version "0.2.15")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tracing-subscriber" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "009lxq14kmakv16sh6r7fy0264xbvs81kg6yr57lwnaciw68zym1"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;missing test files
+ #:cargo-inputs
+ (("rust-ansi-term" ,rust-ansi-term-0.12)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-matchers" ,rust-matchers-0.0)
+ ("rust-parking-lot" ,rust-parking-lot-0.11)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-sharded-slab" ,rust-sharded-slab-0.1)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-thread-local" ,rust-thread-local-1)
+ ("rust-tracing" ,rust-tracing-0.1)
+ ("rust-tracing-core" ,rust-tracing-core-0.1)
+ ("rust-tracing-log" ,rust-tracing-log-0.1)
+ ("rust-tracing-serde" ,rust-tracing-serde-0.1))
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tracing" ,rust-tracing-0.1)
+ ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+ ("rust-tracing-log" ,rust-tracing-log-0.1))))
+ (home-page "https://tokio.rs")
+ (synopsis "Implement and compose tracing subscribers")
+ (description
+ "This package provides utilities for implementing and composing tracing
+subscribers.
+
+Tracing is a framework for instrumenting Rust programs to collect scoped,
+structured, and async-aware diagnostics. The Subscriber trait represents the
+functionality necessary to collect this trace data. This crate contains tools
+for composing subscribers out of smaller units of behaviour, and
+batteries-included implementations of common subscriber functionality.
+
+Tracing-subscriber is intended for use by both Subscriber authors and
+application authors using tracing to instrument their applications.")
+ (license license:expat)))
+
(define-public rust-tracing-subscriber-0.1
(package
+ (inherit rust-tracing-subscriber-0.2)
(name "rust-tracing-subscriber")
(version "0.1.6")
(source
@@ -33274,7 +37175,6 @@ with tracing (optional, enabled by the env-logger feature).
(sha256
(base32
"0i9fhlyz8mn2znpgmi5bv9y24pwpkkgfxs0rwcf6dl6djmjs2b0r"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f ; Some test files missing.
#:cargo-inputs
@@ -33292,22 +37192,7 @@ with tracing (optional, enabled by the env-logger feature).
(("rust-criterion" ,rust-criterion-0.3)
("rust-log" ,rust-log-0.4)
("rust-tracing" ,rust-tracing-0.1)
- ("rust-tracing-log" ,rust-tracing-log-0.1))))
- (home-page "https://tokio.rs")
- (synopsis "Implement and compose tracing subscribers")
- (description
- "Utilities for implementing and composing tracing subscribers.
-
-Tracing is a framework for instrumenting Rust programs to collect
-scoped, structured, and async-aware diagnostics. The Subscriber trait
-represents the functionality necessary to collect this trace
-data. This crate contains tools for composing subscribers out of
-smaller units of behaviour, and batteries-included implementations of
-common subscriber functionality.
-
-Tracing-subscriber is intended for use by both Subscriber authors and
-application authors using tracing to instrument their applications.")
- (license license:expat)))
+ ("rust-tracing-log" ,rust-tracing-log-0.1))))))
(define-public rust-traitobject-0.1
(package
@@ -33389,6 +37274,40 @@ application authors using tracing to instrument their applications.")
extension for the Trust-DNS client to use DNS over HTTPS.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-https-0.18
+ (package
+ (inherit rust-trust-dns-https-0.19)
+ (name "rust-trust-dns-https")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-https" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "03dapd5larsjlpk6mr4xnm2sb0h7l6dg988wjnaxd8zfi5swq5nl"))))
+ (arguments
+ `(#:tests? #false ;network unreachable
+ #:cargo-inputs
+ (("rust-bytes" ,rust-bytes-0.5)
+ ("rust-data-encoding" ,rust-data-encoding-2)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-h2" ,rust-h2-0.2)
+ ("rust-http" ,rust-http-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)
+ ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18)
+ ("rust-typed-headers" ,rust-typed-headers-0.2)
+ ("rust-webpki" ,rust-webpki-0.21)
+ ("rust-webpki-roots" ,rust-webpki-roots-0.18))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.7)
+ ("rust-futures" ,rust-futures-0.3))))))
+
(define-public rust-trust-dns-https-0.3
(package
(inherit rust-trust-dns-https-0.19)
@@ -33456,6 +37375,28 @@ extension for the Trust-DNS client to use DNS over HTTPS.")
extension for the Trust-DNS client to use native-tls for TLS.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-native-tls-0.18
+ (package
+ (inherit rust-trust-dns-native-tls-0.19)
+ (name "rust-trust-dns-native-tls")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-native-tls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0rcg018vdd5chd4hcmjp753qjlf4k311nmrxa5ay2hxjllzmqd1y"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;missing files
+ #:cargo-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-native-tls" ,rust-native-tls-0.2)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-tls" ,rust-tokio-tls-0.3)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18))))))
+
(define-public rust-trust-dns-native-tls-0.6
(package
(inherit rust-trust-dns-native-tls-0.19)
@@ -33512,6 +37453,29 @@ extension for the Trust-DNS client to use native-tls for TLS.")
extension for the Trust-DNS client to use tokio-openssl for TLS.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-openssl-0.18
+ (package
+ (inherit rust-trust-dns-openssl-0.19)
+ (name "rust-trust-dns-openssl")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-openssl" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1870s27ifsdh9plgcwwbxzvlw17r3dn9v6s0zfryf6kfp9hzpfz2"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-openssl" ,rust-tokio-openssl-0.4)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18))
+ #:cargo-development-inputs
+ (("rust-openssl" ,rust-openssl-0.10)
+ ("rust-tokio" ,rust-tokio-0.2))))))
+
(define-public rust-trust-dns-openssl-0.6
(package
(inherit rust-trust-dns-openssl-0.19)
@@ -33579,6 +37543,41 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.")
foundational DNS protocol library for all Trust-DNS projects.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-proto-0.18
+ (package
+ (inherit rust-trust-dns-proto-0.19)
+ (name "rust-trust-dns-proto")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-proto" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1vmhw7vdaa6b7wfv438f272ijjl2qlpcp6b1myvif4iay8pp4fi5"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-async-trait" ,rust-async-trait-0.1)
+ ("rust-data-encoding" ,rust-data-encoding-2)
+ ("rust-enum-as-inner" ,rust-enum-as-inner-0.3)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-idna" ,rust-idna-0.2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-openssl" ,rust-openssl-0.10)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-ring" ,rust-ring-0.16)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-socket2" ,rust-socket2-0.3)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-url" ,rust-url-2))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.7)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-tokio" ,rust-tokio-0.2))))))
+
(define-public rust-trust-dns-proto-0.7
(package
(inherit rust-trust-dns-proto-0.19)
@@ -33671,6 +37670,44 @@ and AsyncResolver for supported resolution types. The Client can be used for
other queries.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-resolver-0.18
+ (package
+ (inherit rust-trust-dns-resolver-0.19)
+ (name "rust-trust-dns-resolver")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-resolver" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0cldg6y937il4kjk7rirgfhmk0chz41w7qys9h96skaznh4dzmvj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;network unreachable
+ #:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-0.1)
+ ("rust-failure" ,rust-failure-0.1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-ipconfig" ,rust-ipconfig-0.2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-lru-cache" ,rust-lru-cache-0.1)
+ ("rust-resolv-conf" ,rust-resolv-conf-0.6)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-trust-dns-https" ,rust-trust-dns-https-0.18)
+ ("rust-trust-dns-native-tls" ,rust-trust-dns-native-tls-0.18)
+ ("rust-trust-dns-openssl" ,rust-trust-dns-openssl-0.18)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)
+ ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18)
+ ("rust-webpki-roots" ,rust-webpki-roots-0.18))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.7)
+ ("rust-futures" ,rust-futures-0.3))))))
+
(define-public rust-trust-dns-resolver-0.11
(package
(inherit rust-trust-dns-resolver-0.19)
@@ -33720,7 +37757,8 @@ other queries.")
"1hj4fx2x4ncj7v8pf6bbn7634zq76hjigm1s2h6b6yjzzmz4yprn"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:tests? #false ;missing file
+ #:cargo-inputs
(("rust-futures" ,rust-futures-0.3)
("rust-log" ,rust-log-0.4)
("rust-rustls" ,rust-rustls-0.17)
@@ -33730,12 +37768,42 @@ other queries.")
("rust-webpki" ,rust-webpki-0.21))
#:cargo-development-inputs
(("rust-openssl" ,rust-openssl-0.10))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("openssl" ,openssl)))
(home-page "http://www.trust-dns.org/index.html")
(synopsis "rustls extension for the Trust-DNS client")
(description "Trust-DNS is a safe and secure DNS library. This is an
extension for the Trust-DNS client to use rustls for TLS.")
(license (list license:expat license:asl2.0))))
+(define-public rust-trust-dns-rustls-0.18
+ (package
+ (inherit rust-trust-dns-rustls-0.19)
+ (name "rust-trust-dns-rustls")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "trust-dns-rustls" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "19vhb0xsyr0wy4p0liwhv4rqmwv6szfmmid6439gq7wah1x1hzp4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false ;missing file
+ #:cargo-inputs
+ (("rust-futures" ,rust-futures-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-rustls" ,rust-rustls-0.16)
+ ("rust-tokio" ,rust-tokio-0.2)
+ ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
+ ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)
+ ("rust-webpki" ,rust-webpki-0.21))
+ #:cargo-development-inputs
+ (("rust-openssl" ,rust-openssl-0.10))))))
+
(define-public rust-trust-dns-rustls-0.6
(package
(inherit rust-trust-dns-rustls-0.19)
@@ -33813,7 +37881,7 @@ extension for the Trust-DNS client to use rustls for TLS.")
(define-public rust-trybuild-1
(package
(name "rust-trybuild")
- (version "1.0.23")
+ (version "1.0.38")
(source
(origin
(method url-fetch)
@@ -33822,7 +37890,7 @@ extension for the Trust-DNS client to use rustls for TLS.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "080j808nv6nyr1mmw23vwdp4rkk7r38nmms850rih8lsclc1pzr6"))))
+ "0l5kicbqkk8b9grdg5l2f2w9l47h0s1kjnv6lywvwk292236zc0p"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -33839,6 +37907,37 @@ extension for the Trust-DNS client to use rustls for TLS.")
"Test harness for ui tests of compiler diagnostics.")
(license (list license:expat license:asl2.0))))
+(define-public rust-tuikit-0.2
+ (package
+ (name "rust-tuikit")
+ (version "0.2.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tuikit" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "19f3jp12kqcx7aaykxbaj1j17zahd4drv049agpxaminr63w2sw4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; tests fail in the build environment.
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-nix" ,rust-nix-0.14)
+ ("rust-term" ,rust-term-0.5)
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
+ #:cargo-development-inputs
+ (("rust-env-logger" ,rust-env-logger-0.6))))
+ (home-page "https://github.com/lotabout/tuikit")
+ (synopsis "Toolkit for writing TUI applications")
+ (description
+ "This package provides a toolkit for writing TUI applications in Rust.")
+ (license license:expat)))
+
(define-public rust-typeable-0.1
(package
(name "rust-typeable")
@@ -34037,6 +38136,29 @@ with the Unicode character database.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-uds-windows-0.1
+ (package
+ (name "rust-uds-windows")
+ (version "0.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "uds-windows" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0mdv9xyrf8z8zr2py5drbilkncgrkg61axq6h7hcvgggklv9f14z"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
+ ("rust-tempdir" ,rust-tempdir-0.3)
+ ("rust-winapi" ,rust-winapi-0.2)
+ ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))
+ (home-page "https://github.com/haraldh/rust_uds_windows")
+ (synopsis "Unix Domain Sockets for Windows")
+ (description "This library integrates Unix Domain Sockets on Windows.")
+ (license license:expat)))
+
(define-public rust-ufmt-0.1
(package
(name "rust-ufmt")
@@ -34222,10 +38344,10 @@ including Canonical and Compatible Decomposition and Recomposition, as
described in Unicode Standard Annex #15.")
(license (list license:expat license:asl2.0))))
-(define-public rust-unicode-segmentation-1.6
+(define-public rust-unicode-segmentation-1
(package
(name "rust-unicode-segmentation")
- (version "1.6.0")
+ (version "1.7.1")
(source
(origin
(method url-fetch)
@@ -34234,11 +38356,12 @@ described in Unicode Standard Annex #15.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1h7d48mzpi8hwf5cvnq07warkv86pvapzzzf32hvbjsk20yiagp8"))))
+ "15n736z0pbj30pj44jb9s9rjavzrmx8v8pzdgsl5yfmfwrxjw3dv"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-development-inputs
- (("rust-quickcheck" ,rust-quickcheck-0.7))))
+ (("rust-bencher" ,rust-bencher-0.1)
+ ("rust-quickcheck" ,rust-quickcheck-0.7))))
(home-page "https://github.com/unicode-rs/unicode-segmentation")
(synopsis "Grapheme Cluster, Word and Sentence boundaries")
(description
@@ -34246,21 +38369,6 @@ described in Unicode Standard Annex #15.")
boundaries according to Unicode Standard Annex #29 rules.")
(license (list license:expat license:asl2.0))))
-(define-public rust-unicode-segmentation-1.3
- (package
- (inherit rust-unicode-segmentation-1.6)
- (name "rust-unicode-segmentation")
- (version "1.3.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "unicode-segmentation" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr"))))))
-
(define-public rust-unicode-width-0.1
(package
(name "rust-unicode-width")
@@ -34719,10 +38827,10 @@ Unix users and groups.")
first byte.")
(license license:expat)))
-(define-public rust-utf8parse-0.1
+(define-public rust-utf8parse-0.2
(package
(name "rust-utf8parse")
- (version "0.1.1")
+ (version "0.2.0")
(source
(origin
(method url-fetch)
@@ -34731,13 +38839,28 @@ first byte.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7"))))
+ "0wjkvy22cxg023vkmvq2wwkgqyqam0d4pjld3m13blfg594lnvlk"))))
(build-system cargo-build-system)
(home-page "https://github.com/jwilm/vte")
(synopsis "Table-driven UTF-8 parser")
(description "This package provides a table-driven UTF-8 parser.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-utf8parse-0.1
+ (package
+ (inherit rust-utf8parse-0.2)
+ (name "rust-utf8parse")
+ (version "0.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "utf8parse" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7"))))))
+
(define-public rust-uuid-0.8
(package
(name "rust-uuid")
@@ -34850,6 +38973,24 @@ first byte.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-vec-arena-1
+ (package
+ (name "rust-vec-arena")
+ (version "1.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "vec-arena" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "07866gmvn4cf2656bjf75nrmbnw4cj0cyqkv2wlmavzw5ndipz7a"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/smol-rs/vec-arena")
+ (synopsis "Simple object arena")
+ (description
+ "This package provides a simple object arena.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-vec-map-0.8
(package
(name "rust-vec-map")
@@ -35159,6 +39300,25 @@ updated when the crate version changes.")
specified across Unix and Windows platforms.")
(license (list license:expat license:asl2.0))))
+(define-public rust-waker-fn-1
+ (package
+ (name "rust-waker-fn")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "waker-fn" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1jpfiis0frk2b36krqvk8264kgxk2dyhfzjsr8g3wah1nii2qnwx"))))
+ (build-system cargo-build-system)
+ ;; (arguments `(#:skip-build? #t))
+ (home-page "https://github.com/stjepang/waker-fn")
+ (synopsis "Convert closures into wakers")
+ (description
+ "This package converts closures into wakers.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-walkdir-2
(package
(name "rust-walkdir")
@@ -35548,7 +39708,7 @@ attribute that is not in the shared backend crate.")
`(#:cargo-inputs
(("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1)
("rust-js-sys" ,rust-js-sys-0.3)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)
("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.3))))
@@ -35578,7 +39738,7 @@ attribute that is not in the shared backend crate.")
(("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1)
("rust-futures" ,rust-futures-0.1)
("rust-js-sys" ,rust-js-sys-0.3)
- ("rust-scoped-tls" ,rust-scoped-tls-1.0)
+ ("rust-scoped-tls" ,rust-scoped-tls-1)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3)
("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2))))))
@@ -35690,7 +39850,7 @@ attribute that is not in the shared backend crate.")
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-heck" ,rust-heck-0.3)
("rust-log" ,rust-log-0.4)
("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -35917,6 +40077,52 @@ with webpki.")
"This package provides a WebIDL Parser.")
(license license:expat)))
+(define-public rust-wepoll-sys-3
+ (package
+ (name "rust-wepoll-sys")
+ (version "3.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "wepoll-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1zvpkr4dz3ny0k20mg1wdlp8vawz5p4gnya7h8j24119m7g19jqg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;missing "winsock.h"
+ #:cargo-inputs
+ (("rust-cc" ,rust-cc-1))))
+ (home-page "https://gitlab.com/yorickpeterse/wepoll-sys")
+ (synopsis "Raw bindings to the @code{wepoll} library")
+ (description
+ "This crate provides unsafe Rust bindings to the @code{wepoll} library.")
+ (license license:mpl2.0)))
+
+(define-public rust-wepoll-sys-stjepang-1
+ (package
+ (name "rust-wepoll-sys-stjepang")
+ (version "1.0.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "wepoll-sys-stjepang" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "138pxc8k6wayyywnjcpk5nhywk3vk6h4i39fj8khpjlhy81vppqz"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #true ;missing "winsock.h"
+ #:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.53)
+ ("rust-cc" ,rust-cc-1))))
+ (home-page "https://github.com/stjepang/wepoll-sys-stjepang")
+ (synopsis "Fork of @code{wepoll-sys} with stjepang's patches")
+ (description
+ "This crate provides Rust bindings to @code{wepoll}, generated
+using @code{bindgen}.")
+ (license license:mpl2.0)))
+
(define-public rust-which-3
(package
(name "rust-which")
@@ -36375,6 +40581,26 @@ API.")
"Contains function definitions for the Windows API library ws2_32.")
(license license:expat)))
+(define-public rust-wyz-0.2
+ (package
+ (name "rust-wyz")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "wyz" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "05028bk49b2ix1lz22sj65fnlxr0f29j2klkaqjxp6az3c6hprl5"))))
+ (build-system cargo-build-system)
+ (home-page "https://myrrlyn.net/crates/wyz")
+ (synopsis "Collection of utility functions")
+ (description
+ "This package provides a collection of utility functions.")
+ (license license:expat)))
+
(define-public rust-x86-0.33
(package
(name "rust-x86")
@@ -36392,7 +40618,7 @@ API.")
#:cargo-inputs
(("rust-bit-field" ,rust-bit-field-0.10)
("rust-bitflags" ,rust-bitflags-1)
- ("rust-csv" ,rust-csv-1.1)
+ ("rust-csv" ,rust-csv-1)
("rust-phf" ,rust-phf-0.7)
("rust-phf-codegen" ,rust-phf-codegen-0.7)
("rust-raw-cpuid" ,rust-raw-cpuid-8)
@@ -36898,6 +41124,33 @@ formatters with per-field documentation generated for each structure.
;; User can choose either license.
(license (list license:expat license:asl2.0))))
+(define-public rust-piper-0.1
+ (package
+ (name "rust-piper")
+ (version "0.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "piper" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "062zdv9w7l5037g113bh7r72wmygz92ajzr0z41v3bqdd3x8nq01"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #false
+ #:cargo-inputs
+ (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3))
+ #:cargo-development-inputs
+ (("rust-futures" ,rust-futures-0.3))))
+ (home-page "https://crates.io/crates/piper")
+ (synopsis "Async pipes, channels, mutexes, and more")
+ (description
+ "This crate provides async pipes, channels, mutexes, and more.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-xmltree-0.8
(package
(name "rust-xmltree")
@@ -36939,7 +41192,7 @@ formatters with per-field documentation generated for each structure.
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-either" ,rust-either-1)
("rust-serde" ,rust-serde-1)
("rust-thiserror" ,rust-thiserror-1)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 399bc6440f..6683f1cd78 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -717,7 +717,7 @@ data on your platform, so the seed itself will be as random as possible.
(define-public crypto++
(package
(name "crypto++")
- (version "8.2.0")
+ (version "8.4.0")
(source (origin
(method url-fetch/zipbomb)
(uri (string-append "https://cryptopp.com/cryptopp"
@@ -725,7 +725,7 @@ data on your platform, so the seed itself will be as random as possible.
".zip"))
(sha256
(base32
- "0n40hlz5jkvlcp9vxrj0fsrcfp7dm0zmmv6h52dx3f8i5qjf5w03"))))
+ "16kvfm11xv7j9a3yykzysjgw38a9b7lnc5n5x5h82g395k6ybxf0"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 33a2188d70..3ceae4718a 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
;;;
@@ -243,43 +243,68 @@ not offer a replacement for libcurl.")
(define-public guile-curl
(package
(name "guile-curl")
- (version "0.6")
+ (version "0.7")
(source (origin
(method url-fetch)
(uri (string-append "http://www.lonelycactus.com/tarball/"
"guile_curl-" version ".tar.gz"))
(sha256
(base32
- "1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
+ "1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list (string-append
+ `(#:modules (((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ ,@%gnu-build-system-modules)
+ #:imported-modules ((guix build guile-build-system)
+ ,@%gnu-build-system-modules)
+ #:configure-flags (list (string-append
"--with-guilesitedir="
(assoc-ref %outputs "out")
- "/share/guile/site/2.2")
+ "/share/guile/site/"
+ (target-guile-effective-version
+ (assoc-ref %build-inputs "guile")))
(string-append
"-with-guileextensiondir="
(assoc-ref %outputs "out")
- "/lib/guile/2.2/extensions"))
+ "/lib/guile/"
+ (target-guile-effective-version
+ (assoc-ref %build-inputs "guile"))
+ "/extensions"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-undefined-references
+ (lambda* _
+ (substitute* "src/curl.scm"
+ ;; The following #defines are missing from our curl package
+ ;; and therefore result in the evaluation of undefined symbols.
+ ((",CURLOPT_HAPROXYPROTOCOL") "#f")
+ ((",CURLOPT_DISALLOW_USERNAME_IN_URL") "#f")
+ ((",CURLOPT_TIMEVALUE_LARGE") "#f")
+ ((",CURLOPT_DNS_SHUFFLE_ADDRESSES") "#f")
+ ((",CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS") "#f"))))
(add-after 'install 'patch-extension-path
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (curl.scm (string-append
- out "/share/guile/site/2.2/curl.scm"))
- (curl.go (string-append
- out "/lib/guile/2.2/site-ccache/curl.go"))
- (ext (string-append out "/lib/guile/2.2/"
- "extensions/libguile-curl")))
- (substitute* curl.scm (("libguile-curl") ext))
- ;; The build system does not actually compile the Scheme module.
- ;; So we can compile it and put it in the right place in one go.
- (invoke "guild" "compile" curl.scm "-o" curl.go)))))))
+ (let* ((out (assoc-ref outputs "out"))
+ (curl.scm (string-append
+ out "/share/guile/site/"
+ (target-guile-effective-version)
+ "/curl.scm"))
+ (curl.go (string-append
+ out "/lib/guile/"
+ (target-guile-effective-version)
+ "/site-ccache/curl.go"))
+ (ext (string-append out "/lib/guile/"
+ (target-guile-effective-version)
+ "/extensions/libguile-curl")))
+ (substitute* curl.scm (("libguile-curl") ext))
+ ;; The build system does not actually compile the Scheme module.
+ ;; So we can compile it and put it in the right place in one go.
+ (invoke "guild" "compile" curl.scm "-o" curl.go)))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)
- ("guile" ,guile-2.2)))
+ ("guile" ,guile-3.0)))
(home-page "http://www.lonelycactus.com/guile-curl.html")
(synopsis "Curl bindings for Guile")
(description "@code{guile-curl} is a project that has procedures that allow
@@ -287,6 +312,14 @@ Guile to do client-side URL transfers, like requesting documents from HTTP or
FTP servers. It is based on the curl library.")
(license license:gpl3+)))
+(define-public guile2.2-curl
+ (package
+ (inherit guile-curl)
+ (name "guile2.2-curl")
+ (inputs
+ `(("curl" ,curl)
+ ("guile" ,guile-2.2)))))
+
(define-public curlpp
(package
(name "curlpp")
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 6387132016..b49e287313 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -438,6 +438,12 @@ intelligible and easily correctable.")
("ncurses" ,ncurses)
("readline" ,readline)
("zlib" ,zlib)))
+ ;; If you use Guix to package and install dictionary data,
+ ;; you need this variable to load them.
+ (native-search-paths
+ (list (search-path-specification
+ (variable "STARDICT_DATA_DIR")
+ (files '("share/stardict/dic")))))
(home-page "https://dushistov.github.io/sdcv/")
(synopsis "Console version of StarDict")
(description "sdcv is simple text-based utility for work with dictionaries
diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm
index a33e238362..986e335861 100644
--- a/gnu/packages/digest.scm
+++ b/gnu/packages/digest.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,9 +22,44 @@
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system trivial)
#:use-module (guix utils)
#:use-module (ice-9 match))
+(define-public wyhash
+ (package
+ (name "wyhash")
+ (version "5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wangyi-fudan/wyhash")
+ (commit (string-append "wyhash_v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03ljs5iw9zrm3bydwggjvpwrcwmsd75h3dv1j4am4hw3h22cjdjc"))))
+ (build-system trivial-build-system) ;; source-only package
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((out (string-append (assoc-ref %outputs "out")))
+ (include (string-append out "/include"))
+ (doc (string-append out "/share/doc/" ,name "-" ,version))
+ (source (assoc-ref %build-inputs "source")))
+ (with-directory-excursion source
+ (install-file "wyhash.h" include)
+ (install-file "LICENSE" doc)
+ (install-file "README.md" doc))
+ #t))))
+ (home-page "https://github.com/wangyi-fudan/wyhash")
+ (synopsis "Embeddable hash function and random number generator")
+ (description "This package provides a portable hash function and random
+number generator suitable for use in data structures. Provided by default in
+Zig, V, and Nim programming language standard libraries.")
+ (license license:unlicense)))
+
(define-public xxhash
(package
(name "xxhash")
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c4f128d14a..3cc9601d21 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@@ -89,6 +89,73 @@
#:use-module (guix packages)
#:use-module (guix utils))
+(define-public bcache-tools
+ ;; The 1.1 release is a year old and missing new features & documentation.
+ (let ((commit "096d205a9f1be8540cbc5a468c0da8203023de70")
+ (revision "0"))
+ (package
+ (name "bcache-tools")
+ (version (git-version "1.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url (string-append "https://git.kernel.org/pub/scm/"
+ "linux/kernel/git/colyli/bcache-tools.git"))
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0r0vwg4vacz5zgsafk360xn7gi2scy01c79mkmjrdyxjfij5z3iy"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no test suite
+ #:make-flags
+ (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ (string-append "UDEVLIBDIR=" (assoc-ref %outputs "out")
+ "/lib/udev")
+ (string-append "DRACUTLIBDIR=" (assoc-ref %outputs "out")
+ "/lib/dracut")
+ (string-append "CC=" ,(cc-for-target)))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-before 'install 'fix-hard-coded-file-names
+ (lambda _
+ ;; Some rules still hard-code /usr.
+ (substitute* "Makefile"
+ (("/usr") "${PREFIX}"))
+ #t))
+ (add-before 'install 'create-target-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (for-each (lambda (dir)
+ (mkdir-p (string-append out dir)))
+ (list "/lib/udev/rules.d"
+ "/sbin"
+ "/share/man/man8"))
+ #t))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("util-linux:lib" ,util-linux "lib"))) ; libblkid
+ (home-page "https://bcache.evilpiepirate.org")
+ (synopsis "Tools for the Linux kernel block layer cache")
+ (description
+ "This package contains user-space utilities to create and inspect bcache
+partitions. It's rather minimal as bcache is designed to work well without
+configuration on any system.
+
+Linux's @acronym{bcache, block layer cache} lets one or more fast block devices,
+such as flash-based @acronym{SSDs, solid state drives}, to act as a cache for
+one or more slower (and inexpensive) devices, such as hard disk drives or
+redundant storage arrays. In fact, bcache intends to be a superior alternative
+to battery-backed RAID controllers.
+
+Bcache is designed around the performance characteristics of SSDs and tries to
+minimize write inflation. It's file-system agnostic and does both write-through
+and write-back caching.")
+ (license license:gpl2))))
+
(define-public udevil
(package
(name "udevil")
@@ -692,7 +759,7 @@ passphrases.")
(define-public ndctl
(package
(name "ndctl")
- (version "71")
+ (version "71.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -701,7 +768,7 @@ passphrases.")
(file-name (git-file-name name version))
(sha256
(base32
- "14vhldncflxgsam49ssn1x3h4m9xxw9dwyl748xajf1js33ph5av"))))
+ "1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index ef6e549d09..b6e5ab7d19 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 L p R n d n <guix@lprndn.info>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -57,7 +58,7 @@
(define-public sddm
(package
(name "sddm")
- (version "0.18.1")
+ (version "0.19.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -66,7 +67,7 @@
"sddm-" version ".tar.xz"))
(sha256
(base32
- "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"))))
+ "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index e8dedf1cdd..47bbd1a789 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
@@ -443,7 +443,7 @@ following formats:
(define-public cozy
(package
(name "cozy")
- (version "0.7.6")
+ (version "0.7.8")
(source
(origin
(method git-fetch)
@@ -452,7 +452,7 @@ following formats:
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1pg0djhg4p32vxfwf6bfals31zf93m56fx1x4q5jhhdwmll7xl6w"))))
+ (base32 "0z2wj9g32aa5g9pw81q49iv1smb6yvlv9zs0vrzbx6mw8cj3c5d2"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2ea7bc5811..962744263a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
@@ -34,7 +34,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
-;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018, 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
@@ -152,6 +152,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages libevent)
+ #:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages music)
#:use-module (gnu packages version-control)
@@ -1631,14 +1632,14 @@ incrementally confined in Isearch manner.")
(define emacs-emms-print-metadata
(package
(name "emacs-emms-print-metadata")
- (version "6.2")
+ (version "6.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"emms-" version ".tar"))
(sha256
- (base32 "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35"))))
+ (base32 "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("emms-print-metadata")
@@ -5401,30 +5402,28 @@ features:
(license license:gpl3+)))
(define-public emacs-company-math
- (let ((commit "600e49449644f6835f9dc3501bc58461999e8ab9")
- (revision "1"))
- (package
- (name "emacs-company-math")
- (version (git-version "1.3" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/vspinu/company-math")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh"))))
- (build-system emacs-build-system)
- (propagated-inputs
- `(("emacs-math-symbol-lists" ,emacs-math-symbol-lists)
- ("emacs-company" ,emacs-company)))
- (home-page "https://github.com/vspinu/company-math")
- (synopsis "Completion backends for Unicode math symbols and @code{LaTeX} tags")
- (description "This package provides a backend for use with
-@code{company-mode} allowing for completion of common math symbols.")
- (license license:gpl3+))))
+ (package
+ (name "emacs-company-math")
+ (version "1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/vspinu/company-math")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ `(("emacs-math-symbol-lists" ,emacs-math-symbol-lists)
+ ("emacs-company" ,emacs-company)))
+ (home-page "https://github.com/vspinu/company-math")
+ (synopsis "Completion backends for math symbols and @code{LaTeX} tags")
+ (description
+ "This package provides a backend for use with Company mode allowing for
+completion of common math symbols.")
+ (license license:gpl3+)))
(define-public emacs-compdef
(let ((commit "67104a38763cc819644f711248b170a43bce151b")
@@ -9530,61 +9529,64 @@ CIDER).")
(define-public emacs-sly
;; Update together with sbcl-slynk.
- (package
- (name "emacs-sly")
- (version "1.0.42")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/joaotavora/sly")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "10l867c4hgcpiajcfkz9g9vabp7y4bcgy51la6n9pqxrlg1fs455"))))
- (build-system emacs-build-system)
- (native-inputs
- `(("texinfo" ,texinfo)))
- (arguments
- `(#:include (cons* "^contrib\\/" "^lib\\/" "^slynk\\/" %default-include)
- #:phases
- ;; The package provides autoloads.
- (modify-phases %standard-phases
- (delete 'make-autoloads)
- (add-before 'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (info-dir (string-append out "/share/info"))
- (doc-dir (string-append out "/share/doc/"
- ,name "-" ,version))
- (doc-files '( ;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below.
- "README.md" "NEWS.md" "PROBLEMS.md"
- "CONTRIBUTING.md")))
- (with-directory-excursion "doc"
- (substitute* "Makefile"
- (("infodir=/usr/local/info")
- (string-append "infodir=" info-dir))
- ;; Don't rebuild contributors.texi since we are not in
- ;; the git repo.
- (("contributors.texi: Makefile texinfo-tabulate.awk")
- "contributors.texi:"))
- (invoke "make" "html/index.html")
- (invoke "make" "sly.info")
- ;; TODO: We need minimal texlive with "preprint" package
- ;; (for fullpage.sty). (invoke "make" "sly-refcard.pdf")
- (install-file "sly.info" info-dir)
- (copy-recursively "html" (string-append doc-dir "/html")))
- (for-each (lambda (f)
- (install-file f doc-dir)
- (delete-file f))
- doc-files)
- (delete-file-recursively "doc")
- #t))))))
- (home-page "https://github.com/joaotavora/sly")
- (synopsis "Sylvester the Cat's Common Lisp IDE")
- (description
- "SLY is Sylvester the Cat's Common Lisp IDE. SLY is a fork of SLIME, and
+ (let ((commit "dffdf3caa12e964127d6eb45ba92ac0442cc5a48"))
+ ;; Latest stable 1.0.42 is broken:
+ ;; https://github.com/joaotavora/sly/issues/394.
+ (package
+ (name "emacs-sly")
+ (version (git-version "1.0.43" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/joaotavora/sly")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn"))))
+ (build-system emacs-build-system)
+ (native-inputs
+ `(("texinfo" ,texinfo)))
+ (arguments
+ `(#:include (cons* "^contrib\\/" "^lib\\/" "^slynk\\/" %default-include)
+ #:phases
+ ;; The package provides autoloads.
+ (modify-phases %standard-phases
+ (delete 'make-autoloads)
+ (add-before 'install 'install-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (info-dir (string-append out "/share/info"))
+ (doc-dir (string-append out "/share/doc/"
+ ,name "-" ,version))
+ (doc-files '( ;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below.
+ "README.md" "NEWS.md" "PROBLEMS.md"
+ "CONTRIBUTING.md")))
+ (with-directory-excursion "doc"
+ (substitute* "Makefile"
+ (("infodir=/usr/local/info")
+ (string-append "infodir=" info-dir))
+ ;; Don't rebuild contributors.texi since we are not in
+ ;; the git repo.
+ (("contributors.texi: Makefile texinfo-tabulate.awk")
+ "contributors.texi:"))
+ (invoke "make" "html/index.html")
+ (invoke "make" "sly.info")
+ ;; TODO: We need minimal texlive with "preprint" package
+ ;; (for fullpage.sty). (invoke "make" "sly-refcard.pdf")
+ (install-file "sly.info" info-dir)
+ (copy-recursively "html" (string-append doc-dir "/html")))
+ (for-each (lambda (f)
+ (install-file f doc-dir)
+ (delete-file f))
+ doc-files)
+ (delete-file-recursively "doc")
+ #t))))))
+ (home-page "https://github.com/joaotavora/sly")
+ (synopsis "Sylvester the Cat's Common Lisp IDE")
+ (description
+ "SLY is Sylvester the Cat's Common Lisp IDE. SLY is a fork of SLIME, and
contains the following improvements over it:
@enumerate
@@ -9603,7 +9605,7 @@ highlight the object and remain stable throughout the REPL session;
SLY tracks SLIME's bugfixes and all its familiar features (debugger, inspector,
xref, etc.) are still available, but with better integration.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-sly-quicklisp
(let ((commit "01ebe3976a244309f2e277c09206831135a0b66c")
@@ -9734,7 +9736,7 @@ inside the source file.")
(license license:gpl3+))))
(define-public emacs-sly-stepper
- (let ((commit "cd7fd00f9a701246e2a9ba8c37166dcae2fde04e"))
+ (let ((commit "ec3c0a7f3c8b82926882e5fcfdacf67b86d989f8"))
(package
(name "emacs-sly-stepper")
(version (git-version "0.0.0" "1" commit))
@@ -9748,8 +9750,10 @@ inside the source file.")
(file-name (git-file-name name version))
(sha256
(base32
- "09ll9dv8fd5dgnki82hcd48nm4qdzzn8wpva0zzr69zkjwzf9v25"))))
+ "1hxniaxifdw3m4y4yssgy22xcmmf558wx7rpz66wy5hwybjslf7b"))))
(build-system emacs-build-system)
+ (inputs
+ `(("cl-agnostic-lizard" ,cl-agnostic-lizard)))
(propagated-inputs
`(("emacs-sly" ,emacs-sly)))
(arguments
@@ -9765,7 +9769,22 @@ inside the source file.")
(setenv "EMACSLOADPATH"
(string-append sly "/share/emacs/site-lisp/contrib:"
(getenv "EMACSLOADPATH"))))
- #t)))))
+ #t))
+ (add-after 'install 'find-agnostic-lizard
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (file (string-append out "/share/emacs/site-lisp/"
+ "slynk-stepper.lisp"))
+ (asd (string-append
+ (assoc-ref inputs "cl-agnostic-lizard")
+ "/share/common-lisp/systems/agnostic-lizard.asd")))
+ ;; agnostic-lizard is found at runtime.
+ (substitute* file
+ (("\\(require :asdf\\)")
+ (string-append
+ "(require :asdf)\n"
+ " (funcall (read-from-string \"asdf:load-asd\")\n"
+ " \"" asd "\")\n")))))))))
(synopsis "Portable Common Lisp stepper interface for Emacs")
(description
"This package features a new, portable, visual stepping facility for
@@ -12902,8 +12921,8 @@ additions:
(license license:gpl3+))))
(define-public emacs-dired-sidebar
- (let ((commit "21ccb6723bea69f2e2ca25998268d8a039f904cc")
- (revision "1"))
+ (let ((commit "da77919081d9a4e73c2df63542353319381e4f89")
+ (revision "2"))
(package
(name "emacs-dired-sidebar")
(home-page "https://github.com/jojojames/dired-sidebar")
@@ -12914,7 +12933,7 @@ additions:
(file-name (git-file-name name version))
(sha256
(base32
- "0mck4qk6srbbf8xnn2sg11j822z4ybxvgavvy402d5sli515i8ca"))))
+ "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dired-subtree" ,emacs-dired-hacks)))
@@ -13703,14 +13722,14 @@ let users kill or mark things easily.")
(define-public emacs-csv-mode
(package
(name "emacs-csv-mode")
- (version "1.12")
+ (version "1.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"csv-mode-" version ".tar"))
(sha256
- (base32 "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j"))))
+ (base32 "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/csv-mode.html")
(synopsis "Major mode for editing comma/char separated values")
@@ -14163,7 +14182,7 @@ Lisp.")
(define-public emacs-esxml
(package
(name "emacs-esxml")
- (version "0.3.4")
+ (version "0.3.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -14172,7 +14191,7 @@ Lisp.")
(file-name (git-file-name name version))
(sha256
(base32
- "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"))))
+ "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@@ -14446,7 +14465,7 @@ directories of plain text notes, inspired by Notational Velocity.")
(define-public emacs-anzu
(package
(name "emacs-anzu")
- (version "0.62")
+ (version "0.64")
(source
(origin
(method git-fetch)
@@ -14455,7 +14474,7 @@ directories of plain text notes, inspired by Notational Velocity.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan"))))
+ (base32 "1jfn5nm6r68wa0gn2k2zy6sdq6c8shw8x04ylzzm5cw7zm60jw0n"))))
(build-system emacs-build-system)
(home-page "https://github.com/syohex/emacs-anzu")
(synopsis "Show number of matches in mode-line while searching")
@@ -18420,31 +18439,28 @@ server using XML-RPC.")
(license license:gpl3+)))
(define-public emacs-xml-rpc
- (let ((commit "8f624f8b964e9145acb504e4457c9510e87dd93c")
- (revision "1"))
- (package
- (name "emacs-xml-rpc")
- (version (git-version "1.6.12" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hexmode/xml-rpc-el")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj"))))
- (build-system emacs-build-system)
- (home-page "https://github.com/hexmode/xml-rpc-el")
- (synopsis "XML-RPC client for Emacs")
- (description "This package provides an XML-RPC client for Emacs capable
+ (package
+ (name "emacs-xml-rpc")
+ (version "1.6.15")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hexmode/xml-rpc-el")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07vgwnk96i1vpsv2glg6kbkamjcs72xiznsa6xk7nl0nranzr3hd"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/hexmode/xml-rpc-el")
+ (synopsis "XML-RPC client for Emacs")
+ (description "This package provides an XML-RPC client for Emacs capable
of both synchronous and asynchronous method calls using the @code{url}
package's async retrieval functionality. @file{xml-rpc.el} represents XML-RPC
datatypes as Lisp values, automatically converting to and from the XML
datastructures as needed, both for method parameters and return values, making
using XML-RPC methods fairly transparent to the Lisp code.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-xpm
(package
@@ -20754,8 +20770,8 @@ stored playlists.")
(license license:gpl3+)))
(define-public emacs-vterm
- (let ((version "0")
- (revision "4")
+ (let ((version "0.0.1")
+ (revision "0")
(commit "a670b786539d3c8865d8f68fe0c67a2d4afbf1aa"))
(package
(name "emacs-vterm")
@@ -23067,16 +23083,16 @@ work.")
(define-public emacs-xterm-color
(package
(name "emacs-xterm-color")
- (version "1.9")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/atomontage/xterm-color")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm"))))
+ (version "2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/atomontage/xterm-color")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397"))))
(build-system emacs-build-system)
(home-page "https://github.com/atomontage/xterm-color")
(synopsis "ANSI & xterm-256 color text property translator for Emacs")
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 4543249015..1d94090f48 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
@@ -1552,7 +1552,7 @@ This is a part of the TiLP project.")
(define-public mame
(package
(name "mame")
- (version "0.226")
+ (version "0.227")
(source
(origin
(method git-fetch)
@@ -1561,7 +1561,7 @@ This is a part of the TiLP project.")
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
- (base32 "1yfns42rk1l0qprj5ksj9fqsgqpa23xnzxf29r4434p4n18bb77v"))
+ (base32 "0p7xhsahmkr5hh3j6hc1mpgi5z4navy77v4k35i0sgpdv1ax4y2l"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fbec628c0e..5166a4635c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2514,121 +2514,110 @@ full programmatic control over your models.")
(license license:gpl2+)))
(define-public freecad
- (package
- (name "freecad")
- (version "0.18.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/FreeCAD/FreeCAD")
- (commit version)))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix build with Python 3.8, see
- ;; <https://tracker.freecadweb.org/view.php?id=4143>.
- (substitute* "src/Base/swigpyrun.inl"
- (("PyObject \\*modules = interp->modules;")
- "PyObject *modules = PyEval_GetBuiltins();"))
- #t))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0r31jzzkamf76l19fb175hhv48irk06fpi8ldxdlr31w8c1ix4aa"))))
- (build-system qt-build-system)
- (native-inputs
- `(("doxygen" ,doxygen)
- ("graphviz" ,graphviz)
- ("qttools" ,qttools)
- ("pkg-config" ,pkg-config)
- ("swig" ,swig)))
- (inputs
- `(("boost" ,boost)
- ("coin3D" ,coin3D)
- ("eigen" ,eigen)
- ("freetype" ,freetype)
- ("glew" ,glew)
- ("hdf5" ,hdf5-1.10)
- ("libarea" ,libarea)
- ("libmedfile" ,libmedfile)
- ("libspnav" ,libspnav)
- ("libxi" ,libxi)
- ("libxmu" ,libxmu)
- ("openmpi" ,openmpi)
- ("opencascade-occt" ,opencascade-occt)
- ("python-matplotlib" ,python-matplotlib)
- ("python-pyside-2" ,python-pyside-2)
- ("python-pyside-2-tools" ,python-pyside-2-tools)
- ("python-shiboken-2" ,python-shiboken-2)
- ("python-wrapper" ,python-wrapper)
- ("qtbase" ,qtbase)
- ("qtsvg" ,qtsvg)
- ("qtx11extras" ,qtx11extras)
- ("qtxmlpatterns" ,qtxmlpatterns)
- ;; qtwebkit is optional. We remove it currently, because it takes
- ;; much time to compile and substitutes are often unavailable
- ;;("qtwebkit" ,qtwebkit)
- ("tbb" ,tbb)
- ("vtk" ,vtk)
- ("xerces-c" ,xerces-c)
- ("zlib" ,zlib)))
- (arguments
- `(#:tests? #f
- #:configure-flags
- (list
- "-DBUILD_QT5=ON"
- (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
-
- (string-append "-DPYSIDE2UICBINARY="
- (assoc-ref %build-inputs "python-pyside-2-tools")
- "/bin/uic")
- (string-append "-DPYSIDE2RCCBINARY="
- (assoc-ref %build-inputs "python-pyside-2-tools")
- "/bin/rcc")
-
- "-DPYSIDE_LIBRARY=PySide2::pyside2"
- (string-append
- "-DPYSIDE_INCLUDE_DIR="
- (assoc-ref %build-inputs "python-pyside-2") "/include;"
- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
-
- "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
- (string-append "-DSHIBOKEN_INCLUDE_DIR="
- (assoc-ref %build-inputs "python-shiboken-2")
- "/include/shiboken2"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'restore-pythonpath
- (lambda _
- (substitute* "src/Main/MainGui.cpp"
- (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
- #t))
- (add-after 'install 'wrap-pythonpath
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/FreeCAD")
- (list "PYTHONPATH"
- 'prefix (list (getenv "PYTHONPATH")))))
- #t)))))
- (home-page "https://www.freecadweb.org/")
- (synopsis "Your Own 3D Parametric Modeler")
- (description
- "FreeCAD is a general purpose feature-based, parametric 3D modeler for
+ (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")
+ (revision "1"))
+ (package
+ (name "freecad")
+ (version (git-version "0.18.5" revision commit-ref))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/FreeCAD/FreeCAD")
+ (commit commit-ref)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("graphviz" ,graphviz)
+ ("qttools" ,qttools)
+ ("pkg-config" ,pkg-config)
+ ("python-pyside-2-tools" ,python-pyside-2-tools)
+ ("swig" ,swig)))
+ (inputs
+ `(("boost" ,boost)
+ ("coin3D" ,coin3D)
+ ("eigen" ,eigen)
+ ("freetype" ,freetype)
+ ("glew" ,glew)
+ ("hdf5" ,hdf5-1.10)
+ ("libarea" ,libarea)
+ ("libmedfile" ,libmedfile)
+ ("libspnav" ,libspnav)
+ ("libxi" ,libxi)
+ ("libxmu" ,libxmu)
+ ("openmpi" ,openmpi)
+ ("opencascade-occt" ,opencascade-occt)
+ ("python-matplotlib" ,python-matplotlib)
+ ("python-pyside-2" ,python-pyside-2)
+ ("python-shiboken-2" ,python-shiboken-2)
+ ("python-pivy" ,python-pivy)
+ ("python-wrapper" ,python-wrapper)
+ ("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)
+ ("qtx11extras" ,qtx11extras)
+ ("qtxmlpatterns" ,qtxmlpatterns)
+ ("qtwebkit" ,qtwebkit)
+ ("tbb" ,tbb)
+ ("vtk" ,vtk)
+ ("xerces-c" ,xerces-c)
+ ("zlib" ,zlib)))
+ (arguments
+ `(#:tests? #f
+ #:configure-flags
+ (list
+ "-DBUILD_QT5=ON"
+ (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
+ (string-append "-DPYSIDE2UICBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/uic")
+ (string-append "-DPYSIDE2RCCBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/rcc")
+ "-DPYSIDE_LIBRARY=PySide2::pyside2"
+ (string-append
+ "-DPYSIDE_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-pyside-2") "/include;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
+ "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
+ (string-append "-DSHIBOKEN_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-shiboken-2")
+ "/include/shiboken2"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'restore-pythonpath
+ (lambda _
+ (substitute* "src/Main/MainGui.cpp"
+ (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
+ #t))
+ (add-after 'install 'wrap-pythonpath
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/FreeCAD")
+ (list "PYTHONPATH"
+ 'prefix (list (getenv "PYTHONPATH")))))
+ #t)))))
+ (home-page "https://www.freecadweb.org/")
+ (synopsis "Your Own 3D Parametric Modeler")
+ (description
+ "FreeCAD is a general purpose feature-based, parametric 3D modeler for
CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and
product design but also fits a wider range of uses in engineering, such as
architecture or other engineering specialties. It is 100% Open Source (LGPL2+
license) and extremely modular, allowing for very advanced extension and
customization.")
- (license
- (list
- license:lgpl2.1+
- license:lgpl2.0+
- license:gpl3+
- license:bsd-3))))
+ (license
+ (list
+ license:lgpl2.1+
+ license:lgpl2.0+
+ license:gpl3+
+ license:bsd-3)))))
(define-public libmedfile
(package
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 5ce2229a75..99309dd4a0 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
@@ -566,14 +566,14 @@ directories.
(define-public evisum
(package
(name "evisum")
- (version "0.5.7")
+ (version "0.5.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.enlightenment.org/rel/apps/"
"evisum/evisum-" version ".tar.xz"))
(sha256
- (base32 "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"))))
+ (base32 "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"))))
(build-system meson-build-system)
(arguments
'(#:tests? #f)) ; no tests
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index d52edf1750..18d7d4ee34 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -19,11 +19,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages fcitx)
- #:use-module ((guix licenses) #:select (gpl2+))
+ #:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system qt)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
@@ -33,14 +35,69 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg))
+
+(define-public fcitx-qt5
+ (package
+ (name "fcitx-qt5")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/fcitx/fcitx-qt5.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-dir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "quickphrase-editor/CMakeLists.txt"
+ (("\\$\\{FCITX4_ADDON_INSTALL_DIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/fcitx")))
+ (substitute* "platforminputcontext/CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_QTPLUGINDIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("fcitx" ,fcitx)
+ ("libintl" ,intltool)
+ ("libxkbcommon" ,libxkbcommon)))
+ (propagated-inputs
+ `(("qtbase" ,qtbase)))
+ (synopsis "Fcitx Qt5 Input Context")
+ (description "Fcitx support for Qt5")
+ (home-page "https://github.com/fcitx/fcitx-qt5/")
+ (license
+ (list
+ ;; Plugin
+ bsd-3
+ ;; Others
+ gpl2+))))
(define-public presage
(package
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 895ad069c5..2c5ad95d63 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
+;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -944,7 +945,8 @@ APFS.")
("openssl" ,openssl)
("python" ,python)
("python-cffi" ,python-cffi)
- ("util-linux" ,util-linux "lib")
+ ("util-linux" ,util-linux)
+ ("util-linux:lib" ,util-linux "lib")
("zlib" ,zlib)))
(home-page "https://zfsonlinux.org/")
(synopsis "Native ZFS on Linux")
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3a239d0d61..326df299a2 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1474,6 +1474,11 @@ entity management.")
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
+ ;; Fix data specific test failure
+ ;; https://reviews.bitcoinabc.org/rABC67bbd3d0aaee2952ff1cb5da51d1fd0b50c2b63a
+ (substitute* "src/test/rpc_tests.cpp"
+ (("1607731200") "9907731200"))
+
;; Disable utilprocess_tests because it never ends.
;; It looks like it tries to start /bin/sleep and waits until it
;; is in the list of running processes, but /bin/sleep doesn't
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index d5806cda36..11a8e6261b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Toni Reina <areina@riseup.net>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@@ -314,14 +314,14 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
(define-public font-liberation
(package
(name "font-liberation")
- (version "2.1.1")
+ (version "2.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/liberationfonts/liberation-fonts/"
- "files/4743886/liberation-fonts-ttf-" version ".tar.gz"))
+ "files/5722233/liberation-fonts-ttf-" version ".tar.gz"))
(sha256
- (base32 "1jkg8j8jx7ffj13z5ilw7dids99dyypljm1pv06ycmghw1pw3qlf"))))
+ (base32 "1q7qx9bpn1gqjh1zbb8n9fkzwz8skn41hyy61186g4c3y8q4js8l"))))
(build-system font-build-system)
(home-page "https://github.com/liberationfonts")
(synopsis "Fonts compatible with Arial, Times New Roman, and Courier New")
@@ -711,7 +711,7 @@ for use at smaller text sizes")))
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
- (version "13.0.04")
+ (version "13.0.05")
(source
(origin
(method url-fetch)
@@ -721,7 +721,7 @@ for use at smaller text sizes")))
(string-append "mirror://gnu/unifont/unifont-"
version "/unifont-" version ".tar.gz")))
(sha256
- (base32 "064ilpbnz62cwmpajszs2b08x2zg7yh9whlaiqhjzi7bir3im94j"))))
+ (base32 "0kkgagnyhl92pwgnvf1vjrc1ql8lk5khb125sz18ck8vnxk4i3pr"))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version
@@ -1787,7 +1787,7 @@ This package provides the TrueType fonts.")
(define-public font-jetbrains-mono
(package
(name "font-jetbrains-mono")
- (version "2.210")
+ (version "2.221")
(source
(origin
(method url-fetch)
@@ -1795,7 +1795,7 @@ This package provides the TrueType fonts.")
(string-append "https://github.com/JetBrains/JetBrainsMono/releases/"
"download/v" version "/JetBrainsMono-" version ".zip"))
(sha256
- (base32 "19wbggnmqs3k1wdqy7l7imnx23g7hh159pl32nz3mzz8s8sqfdix"))))
+ (base32 "1acrgv2q9vxviirpi01xy67pkkswyssw4dn5pgyvrnjxr85cgjrg"))))
(build-system font-build-system)
(arguments
`(#:phases
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 96c37791f6..96ba0026f9 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;;
@@ -348,7 +348,7 @@ FOSS FPGA place and route tool.")
(define-public gtkwave
(package
(name "gtkwave")
- (version "3.3.107")
+ (version "3.3.108")
(source
(origin
(method url-fetch)
@@ -358,7 +358,7 @@ FOSS FPGA place and route tool.")
(string-append "http://gtkwave.sourceforge.net/"
"gtkwave-" version ".tar.gz")))
(sha256
- (base32 "1ibnhn7w1awalsbndbb5nilbmih3i3dwfry95mq5sn221l5n7zj8"))))
+ (base32 "0fzbap72zm4ka6n85j0873fpaarrx199ay0kjw1avrs20hs4gr7c"))))
(build-system gnu-build-system)
(native-inputs
`(("gperf" ,gperf)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ef35349ec2..6dd37005ae 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2021,14 +2021,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("gtk+" ,gtk+)
- ("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator)
("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("libdbusmenu" ,libdbusmenu)))
(arguments
;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3")
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 79bb6ec7e3..fa7875d077 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@@ -163,21 +163,22 @@ is used in some video games and movies.")
(define-public deutex
(package
(name "deutex")
- (version "5.2.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/Doom-Utils/deutex"
- "/releases/download/v" version "/"
- "deutex-" version ".tar.xz"))
- (sha256
- (base32
- "07w3asqxx89wl2wfv1z3cak8v83h3ys3b39mq9qq4gyf3xdhs76n"))))
+ (version "5.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Doom-Utils/deutex"
+ "/releases/download/v" version "/"
+ "deutex-" version ".tar.zst"))
+ (sha256
+ (base32 "0psb2za6ldrlak7s8pjvli98ij5yiwjx8j1ms2v7rj9yadx0xv8h"))))
(build-system gnu-build-system)
(inputs
`(("libpng" ,libpng)))
(native-inputs
`(("asciidoc" ,asciidoc)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("zstd" ,zstd)))
(home-page "https://github.com/Doom-Utils/deutex")
(synopsis "WAD file composer for Doom and related games")
(description
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d1a076e091..2208ca4113 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -98,6 +98,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages curl)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cyrus-sasl)
@@ -133,6 +134,7 @@
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages javascript)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages less)
@@ -4218,7 +4220,7 @@ Transport Tycoon Deluxe.")
(define openrct2-objects
(package
(name "openrct2-objects")
- (version "1.0.9")
+ (version "1.0.20")
(source
(origin
(method url-fetch)
@@ -4226,7 +4228,7 @@ Transport Tycoon Deluxe.")
version "/objects.zip"))
(file-name (string-append name "-" version ".zip"))
(sha256
- (base32 "02apb8h553m7d6jvysgb1zahvxc1yzyygfca2iclb21b3fhpsas4"))))
+ (base32 "1q7a38kcwrfijav6app1gf253yfv8b0rljbkah8040y6i7snw9mw"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@@ -4258,7 +4260,7 @@ Transport Tycoon Deluxe.")
(define-public openrct2
(package
(name "openrct2")
- (version "0.2.6")
+ (version "0.3.2")
(source
(origin
(method git-fetch)
@@ -4267,7 +4269,7 @@ Transport Tycoon Deluxe.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"))))
+ (base32 "1fd32wniiy6qz2046ppqfj2sb3rf2qf086rf9v1bdhyj254d0b1z"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF"
@@ -4296,6 +4298,7 @@ Transport Tycoon Deluxe.")
(("-Werror") ""))
#t)))))
(inputs `(("curl" ,curl)
+ ("duktape" ,duktape)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("icu4c" ,icu4c)
@@ -4303,6 +4306,7 @@ Transport Tycoon Deluxe.")
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
+ ("nlohmann-json-cpp" ,nlohmann-json-cpp)
("openrct2-objects" ,openrct2-objects)
("openrct2-title-sequences" ,openrct2-title-sequences)
("openssl" ,openssl)
@@ -4938,7 +4942,7 @@ of war. Widelands also offers an Artificial Intelligence to challenge you.")
(define-public starfighter
(package
(name "starfighter")
- (version "2.3.3")
+ (version "2.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -4947,7 +4951,7 @@ of war. Widelands also offers an Artificial Intelligence to challenge you.")
version "-src.tar.gz"))
(sha256
(base32
- "0jz2lgvmp299nks6ajg2yxbx4xcaxlc4cpfr61861p7m7z2nv84y"))))
+ "0ips79j3sdy8wa64jqka0skbbqkzqiln9bbiiilh4z717q7vz9r5"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -5571,7 +5575,7 @@ for Un*x systems with X11.")
(define-public freeciv
(package
(name "freeciv")
- (version "2.6.2.1")
+ (version "2.6.3")
(source
(origin
(method url-fetch)
@@ -5583,7 +5587,7 @@ for Un*x systems with X11.")
(version-major+minor version) "/" version
"/freeciv-" version ".tar.bz2")))
(sha256
- (base32 "0pjqnwpxsirhyf5c4f1b9gxkqah0213wqaynklq84mahq41sq15x"))))
+ (base32 "1lgq7wcbhwpy2yqdw4biwfmp5q8fh7lhlwxcgm0fpaapfl12whvp"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index c0c1ef96c6..c682613ff1 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@@ -1559,15 +1559,14 @@ The API also works with MaxMind’s free GeoLite2 databases.")
(define-public routino
(package
(name "routino")
- (version "3.3.2")
+ (version "3.3.3")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.routino.org/download/routino-"
version ".tgz"))
(sha256
- (base32
- "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"))))
+ (base32 "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 2eb08da50f..1204dcee90 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019, 2020 Leo Prikler <leo.prikler@student.tugraz.at>
+;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
+;;; Copyright © 2020 Ellis Kenyo <me@elken.dev>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,12 +33,15 @@
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages inkscape)
+ #:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ssh)
@@ -46,56 +50,45 @@
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
-(define-public matcha-theme
+(define-public arc-icon-theme
(package
- (name "matcha-theme")
- (version "2020-05-09")
+ (name "arc-icon-theme")
+ (version "20161122")
(source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/vinceliuice/Matcha-gtk-theme")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"))))
- (build-system trivial-build-system)
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/horst3180/arc-icon-theme")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"))))
+ (build-system gnu-build-system)
(arguments
- '(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((out (assoc-ref %outputs "out"))
- (source (assoc-ref %build-inputs "source"))
- (bash (assoc-ref %build-inputs "bash"))
- (coreutils (assoc-ref %build-inputs "coreutils"))
- (themesdir (string-append out "/share/themes")))
- (setenv "PATH"
- (string-append coreutils "/bin:"
- (string-append bash "/bin:")))
- (copy-recursively source (getcwd))
- (patch-shebang "install.sh")
- (mkdir-p themesdir)
- (invoke "./install.sh" "-d" themesdir)
- #t))))
- (inputs
- `(("gtk-engines" ,gtk-engines)))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-configure-during-bootstrap
+ (lambda _
+ (substitute* "autogen.sh"
+ (("^\"\\$srcdir/configure\".*") ""))
+ #t)))))
(native-inputs
- `(("bash" ,bash)
- ("coreutils" ,coreutils)))
- (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell")
- (description "Matcha is a flat Design theme for GTK 3, GTK 2 and
-Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments
-like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
- (home-page "https://github.com/vinceliuice/matcha")
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+ ;; When Arc is missing an icon, it looks in the Moka icon theme for it.
+ (propagated-inputs
+ `(("moka-icon-theme" ,moka-icon-theme)))
+ (synopsis "Arc icon theme")
+ (description "The Arc icon theme provides a set of icons matching the
+style of the Arc GTK theme. Icons missing from the Arc theme are provided by
+the Moka icon theme.")
+ (home-page "https://github.com/horst3180/arc-icon-theme")
(license license:gpl3+)))
(define-public delft-icon-theme
(package
(name "delft-icon-theme")
- (version "1.12")
+ (version "1.14")
(source
(origin
(method git-fetch)
@@ -104,7 +97,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
(commit (string-append "v" version))))
(sha256
(base32
- "1r6b6jf793jxz15ljniwbqy3vcvsl2712qiigfrfrm46fdxlshjd"))
+ "1iw85cxx9lv7irs28qi3815dk9f9vldv2j7jf1x5l1dqzwaxgwpb"))
(file-name (git-file-name name version))))
(build-system copy-build-system)
(arguments
@@ -125,6 +118,93 @@ which haven't been updated for some years. The new app icons are ported from
the Obsidian icon theme.")
(license license:gpl3)))
+(define-public faba-icon-theme
+ (package
+ (name "faba-icon-theme")
+ (version "4.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snwh/faba-icon-theme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'disable-post-install
+ (lambda _
+ (substitute* "meson.build"
+ (("meson.add_install_script.*") "")))))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+ (synopsis "Faba icon theme")
+ (description
+ "Faba is a minimal icon set used as a basis for other themes such as
+Moka")
+ (home-page "https://snwh.org/moka")
+ (license (list license:lgpl3+
+ license:cc-by-sa4.0))))
+
+(define-public moka-icon-theme
+ (package
+ (inherit faba-icon-theme)
+ (name "moka-icon-theme")
+ (version "5.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snwh/moka-icon-theme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"))))
+ (propagated-inputs
+ ;; Moka is based on Faba by using it as a fallback icon set instead of
+ ;; bundling it, so we need to add it as a propagated input.
+ `(("faba-icon-theme" ,faba-icon-theme)))
+ (synopsis "Moka icon theme")
+ (description "Moka is a stylized desktop icon set, designed to be clear,
+simple and consistent.")
+ (license (list license:gpl3+
+ license:cc-by-sa4.0))))
+
+(define-public papirus-icon-theme
+ (package
+ (name "papirus-icon-theme")
+ (version "20210101")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
+ (commit version)))
+ (sha256
+ (base32
+ "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f
+ #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'bootstrap)
+ (delete 'configure)
+ (delete 'build))))
+ (native-inputs
+ `(("gtk+:bin" ,gtk+ "bin")))
+ (home-page "https://git.io/papirus-icon-theme")
+ (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
+ (description "Papirus is a fork of the icon theme Paper with a lot of new icons
+and a few extra features.")
+ (license license:gpl3)))
+
(define-public gnome-shell-extension-appindicator
(package
(name "gnome-shell-extension-appindicator")
@@ -517,10 +597,54 @@ scrollable tiling of windows and per monitor workspaces. It's inspired by paper
notebooks and tiling window managers.")
(license license:gpl3)))
+(define-public arc-theme
+ (package
+ (name "arc-theme")
+ (version "20201013")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jnsh/arc-theme")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:configure-flags
+ (list "--disable-cinnamon")
+ #:phases
+ (modify-phases %standard-phases
+ ;; autogen.sh calls configure at the end of the script.
+ (replace 'bootstrap
+ (lambda _ (invoke "autoreconf" "-vfi")))
+ (add-before 'build 'set-home ;placate Inkscape
+ (lambda _
+ (setenv "HOME" (getcwd))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("glib" ,glib "bin") ; for glib-compile-resources
+ ("gnome-shell" ,gnome-shell)
+ ("gtk+" ,gtk+)
+ ("inkscape" ,inkscape)
+ ("optipng" ,optipng)
+ ("pkg-config" ,pkg-config)
+ ("sassc" ,sassc/libsass-3.5)))
+ (synopsis "A flat GTK+ theme with transparent elements")
+ (description "Arc is a flat theme with transparent elements for GTK 3, GTK
+2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments
+like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
+ (home-page "https://github.com/horst3180/arc-theme")
+ ;; No "or later" language found.
+ (license license:gpl3+)))
+
(define-public greybird-gtk-theme
(package
(name "greybird-gtk-theme")
- (version "3.22.12")
+ (version "3.22.13")
(source (origin
(method git-fetch)
(uri
@@ -530,7 +654,7 @@ notebooks and tiling window managers.")
(file-name (git-file-name name version))
(sha256
(base32
- "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"))))
+ "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"))))
(build-system meson-build-system)
(native-inputs
`(("gtk+" ,gtk+)
@@ -545,6 +669,78 @@ notebooks and tiling window managers.")
Shimmer Project. It supports GNOME, Unity, and Xfce.")
(license (list license:gpl2+ license:cc-by-sa3.0))))
+(define-public matcha-theme
+ (package
+ (name "matcha-theme")
+ (version "2021-01-01")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/vinceliuice/Matcha-gtk-theme")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r"))))
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((out (assoc-ref %outputs "out"))
+ (source (assoc-ref %build-inputs "source"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (coreutils (assoc-ref %build-inputs "coreutils"))
+ (themesdir (string-append out "/share/themes")))
+ (setenv "PATH"
+ (string-append coreutils "/bin:"
+ (string-append bash "/bin:")))
+ (copy-recursively source (getcwd))
+ (patch-shebang "install.sh")
+ (mkdir-p themesdir)
+ (invoke "./install.sh" "-d" themesdir)
+ #t))))
+ (inputs
+ `(("gtk-engines" ,gtk-engines)))
+ (native-inputs
+ `(("bash" ,bash)
+ ("coreutils" ,coreutils)))
+ (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell")
+ (description "Matcha is a flat Design theme for GTK 3, GTK 2 and
+Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments
+like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
+ (home-page "https://github.com/vinceliuice/matcha")
+ (license license:gpl3+)))
+
+(define-public materia-theme
+ (package
+ (name "materia-theme")
+ (version "20200916")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/nana-4/materia-theme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"))))
+ (build-system meson-build-system)
+ (native-inputs
+ `(("gtk+" ,gtk+)
+ ("sassc" ,sassc)))
+ (home-page "https://github.com/nana-4/materia-theme")
+ (synopsis "Material Design theme for a wide range of environments")
+ (description "Materia is a Material Design theme for GNOME/GTK based
+desktop environments. It supports GTK 2, GTK 3, GNOME Shell, Budgie,
+Cinnamon, MATE, Unity, Xfce, LightDM, GDM, Chrome theme, etc.")
+ (license license:gpl2+)))
+
(define-public numix-gtk-theme
(package
(name "numix-gtk-theme")
@@ -583,40 +779,6 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme))
-(define-public papirus-icon-theme
- (let ((version "0.0.0") ;; The package does not use semver
- (revision "2")
- (tag "20200602"))
- (package
- (name "papirus-icon-theme")
- (version (git-version version revision tag))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
- (commit tag)))
- (sha256
- (base32
- "0yv19kl8jr2jmh9018b1qmnq68alw84vrmb35jm462qd3qzzdgah"))
- (file-name (git-file-name name version))))
- (build-system gnu-build-system)
- (arguments
- '(#:tests? #f
- #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (delete 'bootstrap)
- (delete 'configure)
- (delete 'build))))
- (native-inputs
- `(("gtk+:bin" ,gtk+ "bin")))
- (home-page "https://git.io/papirus-icon-theme")
- (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
- (description "Papirus is a fork of the icon theme Paper with a lot of new icons
-and a few extra features.")
- (license license:gpl3))))
-
(define-public vala-language-server
(package
(name "vala-language-server")
@@ -649,3 +811,31 @@ language specification for the Language Server Protocol (LSP). This tool is
used in text editing environments to provide a complete and integrated
feature-set for programming Vala effectively.")
(license license:lgpl2.1+)))
+
+(define-public nordic-theme
+ (let ((commit "07d764c5ebd5706e73d2e573f1a983e37b318915")
+ (revision "0"))
+ (package
+ (name "nordic-theme")
+ (version (git-version "1.9.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/EliverLara/Nordic")
+ (commit commit)))
+ (sha256
+ (base32
+ "0y2s9d6h1b195s6afp1gb5rb1plfslkpbw2brd30a9d66wfvsqk0"))
+ (file-name (git-file-name name version))))
+ (build-system copy-build-system)
+ (arguments
+ `(#:install-plan
+ `(("." "share/themes/nord"
+ #:exclude ("README.md" "LICENSE" "Art/" "package.json"
+ "package-lock.json" "Gulpfile.js")))))
+ (home-page "https://github.com/EliverLara/Nordic")
+ (synopsis "Dark Gtk3.20+ theme using the Nord color pallete")
+ (description "Nordic is a Gtk3.20+ theme created using the Nord color
+pallete.")
+ (license license:gpl3))))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 55189d096f..3167b69f37 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
@@ -21,7 +21,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue>
@@ -56,6 +56,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
+;;; Copyright © 2020 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2840,7 +2841,7 @@ database is translated at Transifex.")
(define-public system-config-printer
(package
(name "system-config-printer")
- (version "1.5.13")
+ (version "1.5.14")
(source
(origin
(method url-fetch)
@@ -2849,7 +2850,7 @@ database is translated at Transifex.")
"download/v" version
"/system-config-printer-" version ".tar.xz"))
(sha256
- (base32 "18dqvi1s971lggkw6pv1sqxixlpg5a8rppzc1pxbanxa91jg18zf"))))
+ (base32 "1l79lj44kl079sk308m42x3py1yvcxk5x5bs2vqfmqv26zm8qyqf"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
@@ -3263,7 +3264,7 @@ library.")
(define-public librsvg-next
(package
(name "librsvg")
- (version "2.50.1")
+ (version "2.50.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/"
@@ -3271,7 +3272,7 @@ library.")
"librsvg-" version ".tar.xz"))
(sha256
(base32
- "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"))
+ "1lsnl08b5pjf01q3agixjd53islw5rqkc38r31rlmm2crrqz44b2"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "vendor")
@@ -3283,7 +3284,6 @@ library.")
((guix build cargo-build-system)
(guix build utils)
((guix build gnu-build-system) #:prefix gnu:))
- #:rust ,rust-1.40
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-cairo-rs" ,rust-cairo-rs-0.8)
@@ -5157,7 +5157,7 @@ output devices.")
(define-public geoclue
(package
(name "geoclue")
- (version "2.5.6")
+ (version "2.5.7")
(source
(origin
(method url-fetch)
@@ -5165,7 +5165,7 @@ output devices.")
(string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/"
version "/geoclue-" version ".tar.bz2"))
(sha256
- (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k"))
+ (base32 "09ww26a76kanldhgwnn5sqy9ly2940k45zpp68spykkv2zjdpivc"))
(patches (search-patches "geoclue-config.patch"))))
(build-system meson-build-system)
(arguments
@@ -9485,7 +9485,7 @@ existing databases over the internet.")
(define-public gnome-tweaks
(package
(name "gnome-tweaks")
- (version "3.34.0")
+ (version "3.34.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-tweaks/"
@@ -9495,7 +9495,7 @@ existing databases over the internet.")
(list (search-patch "gnome-tweaks-search-paths.patch")))
(sha256
(base32
- "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"))))
+ "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@@ -9570,141 +9570,6 @@ functionality and behavior.")
(home-page "https://extensions.gnome.org/")
(license license:gpl3+)))
-(define-public arc-theme
- (package
- (name "arc-theme")
- (version "20201013")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jnsh/arc-theme")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"))))
- (build-system gnu-build-system)
- (arguments
- '(#:configure-flags
- (list "--disable-cinnamon")
- #:phases
- (modify-phases %standard-phases
- ;; autogen.sh calls configure at the end of the script.
- (replace 'bootstrap
- (lambda _ (invoke "autoreconf" "-vfi")))
- (add-before 'build 'set-home ;placate Inkscape
- (lambda _
- (setenv "HOME" (getcwd))
- #t)))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("glib" ,glib "bin") ; for glib-compile-resources
- ("gnome-shell" ,gnome-shell)
- ("gtk+" ,gtk+)
- ("inkscape" ,inkscape)
- ("optipng" ,optipng)
- ("pkg-config" ,pkg-config)
- ("sassc" ,sassc/libsass-3.5)))
- (synopsis "A flat GTK+ theme with transparent elements")
- (description "Arc is a flat theme with transparent elements for GTK 3, GTK
-2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments
-like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
- (home-page "https://github.com/horst3180/arc-theme")
- ;; No "or later" language found.
- (license license:gpl3+)))
-
-(define-public faba-icon-theme
- (package
- (name "faba-icon-theme")
- (version "4.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/snwh/faba-icon-theme")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"))))
- (build-system meson-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'disable-post-install
- (lambda _
- (substitute* "meson.build"
- (("meson.add_install_script.*") "")))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)))
- (synopsis "Faba icon theme")
- (description
- "Faba is a minimal icon set used as a basis for other themes such as
-Moka")
- (home-page "https://snwh.org/moka")
- (license (list license:lgpl3+
- license:cc-by-sa4.0))))
-
-(define-public moka-icon-theme
- (package
- (inherit faba-icon-theme)
- (name "moka-icon-theme")
- (version "5.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/snwh/moka-icon-theme")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"))))
- (propagated-inputs
- ;; Moka is based on Faba by using it as a fallback icon set instead of
- ;; bundling it, so we need to add it as a propagated input.
- `(("faba-icon-theme" ,faba-icon-theme)))
- (synopsis "Moka icon theme")
- (description "Moka is a stylized desktop icon set, designed to be clear,
-simple and consistent.")
- (license (list license:gpl3+
- license:cc-by-sa4.0))))
-
-(define-public arc-icon-theme
- (package
- (name "arc-icon-theme")
- (version "20161122")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/horst3180/arc-icon-theme")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-configure-during-bootstrap
- (lambda _
- (substitute* "autogen.sh"
- (("^\"\\$srcdir/configure\".*") ""))
- #t)))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)))
- ;; When Arc is missing an icon, it looks in the Moka icon theme for it.
- (propagated-inputs
- `(("moka-icon-theme" ,moka-icon-theme)))
- (synopsis "Arc icon theme")
- (description "The Arc icon theme provides a set of icons matching the
-style of the Arc GTK theme. Icons missing from the Arc theme are provided by
-the Moka icon theme.")
- (home-page "https://github.com/horst3180/arc-icon-theme")
- (license license:gpl3+)))
-
(define-public folks
(package
(name "folks")
@@ -10860,32 +10725,37 @@ advanced image management tool")
(define-public terminator
(package
(name "terminator")
- (version "1.91")
+ (version "1.92")
(source (origin
(method url-fetch)
- (uri (string-append "https://launchpad.net/" name "/"
- "gtk3/" version "/" "+download/"
+ (uri (string-append "https://github.com/gnome-" name "/" name "/"
+ "releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
- "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm"))))
+ "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z"))))
(build-system python-build-system)
(native-inputs
- `(("intltool" ,intltool)
+ `(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
- ("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)))
+ ("gobject-introspection" ,gobject-introspection)
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)
+ ("python-psutil" ,python-psutil)
+ ("python-pytest-runner" ,python-pytest-runner)
+ ("python-pytest" ,python-pytest)))
(inputs
`(("cairo" ,cairo)
- ("gobject-introspection" ,gobject-introspection)
+ ("dbus-glib" ,dbus-glib)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("python2-pycairo" ,python2-pycairo)
- ("python2-pygobject" ,python2-pygobject)
- ("python2-psutil" ,python2-psutil)
+ ("gtk+" ,gtk+)
+ ("python-pycairo" ,python-pycairo)
+ ("python-pygobject" ,python-pygobject)
("vte" ,vte)))
+ (propagated-inputs
+ `(("python-configobj" ,python-configobj)))
(arguments
- `(#:python ,python-2 ; Python 3 isn't supported
- #:imported-modules ((guix build glib-or-gtk-build-system)
+ `(#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules)
#:modules ((guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@@ -10896,14 +10766,19 @@ advanced image management tool")
'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
- "/bin/terminator")))
+ "/bin/terminator"))
+ (pylib (string-append (assoc-ref outputs "out")
+ "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+ `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-after 'wrap-program 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
- (home-page "https://gnometerminator.blogspot.com/")
+ (home-page "https://gnome-terminator.org/")
(synopsis "Store and run multiple GNOME terminals in one window")
(description
"Terminator allows you to run multiple GNOME terminals in a grid and
diff --git a/gnu/packages/gobby.scm b/gnu/packages/gobby.scm
index 91484c7576..0e1910d7ce 100644
--- a/gnu/packages/gobby.scm
+++ b/gnu/packages/gobby.scm
@@ -1,6 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,7 +49,9 @@
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list "--disable-static")
+ #:phases
(modify-phases %standard-phases
(add-before 'configure 'update-gnutls-api
(lambda _
@@ -80,6 +84,9 @@
(base32
"0rwvp0kzsb8y6mq73rzb8yk4kvsrz64i2zf4lfqs3kh0x2k7n7bx"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "--disable-static")))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -177,7 +184,7 @@ together over the internet in real-time.")
(define-public libinfinity
(package
(name "libinfinity")
- (version "0.7.1")
+ (version "0.7.2")
(source
(origin
(method url-fetch)
@@ -185,7 +192,7 @@ together over the internet in real-time.")
version ".tar.gz"))
(sha256
(base32
- "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"))))
+ "17i3g61hxz9pzl3ryd1yr15142r25m06jfzjrpdy7ic1b8vjjw3f"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)
@@ -195,7 +202,8 @@ together over the internet in real-time.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
- `(#:configure-flags (list "--with-inftextgtk"
+ `(#:configure-flags (list "--disable-static"
+ "--with-inftextgtk"
"--with-infgtk")))
(home-page "https://gobby.github.io/")
(synopsis "Infininote protocol implementation")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c41ed0bb1a..d34bb1acb7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -487,6 +487,125 @@ jar struct to manage the cookies added to the cookie jar.")
(home-page "https://github.com/aki237/nscjar")
(license license:expat))))
+(define-public go-github-com-golangplus-fmt
+ (package
+ (name "go-github-com-golangplus-fmt")
+ (version "1.0.0")
+ (home-page "https://github.com/golangplus/fmt")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "07d5kxz0f8ss3v46y0c8jg02sagi0wlaaijhjzzp0r462jyzqii7"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/golangplus/fmt"))
+ (synopsis "Additions to Go's standard @code{fmt} package")
+ (description "This package provides additions to Go's stdlib @code{fmt}.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-motemen-go-colorine
+ (let ((commit "45d19169413a019e4e2be69629dde5c7d92f8706")
+ (revision "0"))
+ (package
+ (name "go-github-com-motemen-go-colorine")
+ (version (git-version "0.0.0" revision commit))
+ (home-page "https://github.com/motemen/go-colorine")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/motemen/go-colorine"))
+ (propagated-inputs
+ `(("github.com/daviddengcn/go-colortext" ,go-github-com-daviddengcn-go-colortext)))
+ (synopsis "Simple colorized console logger for golang")
+ (description
+ "This package provides simple colorized console logger for golang.")
+ (license license:expat))))
+
+(define-public go-github-com-daviddengcn-go-colortext
+ (package
+ (name "go-github-com-daviddengcn-go-colortext")
+ (version "1.0.0")
+ (home-page "https://github.com/daviddengcn/go-colortext")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0j5ldwg3a768d3nniiglghr9axj4p87k7f7asqxa1a688xvcms48"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/daviddengcn/go-colortext"))
+ (native-inputs
+ `(("go-github-com-golangplus-testing" ,go-github-com-golangplus-testing)))
+ (synopsis "Change the color of console text and background")
+ (description
+ "This is a package to change the color of the text and background in the
+console, working both under Windows and other systems.
+
+Under Windows, the console APIs are used. Otherwise, ANSI texts are output.")
+ ;; dual-licensed
+ (license (list license:bsd-3 license:expat))))
+
+(define-public go-github-com-golangplus-testing
+ (package
+ (name "go-github-com-golangplus-testing")
+ (version "1.0.0")
+ (home-page "https://github.com/golangplus/testing")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/golangplus/testing"))
+ (propagated-inputs
+ `(("go-github-com-golangplus-fmt" ,go-github-com-golangplus-fmt)))
+ (synopsis "Additions to Go's standard testing package")
+ (description "This package provides additions to Go's stdlib testing.")
+ (license license:bsd-3)))
+
+(define-public go-github-com-leodido-go-urn
+ (package
+ (name "go-github-com-leodido-go-urn")
+ (version "1.2.0")
+ (home-page "https://github.com/leodido/go-urn")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1d4g1vkhc1180l1n7q48vl84b27c7cziywml78cyijbcdz2f8vim"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/leodido/go-urn"))
+ (native-inputs
+ `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)))
+ (synopsis "Parser for uniform resource names as seen on RFC 2141")
+ (description
+ "This package implements a parser for uniform resource names (URN) as
+specified by @uref{https://tools.ietf.org/html/rfc2141, IETF RFC 2141}.")
+ (license license:expat)))
+
(define-public go-github.com-jessevdk-go-flags
(package
(name "go-github.com-jessevdk-go-flags")
@@ -512,6 +631,150 @@ way of specifying command line options.")
(home-page "https://github.com/jessevdk/go-flags")
(license license:bsd-3)))
+(define-public go-gopkg-in-go-playground-assert-v1
+ (package
+ (name "go-gopkg-in-go-playground-assert-v1")
+ (version "1.2.1")
+ (home-page "https://github.com/go-playground/assert")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "gopkg.in/go-playground/assert.v1"))
+ (synopsis "Basic assertion library used alongside native Go testing")
+ (description
+ "This package provides bassic assertions along with building blocks for
+custom assertions to be used alongside native Go testing.")
+ (license license:expat)))
+
+(define-public go-github-com-go-playground-locales
+ (package
+ (name "go-github-com-go-playground-locales")
+ (version "0.13.0")
+ (home-page "https://github.com/go-playground/locales")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0qydcpkvss3mf8mk3xzg6a34n8i69aydrigcl2apifrkx72jw7pf"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/go-playground/locales"))
+ (synopsis "Set of locales generated from the CLDR Unicode Project")
+ (description
+ "This package provides a set of locales generated from the
+@uref{http://cldr.unicode.org/, Unicode CLDR Project} which can be used
+independently or within an internalization (i18n) package. Its currently
+implemented features include
+
+@itemize
+@item Rules generated from the CLDR data, v31.0.3
+@item Contains Cardinal, Ordinal and Range Plural Rules
+@item Contains Month, Weekday and Timezone translations built in
+@item Contains Date & Time formatting functions
+@item Contains Number, Currency, Accounting and Percent formatting functions
+@item Supports the \"Gregorian\" calendar only
+@end itemize")
+ (license license:expat)))
+
+(define-public go-github-com-go-playground-universal-translator
+ (package
+ (name "go-github-com-go-playground-universal-translator")
+ (version "0.17.0")
+ (home-page "https://github.com/go-playground/universal-translator")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zdiaisb32iv4x93cpbqrgx8ll7sxh4hcd2iibpswy4bwvjbjlz6"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "github.com/go-playground/universal-translator"))
+ (propagated-inputs
+ `(("go-github-com-go-playground-locales" ,go-github-com-go-playground-locales)))
+ (synopsis "Translator using Unicode CLDR data and pluralization rules")
+ (description
+ "This package offers an Internalization Translator for Go using
+@uref{http://cldr.unicode.org/, Unicode CLDR Project} data and pluralization
+rules. Its currently implemented features include
+
+@itemize
+@item Rules generated from the CLDR data, v30.0.3
+@item Contains Cardinal, Ordinal and Range Plural Rules
+@item Contains Month, Weekday and Timezone translations built in
+@item Contains Date & Time formatting functions
+@item Contains Number, Currency, Accounting and Percent formatting functions
+@item Supports the \"Gregorian\" calendar only
+@item Support loading translations from files
+@item Exporting translations to file(s), mainly for getting them
+professionally translated
+@end itemize")
+ (license license:expat)))
+
+(define-public go-gopkg-in-go-playground-validator-v9
+ (package
+ (name "go-gopkg-in-go-playground-validator-v9")
+ (version "9.31.0")
+ (home-page "https://gopkg.in/go-playground/validator.v9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-playground/validator")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1f8c77s8kx9rip2jarv27x5s4xkcmanh4ndyhbcwvrhncs5rq061"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:import-path "gopkg.in/go-playground/validator.v9"))
+ (native-inputs
+ `(("go-gopkg-in-go-playground-assert-v1"
+ ,go-gopkg-in-go-playground-assert-v1)))
+ (propagated-inputs
+ `(("go-github-com-go-playground-universal-translator"
+ ,go-github-com-go-playground-universal-translator)
+ ("go-github-com-leodido-go-urn" ,go-github-com-leodido-go-urn)))
+ (synopsis "Validator for structs and individual fields based on tags")
+ (description
+ "This package implements value validations for structs and individual
+fields based on tags. It has the following unique features:
+
+@itemize
+@item Cross Field and Cross Struct validations by using validation tags or
+custom validators
+@item Slice, Array and Map diving, which allows any or all levels of a
+multidimensional field to be validated
+@item Ability to dive into both map keys and values for validation
+@item Handles type interface by determining it's underlying type prior to validation
+@item Handles custom field types such as sql driver
+@uref{https://golang.org/src/database/sql/driver/types.go?s=1210:1293#L29,
+Valuer}
+@item Alias validation tags, which allows for mapping of several validations
+to a single tag for easier defining of validations on structs
+@item Extraction of custom defined Field Name e.g. can specify to extract the
+JSON name while validating and have it available in the resulting FieldError
+@item Customizable i18n aware error messages.
+@item Default validator for the @uref{https://github.com/gin-gonic/gin, gin}
+web framework
+@end itemize")
+ (license license:expat)))
+
(define-public go-github-com-aws-sdk
(package
(name "go-github-com-aws-sdk")
@@ -800,6 +1063,18 @@ for the Go language.")
(home-page "https://go.googlesource.com/net")
(license license:bsd-3))))
+(define-public go-golang-org-x-net-html
+ (package
+ (inherit go-golang-org-x-net)
+ (name "go-golang.org-x-net-html")
+ (arguments
+ '(#:import-path "golang.org/x/net/html"
+ #:unpack-path "golang.org/x/net"))
+ (synopsis "HTML5-compliant tokenizer and parser")
+ (description
+ "This package provides an HTML5-compliant tokenizer and parser.")
+ (home-page "https://godoc.org/golang.org/x/net/html")))
+
(define-public go-golang-org-x-image
(let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
(revision "1"))
@@ -3325,6 +3600,23 @@ building command line apps in Go. The goal is to enable developers to write
fast and distributable command line applications in an expressive way.")
(license license:expat)))
+(define-public go-github-com-urfave-cli-v2
+ (package
+ (inherit go-github-com-urfave-cli)
+ (name "go-github-com-urfave-cli-v2")
+ (version "2.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/urfave/cli")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08pvn7gyfznni72xrxfh2x6xxa8ykr7l1ka278js8g8qkh71bj8l"))))
+ (arguments
+ '(#:import-path "github.com/urfave/cli/v2"))))
+
(define-public go-github-com-go-md2man
(package
(name "go-github-com-go-md2man")
@@ -6315,6 +6607,43 @@ systems can import this package to enable running programs as services without
modifying them.")
(license license:zlib)))
+(define-public go-github-com-goccy-yaml
+ (package
+ (name "go-github-com-goccy-yaml")
+ (version "1.8.0")
+ (home-page "https://github.com/goccy/go-yaml")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1nps58dwkd915mx35h5f0dc05b880b4fdl6dcjxpfmmbzyinvg38"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/goccy/go-yaml"))
+ (propagated-inputs
+ `(("go-github-com-fatih-color" ,go-github-com-fatih-color)
+ ("go-golang-org-x-xerrors" ,go-golang-org-x-xerrors)))
+ (native-inputs
+ `(("go-gopkg-in-go-playground-validator-v9"
+ ,go-gopkg-in-go-playground-validator-v9)))
+ (synopsis "YAML support for the Go language")
+ (description
+ "This package provides features beyond the
+@uref{https://github.com/go-yaml/yaml, defacto YAML library} including:
+
+@itemize
+@item Pretty format for error notifications
+@item Support Scanner or Lexer or Parser as public API
+@item Support Anchor and Alias to Marshaler
+@item Allow referencing elements declared in another file via anchors
+@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath)
+@end itemize")
+ (license license:expat)))
+
(define-public go-github.com-ulikunitz-xz
(package
(name "go-github.com-ulikunitz-xz")
@@ -6336,3 +6665,29 @@ modifying them.")
compressed streams in Go.")
(home-page "https://github.com/ulikunitz/xz")
(license license:bsd-3)))
+
+(define-public go-github-com-songmu-gitconfig
+ (package
+ (name "go-github-com-songmu-gitconfig")
+ (version "0.1.0")
+ (home-page "https://github.com/songmu/gitconfig")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk"))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/Songmu/gitconfig"
+ ;; Package's tests appear to be hardcoded to the author's gitconfig
+ ;; and require network access.
+ #:tests? #f))
+ (propagated-inputs
+ `(("go-github-com-goccy-yaml" ,go-github-com-goccy-yaml)))
+ (synopsis "Go library to get configuration values from gitconfig")
+ (description "@{gitconfig} is a package to get configuration values from gitconfig.")
+ (license license:expat)))
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index e0f489f8de..4fa3bcef19 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -6,6 +6,8 @@
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,24 +53,25 @@
(define-public gpsbabel
(package
(name "gpsbabel")
- (version "1.5.4")
+ (version "1.7.0")
(source (origin
- (method url-fetch)
- ;; XXX: Downloads from gpsbabel.org are hidden behind a POST, so
- ;; get it from elsewhere.
- (uri (string-append
- "mirror://debian/pool/main/g/gpsbabel/gpsbabel_"
- version ".orig.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gpsbabel/gpsbabel")
+ (commit (string-append
+ "gpsbabel_"
+ (string-replace-substring version "." "_")))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "19hykxhyl567gf8qcrl33qhv95w0g4vxw9r3h9b8d8plx9bnaf8l"))
- (patches (search-patches
- "gpsbabel-minizip.patch"
- ;; XXX: Remove this patch on the next release.
- "gpsbabel-qstring.patch"))
+ "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"))
+ (patches (search-patches "gpsbabel-fix-i686-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
+ (delete-file-recursively "zlib")
+ (substitute* "Makefile.in"
+ ((" zlib/z.*\\.h") ""))
;; Delete files under GPL-compatible licences but never used
;; on GNU systems, rather than bloating the LICENSE field.
(delete-file "gui/serial_mac.cc") ; Apple MIT
@@ -78,17 +81,12 @@
;; TODO: "make doc" requires Docbook & co.
(arguments
`(#:configure-flags
- '("--with-zlib=system")
- ;; On i686, 'raymarine.test' fails because of a rounding error:
- ;; <http://hydra.gnu.org/build/133040>. As a workaround, disable tests
- ;; on these platforms.
- ;; FIXME: On x86_64 with -std=gnu++11 tests also fail due to rounding
- ;; error.
- #:tests? #f))
+ '("--with-zlib=system")))
(inputs
`(("expat" ,expat)
- ("zlib" ,zlib)
- ("qtbase" ,qtbase)))
+ ("libusb" ,libusb)
+ ("qtbase" ,qtbase)
+ ("zlib" ,zlib)))
(native-inputs
`(("which" ,which)
("qttools" ,qttools)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index def3dc6913..9879130e20 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
@@ -166,7 +166,7 @@ application-facing EGL functions.")
(define-public egl-wayland
(package
(name "egl-wayland")
- (version "1.1.5")
+ (version "1.1.6")
(source
(origin
(method git-fetch)
@@ -177,7 +177,7 @@ application-facing EGL functions.")
(file-name
(git-file-name name version))
(sha256
- (base32 "09r6a69z75j3hb9751g3ap4gm1xn71aw3j7z0c7jns292cnaa76n"))))
+ (base32 "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"))))
(build-system meson-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -289,7 +289,7 @@ framebuffer graphics, audio output and input event.")
(description "DirectFB is a graphics library which was designed with embedded
systems in mind. It offers maximum hardware accelerated performance at a
minimum of resource usage and overhead.")
- (home-page "http://www.directfb.org/")
+ (home-page "https://github.com/deniskropp/DirectFB")
(license license:lgpl2.1+)))
(define-public flux
@@ -1732,6 +1732,59 @@ standard graphics library for 3D visualization and visual simulation
software in the scientific and engineering community.")
(license license:bsd-3))))
+(define-public coin3D-4
+ (package
+ (name "coin3D")
+ (version "4.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coin3d/coin")
+ (commit (string-append "Coin-" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete binaries
+ (for-each delete-file
+ '("cfg/csubst.exe"
+ "cfg/wrapmsvc.exe"))
+ ;; Delete references to packaging tool cpack. Otherwise the build
+ ;; fails with "add_subdirectory given source "cpack.d" which is not
+ ;; an existing directory."
+ (substitute* "CMakeLists.txt"
+ ((".*cpack.d.*") ""))
+ #t))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("graphviz" ,graphviz)))
+ (inputs
+ `(("boost" ,boost)
+ ("freeglut" ,freeglut)
+ ("glew" ,glew)))
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
+ (string-append "-DBOOST_ROOT="
+ (assoc-ref %build-inputs "boost")))))
+ (home-page "https://github.com/coin3d/coin")
+ (synopsis
+ "High-level 3D visualization library with Open Inventor 2.1 API")
+ (description
+ "Coin is a 3D graphics library with an Application Programming Interface
+based on the Open Inventor 2.1 API. For those who are not familiar with Open
+Inventor, it is a scene-graph based retain-mode rendering and model interaction
+library, written in C++, which has become the de facto standard graphics
+library for 3D visualization and visual simulation software in the scientific
+and engineering community.")
+ (license license:bsd-3)))
+
(define-public superfamiconv
(package
(name "superfamiconv")
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm
index 32ffbfa174..d2aba5450d 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -79,14 +79,14 @@ the underlying security implementation.")
(define-public gsasl
(package
(name "gsasl")
- (version "1.8.1")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gsasl/gsasl-" version
".tar.gz"))
(sha256
(base32
- "1lnqfbaajkj1r2fx1db1qgcxy69pfgbyq7xd2kpvyxhra4m1dnjd"))))
+ "1lv8fp01aq4jjia9g4vkx90zacl8rgmjhfi6f1wdwnh9ws7bvg45"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-gssapi-impl=mit"
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f15ce07b51..89efcd61c4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
-;;; Coypright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Coypright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
@@ -951,8 +951,35 @@ application suites.")
(arguments
;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build
;; because of them.
- '(#:configure-flags '("--disable-Werror")
- #:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
+ `(#:configure-flags '("--disable-Werror")
+ #:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 rdelim)
+ (ice-9 popen))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-go-files
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line
+ (open-pipe* OPEN_READ
+ "guile" "-c"
+ "(display (effective-version))")))
+ (module-dir (string-append out "/share/guile/site/"
+ effective))
+ (object-dir (string-append out "/lib/guile/" effective
+ "/site-ccache"))
+ (prefix (string-length module-dir)))
+ ;; compile to the destination
+ (for-each (lambda (file)
+ (let* ((base (string-drop (string-drop-right file 4)
+ prefix))
+ (go (string-append object-dir base ".go")))
+ (invoke "guild" "compile" "-L" module-dir
+ file "-o" go)))
+ (find-files module-dir "\\.scm$"))
+ #t))))))
(inputs
`(("guile-lib" ,guile-lib)
("expat" ,expat)
@@ -1013,10 +1040,36 @@ exceptions, macros, and a dynamic programming environment.")
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (replace 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi"))))))
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 rdelim)
+ (ice-9 popen))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'bootstrap
+ (lambda _
+ (invoke "autoreconf" "-vfi")))
+ (add-after 'install 'install-go-files
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line
+ (open-pipe* OPEN_READ
+ "guile" "-c"
+ "(display (effective-version))")))
+ (module-dir (string-append out "/share/guile/site/"
+ effective))
+ (object-dir (string-append out "/lib/guile/" effective
+ "/site-ccache"))
+ (prefix (string-length module-dir)))
+ ;; compile to the destination
+ (for-each (lambda (file)
+ (let* ((base (string-drop (string-drop-right file 4)
+ prefix))
+ (go (string-append object-dir base ".go")))
+ (invoke "guild" "compile" "-L" module-dir
+ file "-o" go)))
+ (find-files module-dir "\\.scm$"))
+ #t))))))
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 437d5b77bb..92aee2f2e9 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1,9 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016, 2019, 2020 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
@@ -164,7 +164,7 @@
;; projects.
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
(propagated-inputs
- `(("guile-json" ,guile-json-1) ; This ia already using guile-2.2.
+ `(("guile-json" ,guile-json-1) ; This is already using guile-2.2.
("guile-readline" ,guile2.2-readline)
("guile-redis" ,guile2.2-redis)))
(native-inputs
@@ -744,8 +744,8 @@ It has a nice, simple s-expression based syntax.")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile-squee
- (let ((commit "7dcd22b54fd56c9e629489191bb27ac80ecea9db")
- (revision "1"))
+ (let ((commit "c1497a216e881cfde39d6aa7c73d0bf6b497c89b")
+ (revision "2"))
(package
(name "guile-squee")
(version (string-append "0-" revision "." (string-take commit 7)))
@@ -757,7 +757,7 @@ It has a nice, simple s-expression based syntax.")
(file-name (git-file-name name version))
(sha256
(base32
- "1568sk6ada7x9qpfhax0qq1bq93qll1q7nyjrb7h3c1c3lc9sc15"))))
+ "1alskrplnyl1n5wb39drn72cwplp47a8cpdd1n9cdnw3jhk5p12p"))))
(build-system guile-build-system)
(arguments
'(#:phases
@@ -887,6 +887,43 @@ Vicare Scheme and IronScheme. Right now it contains:
@end itemize\n")
(license license:bsd-3)))
+(define-public guile2.0-pg
+ (package
+ (name "guile2.0-pg")
+ (version "0.49")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/guile-pg/guile-pg-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1fizcqga96p9n2jjhi9nprhry20hg9wvcl5b8gya4vhzwz6qhysp"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'patch-src/Makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "src/Makefile"
+ (("\\/share\\/guile\\/site") "/share/guile/site/2.0"))
+ #t)))))
+ (native-inputs
+ `(("procps" ,procps) ; fake-cluster-control uses ps
+ ("guile" ,guile-2.0)
+ ("postgresql" ,postgresql)))
+ (inputs
+ `(("guile" ,guile-2.0)
+ ("postgresql" ,postgresql)))
+ (home-page "https://www.nongnu.org/guile-pg/")
+ (synopsis "Guile modules for accessing PostgreSQL")
+ (description
+ "Guile-PG is a collection of modules for Guile allowing access to the
+PostgreSQL RDBMS from Scheme programs.
+
+This has been tested against PostgreSQL 10 through 13, but currently only
+works with Guile 1.4.x to 2.0.x.")
+ (license license:gpl3+)))
+
(define-public guile-prometheus
(let ((commit "35dc26c0ea44c3d70f1819f240d84e2cbb4b7b4c")
(revision "5"))
@@ -1774,6 +1811,37 @@ users and in some situations.")
(define-public guile3.0-wisp
(deprecated-package "guile3.0-wisp" guile-wisp))
+(define-public guile-udev
+ (package
+ (name "guile-udev")
+ (version "0.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/artyom-poptsov/guile-udev")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf-wrapper)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)
+ ("libtool" ,libtool)
+ ("texinfo" ,texinfo)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+ (inputs
+ `(("guile" ,guile-3.0)
+ ("eudev" ,eudev)))
+ (home-page "https://github.com/artyom-poptsov/guile-udev")
+ (synopsis "Guile bindings to libudev")
+ (description
+ "Guile-Udev provides GNU Guile bindings to libudev.")
+ (license license:gpl3+)))
+
(define-public guile-sly
(package
(name "guile-sly")
@@ -2501,8 +2569,8 @@ format is also supported.")
(deprecated-package "guile3.0-mcron" mcron))
(define-public guile-picture-language
- (let ((commit "91d10c96708d732145006dd2802acc4de08b632e")
- (revision "1"))
+ (let ((commit "7e5982a2788bd79a45ad6f02db46f061f97b6e14")
+ (revision "3"))
(package
(name "guile-picture-language")
(version (git-version "0.0.1" revision commit))
@@ -2514,14 +2582,16 @@ format is also supported.")
(file-name (git-file-name name version))
(sha256
(base32
- "1ydvw9dvssdvlvhh1dr8inyzy2x6m41qgp8hsivca1xysr4gc23a"))))
+ "1y5f14cll4jx33hr43dpgrpd0yy6g0g7lim365kmgb0h0cvja80p"))))
(build-system gnu-build-system)
(inputs
`(("guile" ,guile-3.0)))
+ (propagated-inputs
+ `(("guile-rsvg" ,guile-rsvg)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
- ("imagemagick" ,imagemagick)
+ ("librsvg" ,librsvg)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(home-page "https://git.elephly.net/software/guile-picture-language.git")
@@ -2529,7 +2599,9 @@ format is also supported.")
(description
"This package provides a simple SVG-based picture language for Guile.
The picture values can directly be displayed in Geiser.")
- (license license:lgpl3+))))
+ ;; (pict base64) is under GPLv3+, the rest is under LGPLv3+
+ (license (list license:lgpl3+
+ license:gpl3+)))))
(define-public guile2.2-picture-language
(package
@@ -2542,11 +2614,11 @@ The picture values can directly be displayed in Geiser.")
guile-picture-language))
(define-public guile-studio
- (let ((commit "5c05b03e8a5c450f7358ceec7ea602f29c49d54e")
+ (let ((commit "93622e788e727d3275291f999f7e570de6a5bb35")
(revision "1"))
(package
(name "guile-studio")
- (version (git-version "0.0.3" revision commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2555,7 +2627,7 @@ The picture values can directly be displayed in Geiser.")
(file-name (git-file-name name version))
(sha256
(base32
- "11wyf6x7mhyhimv0cd57pl39zgav9hc9ljqi3g2g35b264hylpnx"))))
+ "0n6y0bcmkx50m8rccz7a6h4yxmwq54pf2bfzpd5ndz2bsiwiq13l"))))
(build-system gnu-build-system)
(arguments
`(#:modules
@@ -2564,10 +2636,7 @@ The picture values can directly be displayed in Geiser.")
,@%gnu-build-system-modules)
#:tests? #f ; there are none
#:make-flags
- (list (string-append "ICONS_DIR="
- (assoc-ref %build-inputs "adwaita-icon-theme")
- "/share/icons/Adwaita/")
- (string-append "PICT_DIR="
+ (list (string-append "PICT_DIR="
(assoc-ref %build-inputs "guile-picture-language"))
(string-append "EMACS_DIR="
(assoc-ref %build-inputs "emacs"))
@@ -2589,13 +2658,19 @@ The picture values can directly be displayed in Geiser.")
`(("guile" ,guile-3.0)
("guile-picture-language" ,guile-picture-language)
("emacs" ,emacs)
+ ("emacs-f" ,emacs-f) ; needed by doom-modeline
+ ("emacs-memoize" ,emacs-memoize) ; needed by all-the-icons
+ ("emacs-all-the-icons" ,emacs-all-the-icons) ; needed by doom-modeline
+ ("emacs-all-the-icons-dired" ,emacs-all-the-icons-dired)
+ ("emacs-dired-sidebar" ,emacs-dired-sidebar)
+ ("emacs-doom-modeline" ,emacs-doom-modeline)
+ ("emacs-modus-themes" ,emacs-modus-themes)
("emacs-geiser" ,emacs-geiser)
("emacs-company" ,emacs-company)
+ ("emacs-ivy" ,emacs-ivy)
("emacs-flycheck" ,emacs-flycheck)
("emacs-flycheck-guile" ,emacs-flycheck-guile)
- ("emacs-smart-mode-line" ,emacs-smart-mode-line)
- ("emacs-paren-face" ,emacs-paren-face)
- ("adwaita-icon-theme" ,adwaita-icon-theme)))
+ ("emacs-paren-face" ,emacs-paren-face)))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "https://gnu.org/software/guile")
@@ -2805,14 +2880,14 @@ list of components. This module takes care of that for you.")
(define-public guile-gi
(package
(name "guile-gi")
- (version "0.3.0")
+ (version "0.3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://lonelycactus.com/tarball/guile_gi-"
version ".tar.gz"))
(sha256
(base32
- "05xbwrk50h4f9fh8la8fk2wsxbnm0jcyb9phnpkkjq4sqkhkxlbj"))))
+ "1ljcfyar1nb6h4jskxnnzrcxcsblawc50qqfdn8cax3zqfskmvzj"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags '("--with-gnu-filesystem-hierarchy")
@@ -2828,11 +2903,7 @@ list of components. This module takes care of that for you.")
(open-pipe* OPEN_READ
"guile" "-c"
"(display (effective-version))"))))
- (substitute* '("module/gi.scm"
- "module/gi/oop.scm"
- "module/gi/documentation.scm"
- "module/gi/types.scm"
- "module/gi/repository.scm")
+ (substitute* (find-files "module" ".*\\.scm")
(("\\(load-extension \"libguile-gi\" \"(.*)\"\\)" m arg)
(format #f "~s"
`(load-extension
@@ -3038,18 +3109,35 @@ API.")
(version "0.4.1")
(source (origin
(method url-fetch)
- (uri (string-append
- "https://download.savannah.nongnu.org/releases/"
- name "/" name "-" version ".tar.gz"))
+ (uri (string-append "mirror://savannah/emacsy/emacsy-"
+ version ".tar.gz"))
(sha256
(base32
- "1cpb85dl1nibd34c2x2h7vfmjpkgh353p5b1w20v6cs6gmvgg4np"))))
+ "1cpb85dl1nibd34c2x2h7vfmjpkgh353p5b1w20v6cs6gmvgg4np"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "configure"
+ ;; Allow builds with Guile 3.0.
+ (("2\\.2 2\\.0")
+ "3.0 2.2 2.0")
+
+ ;; Freeglut 3.2 provides 'glut.pc', not 'freeglut.pc'.
+ (("freeglut >= ")
+ "glut >= "))
+
+ (substitute* '("emacsy/emacsy.c"
+ "example/hello-emacsy.c")
+ (("#include <libguile\\.h>")
+ (string-append "#include <stdlib.h>\n"
+ "#include <stdio.h>\n"
+ "#include <string.h>\n"
+ "#include <unistd.h>\n"
+ "#include <libguile.h>\n")))))))
(build-system gnu-build-system)
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("bzip2" ,bzip2)
- ("guile" ,guile-2.2)
+ `(("bzip2" ,bzip2)
+ ("guile" ,guile-3.0)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("perl" ,perl)
@@ -3058,7 +3146,7 @@ API.")
("texlive" ,(texlive-union (list texlive-generic-epsf)))))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("guile" ,guile-2.2)
+ ("guile" ,guile-3.0)
("guile-lib" ,guile-lib)
("guile-readline" ,guile-readline)
("freeglut" ,freeglut)
@@ -4179,6 +4267,38 @@ directory of its argument if it does not exist.")
(home-page "https://mkdir-p.divoplade.fr")
(license license:asl2.0)))
+(define-public guile-jwt
+ (package
+ (name "guile-jwt")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aconchillo/guile-jwt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1p8sapiv5im18rjnzc8xnw6y7dr661rycf9g10z5ww0dl4rfz3z1"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("guile-json" ,guile-json-4)))
+ (inputs
+ `(("guile" ,guile-3.0)))
+ (home-page "https://github.com/aconchillo/guile-jwt")
+ (synopsis "JSON Web Token library for Guile")
+ (description
+ "guile-jwt is a JSON Web Token module for Guile. JSON Web Tokens are an
+open, industry standard (RFC 7519) method for representing claims securely
+between two parties. guile-jwt allows you to decode, verify and generate
+JWT. Supported algorithms: HS256, HS384, HS512.")
+ (license license:gpl3+)))
+
(define-public guile-sodium
(package
(name "guile-sodium")
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index a3418878e7..3da6759472 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Evgeny Pisemsky <evgeny@pisemsky.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,7 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
@@ -289,7 +291,7 @@ be dangerous and may void your CPU or system board's warranty.")
(define-public wavemon
(package
(name "wavemon")
- (version "0.9.2")
+ (version "0.9.3")
(source
(origin
(method git-fetch)
@@ -298,24 +300,7 @@ be dangerous and may void your CPU or system board's warranty.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29"))
- (patches
- (list
- ;; Two upstream commits required to find the correct <ncurses.h>.
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/uoaerg/wavemon/commit/"
- "ce7f9c4da90767bb50e4b80cdb3cee61264d8d12.patch"))
- (sha256
- (base32 "04b4qbsa5l0jr41dkj0c8yw74lm8z8b50nw1iwas6hnzq41dwdm3")))
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/uoaerg/wavemon/commit/"
- "31e3def1c7332ad830bd966e7d21b343b4f2da54.patch"))
- (sha256
- (base32 "0kyv3sbkv9hl8b88xnk6bq550axh9wzfjlhp3jbvqd4fqf7663br")))))))
+ (base32 "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@@ -482,3 +467,34 @@ authorization policies (what kind of USB devices are authorized) as well as
method of use policies (how a USB device may interact with the system).
Simply put, it is a USB device whitelisting tool.")
(license license:gpl2)))
+
+(define-public screentest
+ (package
+ (name "screentest")
+ (version "2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/TobiX/screentest")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gv3xj9sbk1wsyijfw9xjnvy8pg7j4arjnma2r2kfi18qy32wd30"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+-2)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("glib" ,glib "bin")
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Simple screen testing tool")
+ (description "This is a program for testing the quality of CRT/LCD
+screens. It displays various patterns and allows you to estimate the quality
+of your CRT/LCD monitor.")
+ (home-page "https://github.com/TobiX/screentest")
+ (license license:gpl2)))
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 952bb96fd9..bf98fc3a40 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -117,7 +117,7 @@ C/C++ part.")
(define-public icu4c-68
(package
(inherit icu4c)
- (version "68.1")
+ (version "68.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -128,7 +128,7 @@ C/C++ part.")
"-src.tgz"))
(sha256
(base32
- "0bcznbxvdvxbfsiv3qj2f2f1rrbf3syhhhwbhx9qwjs3nkcf7wm9"))))))
+ "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"))))))
(define-public icu4c-build-root
(package
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 8d31029963..c3ea8491d9 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -7,11 +7,12 @@
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Lprndn <guix@lprndn.info>
-;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -69,6 +70,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages tbb)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
@@ -251,38 +253,69 @@ many popular formats.")
"/VTK-" version ".tar.gz"))
(sha256
(base32
- "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))))
+ "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (for-each
+ (lambda (dir)
+ (delete-file-recursively
+ (string-append "ThirdParty/" dir "/vtk" dir)))
+ ;; ogg, pugixml depended upon unconditionally
+ '("doubleconversion" "eigen" "expat" "freetype" "gl2ps"
+ "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4"
+ "netcdf" "png" "sqlite" "theora" "tiff" "zlib"))
+ #t))))
(build-system cmake-build-system)
(arguments
'(#:build-type "Release" ;Build without '-g' to save space.
- ;; -DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE requires netcdf_cxx
- #:configure-flags '("-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE"
+ #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE"
+ ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=TRUE" ; not honored
+ "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_EIGEN:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE"
"-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_GL2PS:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_GLEW:BOOL=TRUE"
"-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE"
"-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE"
"-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=TRUE"
"-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE"
- "-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_LZ4:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE"
"-DVTK_USE_SYSTEM_PNG:BOOL=TRUE"
+ ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=TRUE" ; breaks IO/CityGML
+ "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE"
+ "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE"
"-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE"
"-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE")
- #:tests? #f)) ;XXX: no "test" target
+ #:tests? #f)) ;XXX: test data not included
(inputs
- `(("libXt" ,libxt)
- ("xorgproto" ,xorgproto)
- ("libX11" ,libx11)
- ("libxml2" ,libxml2)
- ("mesa" ,mesa)
- ("glu" ,glu)
+ `(("double-conversion" ,double-conversion)
+ ("eigen" ,eigen)
("expat" ,expat)
("freetype" ,freetype)
+ ("gl2ps" ,gl2ps)
+ ("glew" ,glew)
+ ("glu" ,glu)
("hdf5" ,hdf5)
("jpeg" ,libjpeg-turbo)
("jsoncpp" ,jsoncpp)
- ("libogg" ,libogg)
+ ;("libogg" ,libogg)
("libtheora" ,libtheora)
+ ("libX11" ,libx11)
+ ("libxml2" ,libxml2)
+ ("libXt" ,libxt)
+ ("lz4" ,lz4)
+ ("mesa" ,mesa)
+ ("netcdf" ,netcdf)
("png" ,libpng)
+ ("proj" ,proj.4)
+ ;("pugixml" ,pugixml)
+ ("sqlite" ,sqlite)
("tiff" ,libtiff)
+ ("xorgproto" ,xorgproto)
("zlib" ,zlib)))
(home-page "https://vtk.org/")
(synopsis "Libraries for 3D computer graphics")
@@ -1064,3 +1097,27 @@ this project.
Scan Tailer Advanced is a fork of Scan Tailer that merges Scan Tailor Featured
and Scan Tailor Enhanced versions as well as including many more bug fixes.")
(license license:gpl3+))))
+
+(define-public stiff
+ (package
+ (name "stiff")
+ (version "2.4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.astromatic.net/download/stiff/stiff-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "14m92dskzw7bwsr64ha4p0mj3ndv13gwcbfic3qxrs3zq5353s7l"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("libtiff" ,libtiff)
+ ("zlib" ,zlib)
+ ("libjpeg-turbo" ,libjpeg-turbo)))
+ (home-page "https://www.astromatic.net/software/stiff")
+ (synopsis "Convert scientific FITS images to TIFF format")
+ (description
+ "STIFF is a program that converts scientific @acronym{FITS, Flexible Image
+Transport System} images to the more popular TIFF format for illustration
+purposes.")
+ (license license:gpl3+)))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 0a6be77d24..0dae0a39f3 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -15,6 +15,7 @@
;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -58,6 +59,7 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages graphics)
#:use-module (gnu packages image)
+ #:use-module (gnu packages image-processing)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
@@ -682,3 +684,66 @@ brightness/contrast/gamma correction, pan with keyboard and mouse, flip,
rotate left/right, jump/forward/backward images, filename filter and use it
to set X desktop background.")
(license license:gpl2)))
+
+(define-public nomacs
+ (package
+ (name "nomacs")
+ (version "3.16.224")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nomacs/nomacs")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:build-type "Release" ; fails to build with debug info
+ #:configure-flags (list "-DENABLE_TRANSLATIONS=true"
+ "-DUSE_SYSTEM_QUAZIP=true"
+ "-DENABLE_OPENCV=true")
+ #:tests? #f ; no rule for target 'test'
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'copy-plugins
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-recursively (assoc-ref inputs "plugins")
+ "ImageLounge/plugins")))
+ (add-after 'copy-plugins 'cd-to-source-dir
+ (lambda _ (chdir "ImageLounge") #t)))))
+ (inputs
+ `(("plugins"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nomacs/nomacs-plugins")
+ (commit "3.16")))
+ (sha256
+ (base32
+ "1cpdwhfvaxm970nwdc1hc13848a85pqqi176m9xpa3krla9qskml"))))
+ ("exiv2" ,exiv2)
+ ("libraw" ,libraw)
+ ("libtiff" ,libtiff)
+ ("opencv" ,opencv)
+ ("python" ,python-wrapper)
+ ("quazip" ,quazip)
+ ("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("qtlinguist" ,qttools)))
+ (synopsis "Image viewer supporting all common formats")
+ (description "Nomacs is a simple to use image lounge featuring
+semi-transparent widgets that display additional information such as metadata,
+thumbnails and histograms. It is able to browse images compressed archives
+and add notes to images.
+
+Nomacs includes image manipulation methods for adjusting brightness, contrast,
+saturation, hue, gamma, and exposure. It has a pseudo color function which
+allows creating false color images. A unique feature of Nomacs is the
+synchronization of multiple instances.")
+ (home-page "https://nomacs.org/")
+ (license license:gpl3+)))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4c6ab8cda7..8cba9c298b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -78,6 +78,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages ragel)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages swig)
#:use-module (gnu packages textutils)
@@ -1734,7 +1735,7 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
(define-public gpick
(package
(name "gpick")
- (version "0.2.5")
+ (version "0.2.6")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1743,12 +1744,13 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI
(file-name (git-file-name name version))
(sha256
(base32
- "0mcj806zagh122qgrdkrg0macpzby97y89xi2sjyn3bh8vmmyxjy"))))
+ "0nl89gca5nmbyycv5rl5bm6k7facapdk4pab9pl949aa3cjw9bk7"))))
(build-system scons-build-system)
(native-inputs
`(("boost" ,boost)
("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("ragel" ,ragel)))
(inputs
`(("expat" ,expat)
("gtk2" ,gtk+-2)
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index a624d7bc6a..1f80abd012 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -189,7 +190,7 @@ script.")
(define-public graphicsmagick
(package
(name "graphicsmagick")
- (version "1.3.35")
+ (version "1.3.36")
(source
(origin
(method url-fetch)
@@ -202,7 +203,7 @@ script.")
"/GraphicsMagick-" version ".tar.xz")))
(sha256
(base32
- "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"))))
+ "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -224,6 +225,7 @@ script.")
("libtiff" ,libtiff)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)
+ ("libwebp" ,libwebp)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 7bb2629a1e..8434836c6f 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -623,3 +624,31 @@ Javascript sources to executables with no external dependency. It includes a
command line interpreter with contextual colorization implemented in
Javascript and a small built-in standard library with C library wrappers.")
(license license:expat)))
+
+(define-public duktape
+ (package
+ (name "duktape")
+ (version "2.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://duktape.org/duktape-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f ; No tests.
+ #:make-flags (list "-f" "Makefile.sharedlibrary"
+ (string-append "INSTALL_PREFIX=" %output))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure))))
+ (home-page "https://duktape.org/")
+ (synopsis "Small embeddable Javascript engine")
+ (description "Duktape is an embeddable Javascript engine, with a focus on
+portability and compact footprint. Duktape is easy to integrate into a C/C++
+project: add @file{duktape.c}, @file{duktape.h}, and @file{duk_config.h} to
+your build, and use the Duktape API to call ECMAScript functions from C code
+and vice versa.")
+ (license license:expat)))
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index cc312b6c40..cb8cc74d33 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -133,14 +134,14 @@ This package is part of the KDE multimedia module.")
(define-public elisa
(package
(name "elisa")
- (version "0.4.2")
+ (version "20.12.0")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde//stable/elisa/0.4.2"
- "/elisa-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/elisa-" version ".tar.xz"))
(sha256
- (base32 "0v9af6l89pgz1g7naf7gwcnq8znlicyh7z985kxalbdmv359c97w"))))
+ (base32 "02450lsnbd37fms1i2bb9qc9wir4vym6qqd9p5hr6a6s6qwfs6qf"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -188,6 +189,12 @@ This package is part of the KDE multimedia module.")
(system (string-append (assoc-ref inputs "xorg-server")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1")
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? test-target #:allow-other-keys)
+ (when tests?
+ (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+ (invoke "dbus-launch" "make" test-target))
#t)))))
(home-page "https://kde.org/applications/multimedia/org.kde.elisa")
(synopsis "Powerful music player for Plasma 5")
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 0fbf6e3373..f5d97dae27 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -318,3 +318,52 @@ who want to quickly see problems occurring on their server.
This package is part of the KDE administration module.")
(license license:gpl2+)))
+
+(define-public yakuake
+ (package
+ (name "yakuake")
+ (version "20.12.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/yakuake-" version ".tar.xz"))
+ (sha256
+ (base32
+ "175vvkpkpbd7nm0lqjyiw27xmfdfcs9syvfngnjlndmlzwagk8d1"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (inputs
+ `(("breeze-icons" ,breeze-icons)
+ ("karchive" ,karchive)
+ ("kconfig" ,kconfig)
+ ("kcoreaddons" ,kcoreaddons)
+ ("kcrash" ,kcrash)
+ ("kdbusaddons" ,kdbusaddons)
+ ("kglobalaccel" ,kglobalaccel)
+ ("ki18n" ,ki18n)
+ ("kiconthemes" ,kiconthemes)
+ ("kio" ,kio)
+ ("knewstuff" ,knewstuff)
+ ("knotifications" ,knotifications)
+ ("knotifyconfig" ,knotifyconfig)
+ ("konsole" ,konsole)
+ ("kparts" ,kparts)
+ ("kwayland" ,kwayland)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("kwindowsystem" ,kwindowsystem)
+ ("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)
+ ("qtx11extras" ,qtx11extras)))
+ (home-page "https://www.kde.org/applications/system/yakuake/")
+ (synopsis "Quad-style terminal emulator for KDE")
+ (description "Yakuake is a drop-down terminal emulator based on KDE Konsole
+technology. Features include:
+@itemize
+@item Smoothly rolls down from the top of your screen
+@item Tabbed interface
+@item Configurable dimensions and animation speed
+@item Skinnable
+@item Sophisticated D-Bus interface
+@end itemize")
+ (license license:gpl2+)))
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 999633d78c..12d54a0b5d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -49,6 +49,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages djvu)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages ebook)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
@@ -141,6 +142,77 @@ This package contains GUI widgets for baloo.")
(license ;; LGPL for libraries, FDL for documentation
(list license:lgpl2.1+ license:fdl1.2+))))
+(define-public akregator
+ (package
+ (name "akregator")
+ (version "20.04.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/akregator-" version ".tar.xz"))
+ (sha256
+ (base32 "1711yhwsdq9iyc3wm3a4xmz81p73hvvc0h58sasc89ifpry50k2p"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-qt-process-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/akregator"))
+ (qt-process-path (string-append
+ (assoc-ref inputs "qtwebengine")
+ "/lib/qt5/libexec/QtWebEngineProcess")))
+ (wrap-program bin
+ `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
+ #t))))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("kdoctools" ,kdoctools)))
+ (inputs
+ `(("akonadi" ,akonadi)
+ ("akonadi-contacts" ,akonadi-contacts)
+ ("akonadi-mime" ,akonadi-mime)
+ ("boost" ,boost)
+ ("breeze-icons" ,breeze-icons)
+ ("gpgme" ,gpgme)
+ ("grantlee" ,grantlee)
+ ("grantleetheme" ,grantleetheme)
+ ("kcmutils" ,kcmutils)
+ ("kcontacts" ,kcontacts)
+ ("kcrash" ,kcrash)
+ ("kimap" ,kimap)
+ ("kitemmodels" ,kitemmodels)
+ ("kmessagelib" ,kmessagelib)
+ ("kmime" ,kmime)
+ ("knotifications" ,knotifications)
+ ("knotifyconfig" ,knotifyconfig)
+ ("kontactinterface" ,kontactinterface)
+ ("kpimcommon" ,kpimcommon)
+ ("kpimtextedit" ,kpimtextedit)
+ ("kqtquickcharts" ,kqtquickcharts)
+ ("ktexteditor" ,ktexteditor)
+ ("kuserfeedback" ,kuserfeedback)
+ ("libkdepim" ,libkdepim)
+ ("libkleo" ,libkleo)
+ ("qgpgme" ,qgpgme)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwebchannel" ,qtwebchannel)
+ ("qtwebengine" ,qtwebengine)
+ ("syndication" ,syndication)))
+ (home-page "https://apps.kde.org/en/akregator")
+ (synopsis "KDE Feed Reader")
+ (description
+ "Akregator is a news feed reader. It enables you to follow news
+sites, blogs and other RSS/Atom-enabled websites without the need to manually
+check for updates using a web browser. Akregator is designed to be both easy to
+use and to be powerful enough to read hundreds of news sources conveniently.
+It comes with a fast search, advanced archiving functionality and an internal
+browser for easy news reading.")
+ (license license:gpl2+)))
+
(define-public kdenlive
(let ((version "20.08.3"))
(package
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 3f17465039..1d1fe94690 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -23,36 +23,278 @@
(define-module (gnu packages language)
#:use-module (gnu packages)
+ #:use-module (gnu packages anthy)
#:use-module (gnu packages autotools)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages docbook)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages ibus)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages ocr)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages perl-check)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:select
- (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1))
+ (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils))
+(define-public nimf
+ (package
+ (name "nimf")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hamonikr/nimf.git")
+ (commit
+ (string-append "nimf-" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--with-im-config-data"
+ "--with-imsettings-data"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-flags
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("-Werror")
+ "-Wno-error"))
+ #t))
+ (add-after 'patch-flags 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "nimf-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml-4.3")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'patch-docbook-xml 'patch-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("/usr/share/anthy/anthy.dic")
+ (string-append (assoc-ref inputs "anthy")
+ "/share/anthy/anthy.dic")))
+ (substitute* "configure.ac"
+ (("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0")
+ (string-append (assoc-ref inputs "gtk+:bin")
+ "/bin:$GTK3_LIBDIR/libgtk-3-0"))
+ (("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0")
+ (string-append (assoc-ref inputs "gtk+-2:bin")
+ "/bin:$GTK2_LIBDIR/libgtk2.0-0")))
+ (substitute* "modules/clients/gtk/Makefile.am"
+ (("\\$\\(GTK3_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib"))
+ (("\\$\\(GTK2_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt4/Makefile.am"
+ (("\\$\\(QT4_LIB_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt5/Makefile.am"
+ (("\\$\\(QT5_IM_MODULE_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib/qt5/plugins/inputmethods")))
+ (substitute* '("bin/nimf-settings/Makefile.am"
+ "data/apparmor-abstractions/Makefile.am"
+ "data/Makefile.am" "data/im-config/Makefile.am"
+ "data/imsettings/Makefile.am")
+ (("/etc")
+ (string-append (assoc-ref outputs "out")
+ "/etc"))
+ (("/usr/share")
+ (string-append (assoc-ref outputs "out")
+ "/share")))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("docbook-xml-4.3" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+-2:bin" ,gtk+-2 "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("gtk+-2" ,gtk+-2)
+ ("gtk+" ,gtk+)
+ ("hangul" ,libhangul)
+ ("m17n-db" ,m17n-db)
+ ("m17n-lib" ,m17n-lib)
+ ("qt-4" ,qt-4)
+ ("qtbase" ,qtbase)
+ ("rime" ,librime)
+ ("rsvg" ,librsvg)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)
+ ("x11" ,libx11)
+ ("xkbcommon" ,libxkbcommon)
+ ("xklavier" ,libxklavier)))
+ (propagated-inputs
+ `(("glib" ,glib)))
+ (synopsis "Korean input method framework")
+ (description "Nimf is a lightweight, fast and extensible input method
+framework.")
+ (home-page "https://github.com/hamonikr/nimf/")
+ (license lgpl3+)))
+
+(define-public libchewing
+ (package
+ (name "libchewing")
+ (version "0.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/chewing/libchewing.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "test/Makefile.am"
+ ((" test-bopomofo ")
+ "")
+ ((" test-config ")
+ "")
+ ((" test-reset ")
+ "")
+ ((" test-symbol ")
+ "")
+ ((" test-keyboardless ")
+ "")
+ ((" test-special-symbol ")
+ ""))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("texinfo" ,texinfo)))
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("sqlite" ,sqlite)))
+ (synopsis "Chinese phonetic input method")
+ (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input
+method, one of the most popular choices for Traditional Chinese users.")
+ (home-page "http://chewing.im/")
+ (license lgpl2.1+)))
+
+(define-public hime
+ (package
+ (name "hime")
+ (version "0.9.11")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hime-ime/hime.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1wn0ici78x5qh6hvv50bf76ld7ds42hzzl4l5qz34hp8wyvrwakw"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ ;; FIXME
+ ;; error: unknown type name ‘GtkStatusIcon’
+ "--disable-system-tray")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-std
+ (lambda _
+ (substitute* '("configure" "Makefile")
+ (("17")
+ "11"))
+ #t)))))
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)
+ ("whereis" ,util-linux)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("chewing" ,libchewing)
+ ("gtk+" ,gtk+)
+ ("qtbase" ,qtbase)
+ ("xtst" ,libxtst)))
+ (synopsis "HIME Input Method Editor")
+ (description "Hime is an extremely easy-to-use input method framework. It
+is lightweight, stable, powerful and supports many commonly used input methods,
+including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin,
+Random Cage Fighting Birds, Cool Music etc.")
+ (home-page "http://hime-ime.github.io/")
+ (license
+ (list
+ gpl2+
+ lgpl2.1+
+ ;; Documentation
+ fdl1.2+))))
+
(define-public liblouis
(package
(name "liblouis")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6b0e9f6c8f..8317723bbf 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
@@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
-(define-public linux-libre-5.10-version "5.10.4")
+(define-public linux-libre-5.10-version "5.10.5")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
@@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
- (hash (base32 "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh")))
+ (hash (base32 "1x1fc4cywqnjm514q376d5540zsxmqv95n0lykaphz8qdbhsk49r")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
@@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-5.4-version "5.4.86")
+(define-public linux-libre-5.4-version "5.4.87")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@@ -377,12 +377,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
- (hash (base32 "12qf7gza94s4f7smi3dk6i6hqcz0fbc64ghapan57fgpdvybadpb")))
+ (hash (base32 "0cawb7md97i0hz83hf7l4ihn9lyrg8q64j8jam8n9fw45qzfjd3a")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
-(define-public linux-libre-4.19-version "4.19.164")
+(define-public linux-libre-4.19-version "4.19.165")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
- (hash (base32 "1amafhydq934a04pizc5w4h4y4ny982zn33yrz7q0h2d6sskmyp5")))
+ (hash (base32 "1l72wka1dli0jdb91sx4zr13vy0q5l6p37fh6hf093gjn14mdh51")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
@@ -2245,6 +2245,53 @@ IPv6 packet filter.
Both commands are targeted at system administrators.")
(license license:gpl2+)))
+(define-public jitterentropy-rngd
+ (package
+ (name "jitterentropy-rngd")
+ (version "1.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/smuellerDD/jitterentropy-rngd")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fb8zfwhwkl1d8n4cdn7rdv5rwd75qgc00d36pmkl7wgnj3c9xda"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no test suite
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "UNITDIR=$(PREFIX)/lib/systemd/system")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)))) ; no ./configure script
+ (home-page "https://www.chronox.de/jent.html")
+ (synopsis "CPU jitter random number generator daemon")
+ (description
+ "This simple daemon feeds entropy from the CPU Jitter @acronym{RNG, random
+number generator} core to the kernel Linux's entropy estimator. This prevents
+the @file{/dev/random} device from blocking and should benefit users of the
+preferred @file{/dev/urandom} and @code{getrandom()} interfaces too.
+
+The CPU Jitter RNG itself is part of the kernel and claims to provide good
+entropy by collecting and magnifying differences in CPU execution time as
+measured by the high-resolution timer built into modern CPUs. It requires no
+additional hardware or external entropy source.
+
+The random bit stream generated by @command{jitterentropy-rngd} is not processed
+by a cryptographically secure whitening function. Nonetheless, its authors
+believe it to be a suitable source of cryptographically secure key material or
+other cryptographically sensitive data.
+
+If you agree with them, start this daemon as early as possible to provide
+properly seeded random numbers to services like SSH or those using TLS during
+early boot when entropy may be low, especially in virtualised environments.")
+ (license (list license:bsd-3 ; or
+ license:gpl2+))))
+
(define-public lsscsi
(package
(name "lsscsi")
@@ -5317,6 +5364,92 @@ be installed and loaded separately. Only the original vendor firmware is
supported.")
(license license:gpl3+)))
+(define-public tmon
+ (package
+ (name "tmon")
+ ;; Tmon's ‘VERSION = 1.0’ hasn't been touched since 2013; the code has.
+ (version (package-version linux-libre))
+ (source (package-source linux-libre))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no test suite
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "INSTALL_ROOT=" (assoc-ref %outputs "out"))
+ "BINDIR=bin")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'enter-subdirectory
+ (lambda _
+ (chdir "tools/thermal/tmon")
+ #t))
+ (add-after 'install 'install-man-page
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (man8 (string-append out "/share/man/man8")))
+ (install-file "tmon.8" man8)
+ #t)))
+ (delete 'configure)))) ; no configure script
+ (inputs
+ `(("ncurses" ,ncurses)))
+ (home-page (package-home-page linux-libre))
+ (synopsis "Monitor and test the Linux thermal subsystem in real time")
+ (description
+ "Tmon is a tool to interact with the complex thermal subsystem of the
+kernel Linux. It helps visualize thermal relationships and real-time thermal
+data, tune and test cooling devices and sensors, and collect thermal data for
+further analysis.
+
+As computers become smaller and more thermally constrained, more sensors are
+added and new cooling capabilities introduced. Thermal relationships can change
+dynamically. Their complexity grows exponentially among cooling devices, zones,
+sensors, and trip points.
+
+Linux exposes this relationship through @file{/sys/class/thermal} with a matrix
+of symbolic links, trip point bindings, and device instances. To traverse it
+by hand is no trivial task: @command{tmon} aims to make it understandable.")
+ (license (list license:gpl2 ; the man page
+ license:gpl2+)))) ; the actual rest
+
+(define-public turbostat
+ (package
+ (name "turbostat")
+ ;; XXX turbostat reports a version like ‘20.09.30’ but using it here would
+ ;; make it harder to benefit from ‘free’ linux-libre package updates.
+ (version (package-version linux-libre))
+ (source (package-source linux-libre))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no test suite
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'enter-subdirectory
+ (lambda _
+ (chdir "tools/power/x86/turbostat")
+ #t))
+ (delete 'configure)))) ; no configure script
+ (inputs
+ `(("libcap" ,libcap)))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (home-page (package-home-page linux-libre))
+ (synopsis "Report x86 processor frequency and idle statistics")
+ (description
+ "Turbostat reports x86 processor topology, frequency, idle power state
+statistics, temperature, and power consumption. Some information is unavailable
+on older processors.
+
+It can be used to identify machines that are inefficient in terms of power usage
+or idle time, report the rate of @acronym{SMI, system management interrupt}s
+occurring on the system, or verify the effects of power management tuning.
+
+@command{turbostat} reads hardware counters but doesn't write to them, so it
+won't interfere with the OS or other running processes---including multiple
+invocations of itself.")
+ (license license:gpl2)))
+
(define-public ntfs-3g
(package
(name "ntfs-3g")
@@ -7300,7 +7433,7 @@ of Linux application development.")
(package
(inherit pipewire)
(name "pipewire")
- (version "0.3.13")
+ (version "0.3.18")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7309,7 +7442,7 @@ of Linux application development.")
(file-name (git-file-name name version))
(sha256
(base32
- "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w"))))
+ "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g"))))
(arguments
'(#:configure-flags
(list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out")
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 87e130a82e..6d87329c16 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -10,17 +10,17 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2018, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
-;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020 Dimakis Dimakakos <me@bendersteed.tech>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Adam Kandur <rndd@tuta.io>
-;;; Copyright © 2020 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2020, 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -782,79 +782,80 @@ antialiased TrueType font rendering using CLX and XRender extension.")
(sbcl-package->ecl-package sbcl-clx-truetype))
(define-public sbcl-slynk
- (package
- (name "sbcl-slynk")
- (version "1.0.42")
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/joaotavora/sly")
- (commit version)))
- (sha256
- (base32 "10l867c4hgcpiajcfkz9g9vabp7y4bcgy51la6n9pqxrlg1fs455"))
- (file-name (git-file-name "slynk" version))
- (modules '((guix build utils)
- (ice-9 ftw)))
- (snippet
- '(begin
- ;; Move the contribs into the main source directory for easier
- ;; access
- (substitute* "slynk/slynk.asd"
- (("\\.\\./contrib")
- "contrib"))
- (rename-file "contrib" "slynk/contrib")
- ;; Move slynk's contents into the base directory for easier
- ;; access
- (for-each (lambda (file)
- (unless (string-prefix? "." file)
- (rename-file (string-append "slynk/" file)
- (string-append "./" (basename file)))))
- (scandir "slynk"))
- #t))))
- (build-system asdf-build-system/sbcl)
- (outputs '("out" "image"))
- (arguments
- `(#:tests? #f ; No test suite
- #:asd-systems '("slynk"
- "slynk/arglists"
- "slynk/fancy-inspector"
- "slynk/package-fu"
- "slynk/mrepl"
- "slynk/trace-dialog"
- "slynk/profiler"
- "slynk/stickers"
- "slynk/indentation"
- "slynk/retro")
- #:phases
- (modify-phases %standard-phases
- (add-after 'create-asdf-configuration 'build-image
- (lambda* (#:key outputs #:allow-other-keys)
- (build-image (string-append
- (assoc-ref %outputs "image")
- "/bin/slynk")
- %outputs
- #:dependencies '("slynk"
- "slynk/arglists"
- "slynk/fancy-inspector"
- "slynk/package-fu"
- "slynk/mrepl"
- "slynk/trace-dialog"
- "slynk/profiler"
- "slynk/stickers"
- "slynk/indentation"
- "slynk/retro"))
- #t)))))
- (synopsis "Common Lisp IDE for Emacs")
- (description "SLY is a fork of SLIME, an IDE backend for Common Lisp.
+ (let ((commit "dffdf3caa12e964127d6eb45ba92ac0442cc5a48"))
+ (package
+ (name "sbcl-slynk")
+ (version (git-version "1.0.43" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/joaotavora/sly")
+ (commit commit)))
+ (sha256
+ (base32 "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn"))
+ (file-name (git-file-name "slynk" version))
+ (modules '((guix build utils)
+ (ice-9 ftw)))
+ (snippet
+ '(begin
+ ;; Move the contribs into the main source directory for easier
+ ;; access
+ (substitute* "slynk/slynk.asd"
+ (("\\.\\./contrib")
+ "contrib"))
+ (rename-file "contrib" "slynk/contrib")
+ ;; Move slynk's contents into the base directory for easier
+ ;; access
+ (for-each (lambda (file)
+ (unless (string-prefix? "." file)
+ (rename-file (string-append "slynk/" file)
+ (string-append "./" (basename file)))))
+ (scandir "slynk"))
+ #t))))
+ (build-system asdf-build-system/sbcl)
+ (outputs '("out" "image"))
+ (arguments
+ `(#:tests? #f ; No test suite
+ #:asd-systems '("slynk"
+ "slynk/arglists"
+ "slynk/fancy-inspector"
+ "slynk/package-fu"
+ "slynk/mrepl"
+ "slynk/trace-dialog"
+ "slynk/profiler"
+ "slynk/stickers"
+ "slynk/indentation"
+ "slynk/retro")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'create-asdf-configuration 'build-image
+ (lambda* (#:key outputs #:allow-other-keys)
+ (build-image (string-append
+ (assoc-ref %outputs "image")
+ "/bin/slynk")
+ %outputs
+ #:dependencies '("slynk"
+ "slynk/arglists"
+ "slynk/fancy-inspector"
+ "slynk/package-fu"
+ "slynk/mrepl"
+ "slynk/trace-dialog"
+ "slynk/profiler"
+ "slynk/stickers"
+ "slynk/indentation"
+ "slynk/retro"))
+ #t)))))
+ (synopsis "Common Lisp IDE for Emacs")
+ (description "SLY is a fork of SLIME, an IDE backend for Common Lisp.
It also features a completely redesigned REPL based on Emacs's own
full-featured @code{comint-mode}, live code annotations, and a consistent interactive
button interface. Everything can be copied to the REPL. One can create
multiple inspectors with independent history.")
- (home-page "https://github.com/joaotavora/sly")
- (license license:public-domain)
- (properties `((cl-source-variant . ,(delay cl-slynk))))))
+ (home-page "https://github.com/joaotavora/sly")
+ (license license:public-domain)
+ (properties `((cl-source-variant . ,(delay cl-slynk)))))))
(define-public cl-slynk
(sbcl-package->cl-source-package sbcl-slynk))
@@ -1724,7 +1725,7 @@ also be supported.")
(define-public sbcl-ironclad
(package
(name "sbcl-ironclad")
- (version "0.53")
+ (version "0.54")
(source
(origin
(method git-fetch)
@@ -1732,7 +1733,7 @@ also be supported.")
(url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version))))
(sha256
- (base32 "01qdfa0jggqbwlsb3aw1iigvs5xhnddk6kn3abhan59956dsbp02"))
+ (base32 "07g0wpvfqq2yk23prs890d4qvbnr3xd6w8ssd88g89xdg483wpvk"))
(file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl)
(native-inputs
@@ -1787,6 +1788,40 @@ named readtables, which is akin to package namespacing in Common Lisp.")
(define-public ecl-named-readtables
(sbcl-package->ecl-package sbcl-named-readtables))
+(define-public sbcl-py-configparser
+ ;; NOTE: (Sharlatan <2021-01-05 Tue> <19:52:19 UTC+0000>) Project updated last
+ ;; time 8y ago, it looks like abandoned. VCS of the project:
+ ;; https://svn.common-lisp.net/py-configparser/trunk
+ (package
+ (name "sbcl-py-configparser")
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://common-lisp.net/project/py-configparser/releases/"
+ "py-configparser-" version ".tar.gz"))
+ (sha256
+ (base32 "0i4rqz5cv7d7c2w81x5lwy05s6fbi3zikf4k5kpi3bkx3cabwdxj"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("parse-number" ,sbcl-parse-number)))
+ (home-page "http://common-lisp.net/project/py-configparser/")
+ (synopsis "ConfigParser Python module functionality for Common Lisp")
+ (description "The py-configparser package implements the ConfigParser
+Python module functionality in Common Lisp. In short, it implements reading
+and writing of .INI-file style configuration files with sections containing
+key/value pairs of configuration options. In line with the functionalities in
+the python module, does this package implement basic interpolation of option
+values in other options.")
+ (license license:expat)))
+
+(define-public cl-py-configparser
+ (sbcl-package->cl-source-package sbcl-py-configparser))
+
+(define-public ecl-py-configparser
+ (sbcl-package->ecl-package sbcl-py-configparser))
+
(define-public sbcl-pythonic-string-reader
(let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a"))
(package
@@ -4409,8 +4444,8 @@ mime-type of a file.")
(sbcl-package->ecl-package sbcl-ningle))
(define-public sbcl-cl-fastcgi
- (let ((commit "d576d20eeb12f225201074b28934ba395b15781a")
- (revision "1"))
+ (let ((commit "de8b49b26de9863996ec18db28af8ab7e8ac4e20")
+ (revision "2"))
(package
(name "sbcl-cl-fastcgi")
(version (git-version "0.2" revision commit))
@@ -4422,7 +4457,7 @@ mime-type of a file.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "02mvzzyn0k960s38rbxaqqmdkwcfmyhf8dx6ynz8xyxflmp0s5zv"))))
+ (base32 "0xgmhx766q4nmrvn5z7ag3ikpr9phlh8ypi8b14azshq9lqbq0m7"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("usocket" ,sbcl-usocket)
@@ -4443,8 +4478,6 @@ mime-type of a file.")
(description
"CL-FastCGI is a generic version of SB-FastCGI, targeting to run on
mostly Common Lisp implementation.")
- ;; TODO: Upstream on specifies "BSD license":
- ;; https://github.com/KDr2/cl-fastcgi/issues/4
(license license:bsd-2))))
(define-public cl-fastcgi
@@ -9135,6 +9168,35 @@ foreign libraries.
" :ecl) \"usocket\""))
#t)))))))
+(define-public sbcl-db3
+ (let ((commit "38e5ad35f025769fb7f8dcdc6e56df3e8efd8e6d")
+ (revision "1"))
+ (package
+ (name "sbcl-db3")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dimitri/cl-db3")
+ (commit commit)))
+ (file-name (git-file-name "cl-db3" version))
+ (sha256
+ (base32 "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5"))))
+ (build-system asdf-build-system/sbcl)
+ (home-page "https://github.com/dimitri/cl-db3")
+ (synopsis "Common Lisp library to read dBase III database files")
+ (description
+ "This is a Common Lisp library for processing data found in dBase III
+database files (dbf and db3 files).")
+ (license license:public-domain))))
+
+(define-public ecl-db3
+ (sbcl-package->ecl-package sbcl-db3))
+
+(define-public cl-db3
+ (sbcl-package->cl-source-package sbcl-db3))
+
(define-public sbcl-dbi
;; Master includes a breaking change which other packages depend on since
;; Quicklisp decided to follow it:
@@ -10803,6 +10865,43 @@ Inflector module.")
(define-public ecl-cl-inflector
(sbcl-package->ecl-package sbcl-cl-inflector))
+(define-public sbcl-ixf
+ (let ((commit "ed26f87e4127e4a9e3aac4ff1e60d1f39cca5183")
+ (revision "1"))
+ (package
+ (name "sbcl-ixf")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dimitri/cl-ixf")
+ (commit commit)))
+ (file-name (git-file-name "cl-ixf" version))
+ (sha256
+ (base32 "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("babel" ,sbcl-babel)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("ieee-floats" ,sbcl-ieee-floats)
+ ("local-time" ,sbcl-local-time)
+ ("md5" ,sbcl-md5)
+ ("split-sequence" ,sbcl-split-sequence)))
+ (home-page "https://github.com/dimitri/cl-ixf")
+ (synopsis "Parse IBM IXF file format")
+ (description
+ "This is a Common Lisp library to handle the IBM PC version of the IXF
+(Integration Exchange Format) file format.")
+ (license license:public-domain))))
+
+(define-public ecl-ixf
+ (sbcl-package->ecl-package sbcl-ixf))
+
+(define-public cl-ixf
+ (sbcl-package->cl-source-package sbcl-ixf))
+
(define-public sbcl-qbase64
(package
(name "sbcl-qbase64")
@@ -12740,3 +12839,36 @@ compression/decompression using bindings to the libzstd C library.")
(define-public ecl-zstd
(sbcl-package->ecl-package sbcl-zstd))
+
+(define-public sbcl-agnostic-lizard
+ (let ((commit "fe3a73719f05901c8819f8995a3ebae738257952")
+ (revision "1"))
+ (package
+ (name "sbcl-agnostic-lizard")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ax78y8w4zlp5dcwyhz2nq7j3shi49qn31dkfg8lv2jlg7mkwh2d"))))
+ (build-system asdf-build-system/sbcl)
+ (synopsis "Almost correct portable code walker for Common Lisp")
+ (description
+ "Agnostic Lizard is a portable implementation of a code walker and in
+particular of the macroexpand-all function (and macro) that makes a best
+effort to be correct while not expecting much beyond what the Common Lisp
+standard requires.
+
+It aims to be implementation-agnostic and to climb the syntax trees.")
+ (home-page "https://gitlab.common-lisp.net/mraskin/agnostic-lizard")
+ (license license:gpl3+))))
+
+(define-public cl-agnostic-lizard
+ (sbcl-package->cl-source-package sbcl-agnostic-lizard))
+
+(define-public ecl-agnostic-lizard
+ (sbcl-package->ecl-package sbcl-agnostic-lizard))
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 603bbab736..9ef37d706b 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -840,7 +840,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr
(package
(name "txr")
- (version "245")
+ (version "246")
(source
(origin
(method git-fetch)
@@ -849,7 +849,7 @@ enough to play the original mainframe Zork all the way through.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1pnajvqhzjlw0rwwhhk4hyps5pbg9njh10iqhnmvl1xnah6ff94z"))))
+ (base32 "1ynkz0ss7nn1ssiaxagpq80iabknf085nk0pra9hn8y9hx7av0db"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9bbf567aef..5bdb4152cb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -22,9 +22,9 @@
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2020 Rene Saavedra <pacoon@protonmail.com>
-;;; Copyright © 2018, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2018, 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
@@ -410,7 +410,7 @@ to run without any changes.")
(define-public fetchmail
(package
(name "fetchmail")
- (version "6.4.13")
+ (version "6.4.14")
(source
(origin
(method url-fetch)
@@ -418,7 +418,7 @@ to run without any changes.")
(version-major+minor version) "/"
"fetchmail-" version ".tar.xz"))
(sha256
- (base32 "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x"))))
+ (base32 "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2"))))
(build-system gnu-build-system)
(inputs
`(("openssl" ,openssl)))
@@ -445,7 +445,7 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt
(package
(name "mutt")
- (version "2.0.3")
+ (version "2.0.4")
(source (origin
(method url-fetch)
(uri (list
@@ -455,7 +455,7 @@ aliasing facilities to work just as they would on normal mail.")
version ".tar.gz")))
(sha256
(base32
- "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"))
+ "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"))
(patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system)
(inputs
@@ -1059,7 +1059,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu
(package
(name "mu")
- (version "1.4.13")
+ (version "1.4.14")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/"
@@ -1067,7 +1067,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
"mu-" version ".tar.xz"))
(sha256
(base32
- "13kfpr77qrnp3i5qnb5zd03frd3fdviggnl50973gdk0hr7m0smj"))))
+ "1fk0zyxajwyzp1f8yn7imbqq77s2w5cab5m9jla4zrybwkdi0r6z"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -1249,14 +1249,14 @@ invoking @command{notifymuch} from the post-new hook.")
(define-public notmuch
(package
(name "notmuch")
- (version "0.31.2")
+ (version "0.31.3")
(source (origin
(method url-fetch)
(uri (string-append "https://notmuchmail.org/releases/notmuch-"
version ".tar.xz"))
(sha256
(base32
- "1vzv9imd0ba51y5zw8h358wikm1fh52rlvvyzvp98w330hzbcmhl"))))
+ "1jisflxdly1nlyy17212ch3hk96dns4j9f5552jz724gs2p42h28"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -1591,14 +1591,14 @@ addons which can add many functionalities to the base client.")
(define-public msmtp
(package
(name "msmtp")
- (version "1.8.13")
+ (version "1.8.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://marlam.de/msmtp/releases/"
"/msmtp-" version ".tar.xz"))
(sha256
- (base32 "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd"))))
+ (base32 "1d3knxpwpglg20z4zcsi82mqv9285ah1b1b16k1fk1hlf5fhcvym"))))
(build-system gnu-build-system)
(inputs
`(("libsecret" ,libsecret)
@@ -1754,7 +1754,7 @@ facilities for checking incoming mail.")
(package
(name "dovecot")
;; Also update dovecot-pigeonhole when updating to a new minor version.
- (version "2.3.11.3")
+ (version "2.3.13")
(source
(origin
(method url-fetch)
@@ -1762,7 +1762,7 @@ facilities for checking incoming mail.")
(version-major+minor version) "/"
"dovecot-" version ".tar.gz"))
(sha256
- (base32 "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk"))))
+ (base32 "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -1823,7 +1823,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
(let ((dovecot-version (version-major+minor (package-version dovecot))))
(package
(name "dovecot-pigeonhole")
- (version "0.5.11")
+ (version "0.5.13")
(source
(origin
(method url-fetch)
@@ -1831,7 +1831,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.")
"https://pigeonhole.dovecot.org/releases/" dovecot-version "/"
"dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz"))
(sha256
- (base32 "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb"))
+ (base32 "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -2682,14 +2682,14 @@ easily (one at a time).")
(define-public mpop
(package
(name "mpop")
- (version "1.4.11")
+ (version "1.4.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://marlam.de/mpop/releases/"
"mpop-" version ".tar.xz"))
(sha256
- (base32 "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"))))
+ (base32 "02j8qfd44dfyq1sq7r9znj9y6wam39ncch1sc8chcdlw5nsmaqsz"))))
(build-system gnu-build-system)
(inputs
`(("gnutls" ,gnutls)))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0ba6b3444e..7866bcc6eb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018, 2020 Kei Kebreau <kkebreau@posteo.net>
@@ -3928,7 +3928,8 @@ Fresnel integrals, and similar related functions as well.")
" -DCMAKE_C_FLAGS_RELEASE=\"$(CFLAGS) $(CPPFLAGS)\""
" -DCMAKE_CXX_FLAGS_RELEASE=\"$(CXXFLAGS) $(CPPFLAGS)\""
" -DCMAKE_SKIP_RPATH=TRUE"
- " -DCMAKE_BUILD_TYPE=Release")
+ " -DCMAKE_BUILD_TYPE=Release"
+ " -DCMAKE_INSTALL_LIBDIR=lib")
(string-append "INSTALL_LIB="
(assoc-ref %outputs "out") "/lib")
(string-append "INSTALL_INCLUDE="
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 89d7b8ca83..c585326124 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
@@ -659,14 +659,14 @@ dictionaries. HexChat can be extended with multiple addons.")
(define-public ngircd
(package
(name "ngircd")
- (version "26")
+ (version "26.1")
(source (origin
(method url-fetch)
(uri (string-append "https://arthur.barton.de/pub/ngircd/ngircd-"
version ".tar.xz"))
(sha256
(base32
- "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"))
+ "0m32v0c7mq96rshws4h6d0pi4bm0hynfzx3x01mgrxh9c396zham"))
(patches (search-patches "ngircd-handle-zombies.patch"))))
(build-system gnu-build-system)
;; Needed for the test suite.
diff --git a/gnu/packages/moe.scm b/gnu/packages/moe.scm
index 23df938ae7..6d16d1a7cc 100644
--- a/gnu/packages/moe.scm
+++ b/gnu/packages/moe.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2017 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,7 +28,7 @@
(define-public moe
(package
(name "moe")
- (version "1.10")
+ (version "1.11")
(source
(origin
(method url-fetch)
@@ -36,7 +36,7 @@
version ".tar.lz"))
(sha256
(base32
- "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc"))))
+ "1yg2ln2mm6gzv61cxnv60dw1cr5bl2dhkjy685jrd3aabb7wpyqf"))))
(build-system gnu-build-system)
(native-inputs `(("lzip" ,lzip)))
(inputs `(("ncurses" ,ncurses)))
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 8cd113a092..adbd0447d0 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
@@ -158,7 +158,7 @@ etc. via a Web interface. Features include:
(define-public zabbix-agentd
(package
(name "zabbix-agentd")
- (version "5.2.2")
+ (version "5.2.3")
(source
(origin
(method url-fetch)
@@ -166,11 +166,12 @@ etc. via a Web interface. Features include:
"https://cdn.zabbix.com/zabbix/sources/stable/"
(version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256
- (base32 "16sqx5hrqkciwnl6xs1b8mwf0fz7x9f4214jhj9s86w0mqiscw8g"))))
+ (base32 "0wlv3jala7xinl03fr6n0y3hmq9yi0wwn27k6snqhz4yyfdwhdnf"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-agent"
+ "--enable-ipv6"
(string-append "--with-iconv="
(assoc-ref %build-inputs "libiconv"))
(string-append "--with-libpcre="
diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm
index 55a6d0b568..9e3bf0fc29 100644
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,7 +30,7 @@
(define-public moreutils
(package
(name "moreutils")
- (version "0.64")
+ (version "0.65")
(source
(origin
(method url-fetch)
@@ -42,7 +42,7 @@
"http://drabczyk.org/"
name "-" version ".tar.gz")))
(sha256
- (base32 "1v3hazb9i5y6b3vx4giiszvc2zk2pjjvq88xlk1maasw5ia07lpy"))))
+ (base32 "10c8b4bwnli4gxwvgmgkc5kin1ksrxsnxmigs7y4rrh4aaszdjb0"))))
(build-system gnu-build-system)
;; For building the manual pages.
(native-inputs
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c2a2668810..aba87ab6f2 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 nee <nee.git@hidamari.blue>
;;; Copyright © 2018 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -1839,7 +1839,7 @@ users to select LV2 plugins and run them with jalv.")
(define-public synthv1
(package
(name "synthv1")
- (version "0.9.18")
+ (version "0.9.19")
(source (origin
(method url-fetch)
(uri
@@ -1847,7 +1847,7 @@ users to select LV2 plugins and run them with jalv.")
"/synthv1-" version ".tar.gz"))
(sha256
(base32
- "1sggiaswcdpyxnnbg583ldg0m92fiys6nc5qdiqli7450w416a6c"))))
+ "17sizhav01mn07gi812n8wqdcr85290zqg609s18cww2b95dy6mn"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
@@ -1871,7 +1871,7 @@ oscillators and stereo effects.")
(define-public drumkv1
(package
(name "drumkv1")
- (version "0.9.18")
+ (version "0.9.19")
(source (origin
(method url-fetch)
(uri
@@ -1879,7 +1879,7 @@ oscillators and stereo effects.")
"/drumkv1-" version ".tar.gz"))
(sha256
(base32
- "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5"))))
+ "0w9frc634yg2m0yc84szdf6x7l4f19pcviqpg065a1kdixf98qrf"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
@@ -1904,7 +1904,7 @@ effects.")
(define-public samplv1
(package
(name "samplv1")
- (version "0.9.18")
+ (version "0.9.19")
(source (origin
(method url-fetch)
(uri
@@ -1912,7 +1912,7 @@ effects.")
"/samplv1-" version ".tar.gz"))
(sha256
(base32
- "13p5aj1513fwhzi9s4i1a5dbvzmbx9867zb0ddb9s9nbwks4ry3q"))))
+ "1fwvk83sfvp1k6qyqv1a7a1l8sbm6azcldaiiqa3ls1vhl4m5wv4"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
@@ -1937,7 +1937,7 @@ effects.")
(define-public padthv1
(package
(name "padthv1")
- (version "0.9.18")
+ (version "0.9.19")
(source (origin
(method url-fetch)
(uri
@@ -1945,7 +1945,7 @@ effects.")
"/padthv1-" version ".tar.gz"))
(sha256
(base32
- "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5"))))
+ "06fkrc4xxzr3sa3c76lnkcm4q9k0xl5993bn60la0ja4sz2kp6r7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
@@ -2913,14 +2913,14 @@ from the command line.")
(define-public qtractor
(package
(name "qtractor")
- (version "0.9.18")
+ (version "0.9.19")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/qtractor/"
"qtractor-" version ".tar.gz"))
(sha256
(base32
- "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr"))))
+ "0gdr1hvda56vmv4998z9xcqsp7da6lplj00f217x9g2i2snyvkzp"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; no "check" target
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 30b17da069..fad917a7c0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
@@ -1581,7 +1581,7 @@ application stack itself.")
(define-public httpstat
(package
(name "httpstat")
- (version "1.3.0")
+ (version "1.3.1")
(source
(origin
(method git-fetch)
@@ -1590,8 +1590,7 @@ application stack itself.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32
- "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"))))
+ (base32 "0cw8299a080m42slsimz31xs0gjnh833gpbj2dsr4hkcinrn4iyd"))))
(build-system python-build-system)
(inputs `(("curl" ,curl)))
(arguments
@@ -2111,7 +2110,7 @@ sockets in Perl.")
(define-public libproxy
(package
(name "libproxy")
- (version "0.4.15")
+ (version "0.4.17")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libproxy/libproxy/"
@@ -2119,7 +2118,7 @@ sockets in Perl.")
version ".tar.xz"))
(sha256
(base32
- "0kvdrazlzwia876w988cmlypp253gwy6idlh8mjk958c29jb8kb5"))))
+ "01cbgz6lc3v59sldqk96l1281kp2qxnsa2qwlf2ikvjlyr1gi2dw"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 20a331f391..7441db0179 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
@@ -132,8 +132,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0")
- (commit "7624ebbae33cf49dded5e9032ed426781c9554f6")
- (revision 8))
+ (commit "db42ee65bd657bae9b1a598cbdbe86079dc85f81")
+ (revision 9))
(package
(name "guix")
@@ -149,7 +149,7 @@
(commit commit)))
(sha256
(base32
- "0dd28df278fzlwxk1c0n86q98q8q8cj6g87as8v4rymyprf4gyjc"))
+ "1kizkw6cxh6mhc8kal2fglnhyp1i668b4ilqbxq72slbmf9jr9jl"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -418,6 +418,10 @@ $(prefix)/etc/init.d\n")))
("guile-git" ,guile-git)
("guile-zlib" ,guile-zlib)
("guile-lzlib" ,guile-lzlib)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "GUIX_EXTENSIONS_PATH")
+ (files '("share/guix/extensions")))))
(home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions")
@@ -584,14 +588,14 @@ out) and returning a package that uses that as its 'source'."
(define-public nix
(package
(name "nix")
- (version "2.3.9")
+ (version "2.3.10")
(source (origin
(method url-fetch)
(uri (string-append "https://nixos.org/releases/nix/nix-"
version "/nix-" version ".tar.xz"))
(sha256
(base32
- "1yi2c1fp33sxv9j0pvxlpxs1dhq3axrwkxdwr867ll90lbdiycvj"))))
+ "1axphwkx270c10bjyn4icq9wlx46npgnw0qkpymigl23vramxa58"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--sysconfdir=/etc" "--enable-gc")
@@ -1028,8 +1032,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
- (let ((commit "c33d3f570bd32afc2def410067db6b92ad6aff0a")
- (revision "12"))
+ (let ((commit "5149e4f322f71d65851c899cc9b8ce4532ca65ee")
+ (revision "14"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1040,7 +1044,7 @@ environments.")
(commit commit)))
(sha256
(base32
- "01mr211s1nb9hhm6784ibp87g59wifajcclbss3ry7i3qsbvg22j"))
+ "0ps8zppma9hvyikv9l0kl0k4p9cl499x4lb9vanj7zn99136sd3q"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -1070,7 +1074,6 @@ environments.")
(wrap-program file
`("PATH" ":" prefix
(,bin
- ,(dirname (which "nproc")) ; used by the agent
;; Support building without sqitch as an input, as it
;; can't be cross-compiled yet
,@(or (and=> (assoc-ref inputs "sqitch")
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 3f03792ffd..fde19ced92 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020 Ricardo Wurmus <rekado@elephly.net>
@@ -55,14 +55,14 @@
(define-public parallel
(package
(name "parallel")
- (version "20201122")
+ (version "20201222")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2"))
(sha256
- (base32 "0c7zrb26xhbn48kvxs01qyj1vhwrpzkm11xxvi23njb6qi1bz82d"))))
+ (base32 "13kxg2vmy20ciiv1gp96g33bmvma1nh5d66jdix1fqj6xjaizr5n"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -195,6 +195,21 @@ by managing a queue of pending work.")
;; <https://slurm.schedmd.com/troubleshoot.html#network>. Thus, keep older
;; releases here. See also <https://issues.guix.gnu.org/44387>.
+(define-public slurm-20.02
+ (package
+ (inherit slurm)
+ (version "20.02.6-1")
+ (source (origin
+ (inherit (package-source slurm))
+ (method url-fetch)
+ (uri (string-append
+ "https://download.schedmd.com/slurm/slurm-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc"))))))
+
+
(define-public slurm-19.05
(package
(inherit slurm)
diff --git a/gnu/packages/patches/gpsbabel-fix-i686-test.patch b/gnu/packages/patches/gpsbabel-fix-i686-test.patch
new file mode 100644
index 0000000000..5ba0305113
--- /dev/null
+++ b/gnu/packages/patches/gpsbabel-fix-i686-test.patch
@@ -0,0 +1,46 @@
+https://github.com/gpsbabel/gpsbabel/commit/465a74194d53acea5c8d74c5cf3cb2940546ec92.patch
+Can be removed next release
+
+From 465a74194d53acea5c8d74c5cf3cb2940546ec92 Mon Sep 17 00:00:00 2001
+From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
+Date: Fri, 7 Aug 2020 11:29:22 -0600
+Subject: [PATCH] fix i386 regression error with engima. (#620)
+
+this was motivated by the test failure seen at
+https://buildd.debian.org/status/fetch.php?pkg=gpsbabel&arch=i386&ver=1.7.0%2Bds-4&stamp=1596794554&raw=0
+---
+ enigma.cc | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/enigma.cc b/enigma.cc
+index 850f27b4e..32fea92d6 100644
+--- a/enigma.cc
++++ b/enigma.cc
+@@ -21,9 +21,16 @@
+
+ */
+
++#include <cmath> // for fabs, lround
++#include <cstdint> // for int32_t, uint8_t, uint32_t
++#include <cstdlib> // for abs
++#include <cstring> // for strlen, memcpy, memset
++
++#include <QtCore/QString> // for QString
++
+ #include "defs.h"
+-#include <cmath>
+-#include <cstdlib>
++#include "gbfile.h" // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
++
+
+ #define MYNAME "Enigma binary route and waypoint file format"
+
+@@ -177,7 +184,7 @@ enigma_waypt_disp(const Waypoint* wpt)
+ le_write32(&ewpt.longitude, decToEnigmaPosition(wpt->longitude));
+ ewpt.waypoint_type = WTYPE_WAYPOINT;
+ if (wpt->altitude != unknown_alt) {
+- le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
++ le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);
+ }
+ if (wpt->shortname != nullptr) {
+ ewpt.shortname_len = (uint8_t) min(6, strlen(CSTRc(wpt->shortname)));
diff --git a/gnu/packages/patches/gpsbabel-minizip.patch b/gnu/packages/patches/gpsbabel-minizip.patch
deleted file mode 100644
index 8f3bb36f57..0000000000
--- a/gnu/packages/patches/gpsbabel-minizip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch taken from https://sources.debian.org/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -120,7 +120,7 @@ LIBOBJS = queue.o route.o waypt.o filter
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
--OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
-+OBJS = main.o globals.o $(MINIZIP) $(LIBOBJS) @FILEINFO@
-
- DEPFILES = $(OBJS:.o=.d)
-
\ No newline at end of file
diff --git a/gnu/packages/patches/gpsbabel-qstring.patch b/gnu/packages/patches/gpsbabel-qstring.patch
deleted file mode 100644
index 8ba1a7213b..0000000000
--- a/gnu/packages/patches/gpsbabel-qstring.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Extracted from following patch of gpsbabel:
-https://github.com/gpsbabel/gpsbabel/commit/604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3
-
-From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001
-From: Harel Mazor <harel.mazor@gmail.com>
-Date: Tue, 24 Jan 2017 00:35:04 +0200
-Subject: [PATCH] Added geojson read capablity, moved magic strings to
- constants, fixed windows compilation issues.
-
---- a/tef_xml.cc
-+++ b/tef_xml.cc
-@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv)
- bool valid = false;
-
- foreach(QXmlStreamAttribute attr, *attrv) {
-- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
-- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) == 0) {
-+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
- valid = true;
- }
-- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitive) == 0) {
- version = attr.value().toString().toDouble();
- }
- }
-@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv)
- {
- route = route_head_alloc();
- foreach(QXmlStreamAttribute attr, *attrv) {
-- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) == 0) {
- route->rte_name = attr.value().toString().trimmed();
-- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensitive) == 0) {
- route->rte_desc = attr.value().toString().trimmed();
- }
- }
-@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
- QString attrstr = attr.value().toString();
- QByteArray attrtext = attrstr.toUtf8();
-
-- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
-+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->shortname = attrstr.trimmed();
-- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->description = attrstr.trimmed();
-- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
-- attr.value().compare("true", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensitive) == 0 &&
-+ attr.value().compare(QString("true"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */
-
- /* new in TEF V2 */
-- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->description = attrstr.trimmed();
-- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensitive) == 0) {
- wpt_tmp->altitude = attrstr.toDouble();
-- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
-+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensitive) == 0) {
- /* nothing for the moment */
- }
- }
---
-2.16.1
-
diff --git a/gnu/packages/patches/gsl-gtest.patch b/gnu/packages/patches/gsl-gtest.patch
new file mode 100644
index 0000000000..2def650292
--- /dev/null
+++ b/gnu/packages/patches/gsl-gtest.patch
@@ -0,0 +1,96 @@
+From f5cf01083baf7e8dc8318db3648bc6098dc32d67 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <guriev-ns@ya.ru>
+Date: Sat, 18 Apr 2020 13:30:17 +0300
+Subject: [PATCH] Search for GoogleTest via pkg-config first
+
+---
+ tests/CMakeLists.txt | 55 ++++++++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 25 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 02193197..53d475c2 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,36 +1,41 @@
+ cmake_minimum_required(VERSION 3.0.2)
+
+ project(GSLTests CXX)
++include(FindPkgConfig)
+
+ # will make visual studio generated project group files
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++pkg_search_module(GTestMain gtest_main)
++if (NOT GTestMain_FOUND)
++ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} --build .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} --build .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(GTestMain_LIBRARIES gtest_main)
+
+-add_subdirectory(
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
+- EXCLUDE_FROM_ALL
+-)
++ add_subdirectory(
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
++ EXCLUDE_FROM_ALL
++ )
++endif()
+
+ if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
+ set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
+@@ -149,7 +154,7 @@ function(add_gsl_test name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
+@@ -254,7 +259,7 @@ function(add_gsl_test_noexcept name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config_noexcept
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
diff --git a/gnu/packages/patches/libtgvoip-disable-sse2.patch b/gnu/packages/patches/libtgvoip-disable-sse2.patch
deleted file mode 100644
index 0e4faeab26..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-sse2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Copied from Debian.
-
-Description: Disable SSE2 code on i386
- This patch is not complete. A high-graded solution may use automatic switching
- between SSE2 and C++ implementations based on the results of runtime checks.
- The webrtc code already provides for one of them inside its GetCPUInfo function.
-Bug-Debian: https://bugs.debian.org/892823
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:38 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -871,11 +871,7 @@
- 'WEBRTC_POSIX',
- ],
- 'conditions': [
-- [ '"<!(uname -m)" == "i686"', {
-- 'cflags_cc': [
-- '-msse2',
-- ],
-- }], ['"<!(uname -s)" == "Linux"', {
-+ [ '"<!(uname -s)" == "Linux"', {
- 'defines': [
- 'WEBRTC_LINUX',
- ],
---- a/webrtc_dsp/rtc_base/system/arch.h
-+++ b/webrtc_dsp/rtc_base/system/arch.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
---- a/webrtc_dsp/typedefs.h
-+++ b/webrtc_dsp/typedefs.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
diff --git a/gnu/packages/patches/libtgvoip-disable-webrtc.patch b/gnu/packages/patches/libtgvoip-disable-webrtc.patch
deleted file mode 100644
index 0ca532301c..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-webrtc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copied from Debian.
-
-Description: Fix build of WebRTC on non-Linux systems
- * Define the WEBRTC_LINUX macro only on Linux, and not on GNU/Hurd or FreeBSD.
- * Fix type cast in the CurrentThreadId function.
-Bug-Debian: https://bugs.debian.org/920851
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:44 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -869,20 +869,18 @@
- '"<(OS)" == "linux"', {
- 'defines': [
- 'WEBRTC_POSIX',
-- 'WEBRTC_LINUX',
- ],
- 'conditions': [
- [ '"<!(uname -m)" == "i686"', {
- 'cflags_cc': [
- '-msse2',
- ],
-+ }], ['"<!(uname -s)" == "Linux"', {
-+ 'defines': [
-+ 'WEBRTC_LINUX',
-+ ],
- }]
- ],
-- 'direct_dependent_settings': {
-- 'libraries': [
--
-- ],
-- },
- },
- ],
- ],
---- a/webrtc_dsp/rtc_base/platform_thread_types.cc
-+++ b/webrtc_dsp/rtc_base/platform_thread_types.cc
-@@ -31,7 +31,7 @@ PlatformThreadId CurrentThreadId() {
- return syscall(__NR_gettid);
- #else
- // Default implementation for nacl and solaris.
-- return reinterpret_cast<pid_t>(pthread_self());
-+ return static_cast<pid_t>(pthread_self());
- #endif
- #endif // defined(WEBRTC_POSIX)
- }
diff --git a/gnu/packages/patches/libtgvoip-pkgconfig.patch b/gnu/packages/patches/libtgvoip-pkgconfig.patch
new file mode 100644
index 0000000000..23794e8d77
--- /dev/null
+++ b/gnu/packages/patches/libtgvoip-pkgconfig.patch
@@ -0,0 +1,61 @@
+From 4ce5e22ed2dc24e9211c4874c1dd6b05faad2a87 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sun, 5 Jan 2020 12:25:31 +0400
+Subject: [PATCH] Add support for pkg-config
+
+---
+ Makefile.am | 2 ++
+ configure.ac | 4 +++-
+ tgvoip.pc.in | 10 ++++++++++
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 tgvoip.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 03c8866..a9c9715 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -755,6 +755,8 @@ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
+ tgvoipincludedir = $(includedir)/tgvoip
+ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
+
++pkgconfig_DATA = tgvoip.pc
++
+ CXXFLAGS += -std=gnu++0x $(CFLAGS)
+ if TARGET_OS_OSX
+ OBJCFLAGS = $(CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index 222f541..e2df927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,8 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AM_SILENT_RULES([yes])
+ LT_INIT
+
++PKG_INSTALLDIR
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+@@ -109,5 +111,5 @@ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname])
+
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile tgvoip.pc])
+ AC_OUTPUT
+diff --git a/tgvoip.pc.in b/tgvoip.pc.in
+new file mode 100644
+index 0000000..1ca7758
+--- /dev/null
++++ b/tgvoip.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tgvoip
++Description: VoIP library for Telegram clients
++Version: 2.4.4
++Libs: -L${libdir} -ltgvoip
++Cflags: -I${includedir}/tgvoip
diff --git a/gnu/packages/patches/rust-1.48-linker-locale.patch b/gnu/packages/patches/rust-1.48-linker-locale.patch
new file mode 100644
index 0000000000..d06dcbe682
--- /dev/null
+++ b/gnu/packages/patches/rust-1.48-linker-locale.patch
@@ -0,0 +1,14 @@
+https://github.com/rust-lang/rust/pull/74416
+diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
+index 3df956c465e..f45fee45be4 100644
+--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
++++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
+@@ -28,7 +28,7 @@
+ pub fn disable_localization(linker: &mut Command) {
+ // No harm in setting both env vars simultaneously.
+ // Unix-style linkers.
+- linker.env("LC_ALL", "C");
++ linker.env("LC_ALL", "en_US.UTF-8");
+ // MSVC's `link.exe`.
+ linker.env("VSLANG", "1033");
+ }
diff --git a/gnu/packages/patches/smalltalk-multiplication-overflow.patch b/gnu/packages/patches/smalltalk-multiplication-overflow.patch
new file mode 100644
index 0000000000..7a0b4d02f7
--- /dev/null
+++ b/gnu/packages/patches/smalltalk-multiplication-overflow.patch
@@ -0,0 +1,121 @@
+Extracted from this commit without the ChangeLog to avoid conflicts:
+http://git.savannah.gnu.org/cgit/smalltalk.git/commit/?id=72ada189aba0283c551ead16635c1983968080b8
+
+The upstream commit message is
+From 72ada189aba0283c551ead16635c1983968080b8 Mon Sep 17 00:00:00 2001
+From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
+Date: Sat, 7 Nov 2015 18:09:31 +0100
+Subject: libgst: Add alternative multiplication overflow check
+
+Apple clang on OSX and the version on FreeBSD optimize the
+multiplication check away. Clang introduced a family of
+builtins to do the multiplication and check for the overflow
+and GCC made the API usable. For clang we would need to know
+if intptr_t is of type int, long int, long long int and
+then use the smul, smull smulll.
+Luckily clang is adopting the better interface and this is
+what we are starting to use now. This means the new code
+will be used on GCC5 (and later) and some future versions of
+clang.
+
+2015-11-07 Holger Hans Peter Freyther <holger@freyther.de>
+
+ * build-aux/overflow-builtins.m4: Add new macro.
+ * configure.ac: Use GST_C_OVERFLOW_BUILTINS macro.
+
+2015-11-07 Holger Hans Peter Freyther <holger@freyther.de>
+
+ * interp.inl: Add alternative mul_with_check implementation.
+---
+ ChangeLog | 5 +++++
+ build-aux/overflow-builtins.m4 | 23 +++++++++++++++++++++++
+ configure.ac | 1 +
+ libgst/ChangeLog | 4 ++++
+ libgst/interp.inl | 22 ++++++++++++++++++++++
+ 5 files changed, 55 insertions(+)
+ create mode 100644 build-aux/overflow-builtins.m4
+
+diff --git a/build-aux/overflow-builtins.m4 b/build-aux/overflow-builtins.m4
+new file mode 100644
+index 00000000..9d050196
+--- /dev/null
++++ b/build-aux/overflow-builtins.m4
+@@ -0,0 +1,23 @@
++dnl Check whether the host supports synchronization builtins.
++
++AC_DEFUN([GST_C_OVERFLOW_BUILTINS], [
++ AC_REQUIRE([AC_CANONICAL_HOST])
++ AC_CACHE_CHECK([whether the host supports __builtin_mul_overflow],
++ gst_cv_have_builtin_mul_overflow, [
++ save_CFLAGS="$CFLAGS"
++ case $host in
++ i?86-apple-darwin*) ;;
++ i?86-*-*) CFLAGS="$CFLAGS -march=i486" ;;
++ esac
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[int foovar = 0;]], [[
++if (__builtin_mul_overflow(44444, 55555, &foovar))
++ return 23;]])],
++ [gst_cv_have_builtin_mul_overflow=yes],
++ [gst_cv_have_builtin_mul_overflow=no])
++ CFLAGS="$save_CFLAGS"
++ ])
++ if test $gst_cv_have_builtin_mul_overflow = yes; then
++ AC_DEFINE(HAVE_OVERFLOW_BUILTINS, 1,
++ [Define to 1 if the host supports __builtin_*_overflow builtins])
++ fi
++])
+diff --git a/configure.ac b/configure.ac
+index e789be45..0bac23ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -243,6 +243,7 @@ GST_C_SYNC_BUILTINS
+ if test $gst_cv_have_sync_fetch_and_add = no; then
+ AC_MSG_ERROR([Synchronization primitives not found, please use a newer compiler.])
+ fi
++GST_C_OVERFLOW_BUILTINS
+
+ GST_LOCK
+ AC_SYS_LARGEFILE
+diff --git a/libgst/interp.inl b/libgst/interp.inl
+index e18e27c7..dbc631bc 100644
+--- a/libgst/interp.inl
++++ b/libgst/interp.inl
+@@ -159,6 +159,27 @@ sub_with_check (OOP op1, OOP op2, mst_Boolean *overflow)
+ OOP
+ mul_with_check (OOP op1, OOP op2, mst_Boolean *overflow)
+ {
++#ifdef HAVE_OVERFLOW_BUILTINS
++ intptr_t a = TO_INT (op1);
++ intptr_t b = TO_INT (op2);
++ intptr_t result;
++
++ if (__builtin_mul_overflow(a, b, &result))
++ {
++ *overflow = true;
++ return FROM_INT(0);
++ }
++
++
++ if (result < MIN_ST_INT || result > MAX_ST_INT)
++ {
++ *overflow = true;
++ return FROM_INT(0);
++ }
++
++ *overflow = false;
++ return FROM_INT(result);
++#else
+ intptr_t a = TO_INT (op1);
+ intptr_t b = TO_INT (op2);
+ intmax_t result = (intmax_t)a * b;
+@@ -188,6 +209,7 @@ mul_with_check (OOP op1, OOP op2, mst_Boolean *overflow)
+ }
+
+ return FROM_INT (0);
++#endif
+ }
+
+ /* State of the random generator.
+--
+2.29.2
+
diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index cc7736ce18..ad8b166bd9 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
@@ -587,7 +587,7 @@ testing exception-throwing code with about the same amount of typing.")
(define-public perl-test-file
(package
(name "perl-test-file")
- (version "1.443")
+ (version "1.444")
(source
(origin
(method url-fetch)
@@ -596,8 +596,7 @@ testing exception-throwing code with about the same amount of typing.")
version
".tar.gz"))
(sha256
- (base32
- "1mdwb3x8d4l24wsymamsnq2c73a637v4q5kmb5xqqz31iymsdd31"))))
+ (base32 "0195dnvwxxphwbglw6cjid3j7kq15xg46lr7r4468idvadyal6c7"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-utf8" ,perl-test-utf8)))
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 040206504d..896a474bba 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -28,6 +28,7 @@
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4056,6 +4057,41 @@ environment, other than a fixed list of specified variables. Compilation
errors are rethrown automatically.")
(license (package-license perl))))
+(define-public perl-eval-withlexicals
+ (package
+ (name "perl-eval-withlexicals")
+ (version "1.003006")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/H/HA/HAARG/Eval-WithLexicals-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0x09mq0q745cxkw3xgr0h7dil7p1pdq3l5299kj3mk2ijkk2gwb6"))))
+ (build-system perl-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'install 'wrap-tinyrepl
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/tinyrepl")
+ `("PERL5LIB" ":" prefix
+ (,(getenv "PERL5LIB")
+ ,(string-append out "/lib/perl5/site_perl"))))
+ #t))))))
+ (propagated-inputs
+ `(("perl-moo" ,perl-moo)
+ ("perl-strictures" ,perl-strictures)))
+ (home-page "https://metacpan.org/release/Eval-WithLexicals")
+ (synopsis "Lexical scope evaluation library for Perl")
+ (description "The Eval::WithLexicals Perl library provides support for
+lexical scope evaluation. This package also includes the @command{tinyrepl}
+command, which can be used as a minimal Perl read-eval-print loop (REPL).")
+ (license (package-license perl))))
+
(define-public perl-exception-class
(package
(name "perl-exception-class")
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 5a56b59548..ef2618083f 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -60,7 +60,7 @@
(define-public php
(package
(name "php")
- (version "7.4.13")
+ (version "7.4.14")
(home-page "https://secure.php.net/")
(source (origin
(method url-fetch)
@@ -68,7 +68,7 @@
"php-" version ".tar.xz"))
(sha256
(base32
- "1x402vsg3zq8mbar2fwln85vmvdvmrxm8q4ma8333hms78z31bdf"))
+ "11i8w12kyz2lx3fs4vv4l6ccca1znmmdf7dv3mn01ngwd5ww7wzr"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "ext"
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index a3f9bef63c..4ab1da5ca9 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@@ -270,14 +270,14 @@ seen in a terminal.")
(define-public highlight
(package
(name "highlight")
- (version "3.59")
+ (version "3.60")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.andre-simon.de/zip/highlight-"
version ".tar.bz2"))
(sha256
- (base32 "18j9q9w9l71zxaaf8klcl4f5rqcmqnz9632azabv8scfw2l6r4l5"))))
+ (base32 "098xwzj70f2kp9zbfknlqca41lgdjv71clfx1m84151xdszv8p56"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index bbf98ee653..e03582c47b 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -75,34 +75,36 @@ with Graphtec and Sihouette plotting cutters using an SVG file as its input.")
(license license:gpl3+)))
(define-public brlaser
- (package
- (name "brlaser")
- (version "6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pdewacht/brlaser")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list (string-append "-DCUPS_DATA_DIR="
- (assoc-ref %outputs "out")
- "/share/cups")
- (string-append "-DCUPS_SERVER_BIN="
- (assoc-ref %outputs "out")
- "/lib/cups"))))
- (inputs
- `(("ghostscript" ,ghostscript)
- ("cups" ,cups)
- ("zlib" ,zlib)))
- (home-page "https://github.com/pdewacht/brlaser")
- (synopsis "Brother laser printer driver")
- (description "Brlaser is a CUPS driver for Brother laser printers. This
+ (let ((commit "9d7ddda8383bfc4d205b5e1b49de2b8bcd9137f1")
+ (revision "1"))
+ (package
+ (name "brlaser")
+ (version (git-version "6" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pdewacht/brlaser")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1drh0nk7amn9a8wykki4l9maqa4vy7vwminypfy1712alwj31nd4"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list (string-append "-DCUPS_DATA_DIR="
+ (assoc-ref %outputs "out")
+ "/share/cups")
+ (string-append "-DCUPS_SERVER_BIN="
+ (assoc-ref %outputs "out")
+ "/lib/cups"))))
+ (inputs
+ `(("ghostscript" ,ghostscript)
+ ("cups" ,cups)
+ ("zlib" ,zlib)))
+ (home-page "https://github.com/pdewacht/brlaser")
+ (synopsis "Brother laser printer driver")
+ (description "Brlaser is a CUPS driver for Brother laser printers. This
driver is known to work with these printers:
@enumerate
@@ -137,4 +139,4 @@ driver is known to work with these printers:
@item Brother MFC-L2710DW series
@item Lenovo M7605D
@end enumerate")
- (license license:gpl2+)))
+ (license license:gpl2+))))
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6f3dbbf9f2..486cc48457 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2016, 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
-;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -1212,14 +1212,14 @@ none of them have everything that I'd like, so here's one more. It uses
(define-public python-libnacl
(package
(name "python-libnacl")
- (version "1.6.1")
+ (version "1.7.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "libnacl" version))
(sha256
(base32
- "0nv7n8nfswkhl614x5mllrkvaslraa0053q11iylb337cy43vb4v"))))
+ "0srx7i264v4dq9and8y6gpzzhrg8jpxs5iy9ggw4plimfj0rjfdm"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -1227,11 +1227,10 @@ none of them have everything that I'd like, so here's one more. It uses
(add-after 'unpack 'locate-libsodium
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libnacl/__init__.py"
- (("(return ctypes.cdll.LoadLibrary\\(')libsodium.so('\\))"
- _ pre post)
- (let ((libsodium (string-append (assoc-ref inputs "libsodium")
- "/lib/libsodium.so")))
- (string-append pre libsodium post)))))))))
+ (("/usr/local/lib/libsodium.so")
+ (string-append (assoc-ref inputs "libsodium")
+ "/lib/libsodium.so")))
+ #t)))))
(native-inputs
`(("python-pyhamcrest" ,python-pyhamcrest)))
(inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 818a244378..23e43b7e75 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
@@ -31,7 +31,7 @@
;;; Copyright © 2016, 2017, 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
@@ -50,7 +50,7 @@
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
;;; Copyright © 2016, 2018 Tomáš Čech <sleep_walker@gnu.org>
-;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -93,6 +93,7 @@
;;; Copyright © 2020 Diego N. Barbato <dnbarbato@posteo.de>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Kristian Trandem <kristian@devup.no>
+;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -158,6 +159,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages openstack)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
@@ -175,6 +177,7 @@
#:use-module (gnu packages shells)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages terminals)
#:use-module (gnu packages tex)
#:use-module (gnu packages texinfo)
@@ -4901,6 +4904,25 @@ algorithm. Patiencediff provides a good balance of performance, nice output for
humans, and implementation simplicity.")
(license license:gpl2)))
+(define-public python-pdftotext
+ (package
+ (name "python-pdftotext")
+ (version "2.1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pdftotext" version))
+ (sha256
+ (base32
+ "19la1cw1hmkcr8big04gm2dd5fw0y0z97g930aiy29s1gaqbiblq"))))
+ (build-system python-build-system)
+ (inputs
+ `(("poppler" ,poppler)))
+ (home-page "https://github.com/jalan/pdftotext")
+ (synopsis "Simple PDF text extraction")
+ (description "Pdftotext is a Python library of PDF text extraction.")
+ (license license:expat)))
+
(define-public python-pyparsing
(package
(name "python-pyparsing")
@@ -13579,13 +13601,13 @@ collections of data.")
(define-public python-prompt-toolkit
(package
(name "python-prompt-toolkit")
- (version "3.0.7")
+ (version "3.0.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "prompt_toolkit" version))
(sha256
- (base32 "12a4pyrpnm3vcrvx7lb4cglp220lbvi336mhn2k2nzcgy82lcbw2"))))
+ (base32 "0bvjp62cs6aj9lrh7njzxdjgg8pjfw3qgmr551243d9ivmcapvn5"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -13602,8 +13624,7 @@ collections of data.")
`(("python-wcwidth" ,python-wcwidth)))
(native-inputs
`(("python-pytest" ,python-pytest)))
- (home-page
- "https://github.com/prompt-toolkit/python-prompt-toolkit")
+ (home-page "https://github.com/prompt-toolkit/python-prompt-toolkit")
(synopsis "Library for building command line interfaces in Python")
(description
"Prompt-Toolkit is a library for building interactive command line
@@ -14144,14 +14165,14 @@ monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.")
(define-public python-graphql-core
(package
(name "python-graphql-core")
- (version "0.5.3")
+ (version "3.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "graphql-core" version))
(sha256
(base32
- "0rsaarx2sj4xnw9966rhh4haiqaapm4lm2mfqm48ywd51j5vh1a0"))))
+ "0fjv5w2wvgdr8gb27v241bavliipyir9fdz48rsgc3xapm644mn0"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; Tests require the unpackaged pytest-benchmark.
@@ -18215,13 +18236,13 @@ Included are implementations of:
(define-public bpython
(package
(name "bpython")
- (version "0.18")
+ (version "0.20.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "bpython" version))
(sha256
- (base32 "1hl6frgvr2lqaxqczl8amg9xih32b3gzv429vs0qrjb8wpdj1k2n"))))
+ (base32 "00vmkkc79mlnkyvwww1cr7bpwmf4p61704dhayz6kd0kc203hxvf"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -18244,11 +18265,14 @@ Included are implementations of:
(propagated-inputs
`(("python-pygments" ,python-pygments)
("python-requests" ,python-requests)
- ("python-babel" ,python-babel) ; optional, for internationalization
- ("python-curtsies" ,python-curtsies) ; >= 0.1.18
+ ("python-curtsies" ,python-curtsies)
("python-greenlet" ,python-greenlet)
+ ("python-six" ,python-six)
+ ("python-wcwidth" ,python-wcwidth)
+ ;; optional dependencies
("python-urwid" ,python-urwid) ; for bpython-urwid only
- ("python-six" ,python-six)))
+ ("python-watchdog" ,python-watchdog)
+ ("python-jedi" ,python-jedi)))
(native-inputs
`(("python-sphinx" ,python-sphinx)
("python-mock" ,python-mock)))
@@ -23383,3 +23407,47 @@ Qt applications.")
"Bitstring is a library for simple construction, analysis and modification
of binary data.")
(license license:expat)))
+
+(define-public python-pivy
+ (package
+ (name "python-pivy")
+ (version "0.6.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coin3d/pivy")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
+ (build-system python-build-system)
+ (arguments
+ `(;; The test suite fails due to an import cycle between 'pivy' and '_coin'
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake-include-dirs
+ (lambda _
+ ;; Patch buildsystem to respect Coin3D include directory
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{SoQt_INCLUDE_DIRS}")
+ "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))
+ #t)))))
+ (native-inputs
+ `(("cmake" ,cmake)
+ ("swig" ,swig)))
+ (inputs
+ `(("python-wrapper" ,python-wrapper)
+ ("qtbase" ,qtbase)
+ ("libxi" ,libxi)
+ ("libice" ,libice)
+ ("soqt" ,soqt)
+ ("glew" ,glew)
+ ("coin3D" ,coin3D-4)))
+ (home-page "https://github.com/coin3d/pivy")
+ (synopsis "Python bindings to Coin3D")
+ (description
+ "Pivy provides python bindings for Coin, a 3D graphics library with an
+Application Programming Interface based on the Open Inventor 2.1 API.")
+ (license license:isc)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0b94063373..cd24f2c319 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -45,6 +45,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (guix utils)
@@ -67,10 +68,12 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages graphics)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -102,6 +105,79 @@
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1))
+(define-public qt5ct
+ (package
+ (name "qt5ct")
+ (version "1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
+ (sha256
+ (base32 "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "qt5ct.pro"
+ (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
+ (string-append (assoc-ref inputs "qttools")
+ "/bin/lrelease")))
+ #t))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (invoke "qmake"
+ (string-append "PREFIX=" out)
+ (string-append "BINDIR=" out "/bin")
+ (string-append "DATADIR=" out "/share")
+ (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("qttools" ,qttools)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
+ (synopsis "Qt5 Configuration Tool")
+ (description "Qt5CT is a program that allows users to configure Qt5 settings
+(theme, font, icons, etc.) under DE/WM without Qt integration.")
+ (home-page "https://qt5ct.sourceforge.io/")
+ (license license:bsd-2)))
+
+(define-public materialdecoration
+ (package
+ (name "materialdecoration")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/materialdecoration.git")
+ (commit "2079487116c6c794af3a15452342a69293039b46")))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("cmake-shared" ,cmake-shared)
+ ("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtwayland" ,qtwayland)
+ ("wayland" ,wayland)))
+ (synopsis "Material Decoration for Qt")
+ (description "MaterialDecoration is the client-side decoration for Qt
+applications on Wayland.")
+ (home-page "https://github.com/lirios/materialdecoration")
+ (license license:lgpl3+)))
+
(define-public grantlee
(package
(name "grantlee")
@@ -2850,3 +2926,35 @@ being fully customizable and easy to extend.")
;; According to LICENSE, either version 2 or version 3 of the GNU GPL may
;; be used.
(license (list license:gpl2 license:gpl3))))
+
+
+(define-public soqt
+ (let ((commit-ref "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d")
+ (revision "1"))
+ (package
+ (name "soqt")
+ (version (git-version "1.6.0" revision commit-ref))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coin3d/soqt")
+ (commit commit-ref)
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16vikb3fy8rmk10sg5g0gy2c343hi3x7zccsga90ssnkzpq6m032"))))
+ (build-system cmake-build-system)
+ (arguments '(#:tests? #f)) ; There are no tests
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("cmake" ,cmake)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("coin3D" ,coin3D-4)))
+ (home-page "https://github.com/coin3d/soqt")
+ (synopsis "Qt GUI component toolkit library for Coin")
+ (description "SoQt is a Qt GUI component toolkit library for Coin. It is
+also compatible with SGI and TGS Open Inventor, and the API is based on the API
+of the InventorXt GUI component toolkit.")
+ (license license:bsd-3))))
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 70a9762379..0a4b623360 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
-;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -577,14 +577,14 @@ using GNU Radio and the Qt GUI toolkit.")
(define-public fldigi
(package
(name "fldigi")
- (version "4.1.16")
+ (version "4.1.17")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.w1hkj.com/files/fldigi/fldigi-"
version ".tar.gz"))
(sha256
- (base32 "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4"))))
+ (base32 "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/rcm.scm b/gnu/packages/rcm.scm
index c61626d114..f8c7ba4200 100644
--- a/gnu/packages/rcm.scm
+++ b/gnu/packages/rcm.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,13 +28,13 @@
(define-public rcm
(package
(name "rcm")
- (version "1.3.3")
+ (version "1.3.4")
(source (origin
(method url-fetch)
(uri (string-append "https://thoughtbot.github.io/rcm/dist/rcm-"
version ".tar.gz"))
(sha256
- (base32 "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck"))))
+ (base32 "0jn2crdqcna0fyg7w7x1mcyjblzykd3lh4vdxhsd5x4w8hvsw4cv"))))
(build-system gnu-build-system)
(arguments '(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index c3d1d3bb26..3745a8377c 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1,12 +1,13 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
-;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
-;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -199,7 +200,7 @@ also knows about symlinks, extended attributes, and Git.")
(arguments
`(#:cargo-inputs
(("rust-ansi-term" ,rust-ansi-term-0.12)
- ("rust-anyhow" ,rust-anyhow-1.0)
+ ("rust-anyhow" ,rust-anyhow-1)
("rust-atty" ,rust-atty-0.2)
("rust-clap" ,rust-clap-2)
("rust-ctrlc" ,rust-ctrlc-3.1)
@@ -371,6 +372,62 @@ gitignore rules.")
"This package provides a tool for generating C/C++ bindings to Rust code.")
(license license:mpl2.0)))
+(define-public rust-cbindgen-0.16
+ (package
+ (inherit rust-cbindgen)
+ (name "rust-cbindgen")
+ (version "0.16.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cbindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "049cai626nzw0km03parx4sxwaxgbr7i5ifjbjwnfxkqkj5k2i4k"))))
+ (arguments
+ `(#:tests? #false ;missing files
+ #:cargo-inputs
+ (("rust-clap" ,rust-clap-2)
+ ("rust-heck" ,rust-heck-0.3)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-syn" ,rust-syn-1)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-toml" ,rust-toml-0.5))
+ #:cargo-development-inputs
+ (("rust-serial-test" ,rust-serial-test-0.5))))))
+
+(define-public rust-cbindgen-0.15
+ (package
+ (inherit rust-cbindgen)
+ (name "rust-cbindgen")
+ (version "0.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cbindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0dgf49zij9rxnf0lv4k5gcmx1mxcz16czkk6q63anz0xp8ds3xhx"))))
+ (arguments
+ `(#:tests? #false ;missing files
+ #:cargo-inputs
+ (("rust-clap" ,rust-clap-2)
+ ("rust-heck" ,rust-heck-0.3)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-syn" ,rust-syn-1)
+ ("rust-tempfile" ,rust-tempfile-3)
+ ("rust-toml" ,rust-toml-0.5))))))
+
(define-public rust-cbindgen-0.14
(package
(inherit rust-cbindgen)
@@ -459,7 +516,7 @@ blanks grouped by language.")
(define-public watchexec
(package
(name "watchexec")
- (version "1.14.0")
+ (version "1.14.1")
(source
(origin
(method url-fetch)
@@ -467,8 +524,7 @@ blanks grouped by language.")
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "0bwgqb5fvyqbf2lf0005fxzpbpbwbszc7144g3kg2cmzy5cbrf0w"))))
+ (base32 "1vqaa462sjpzi0crh12ixqc2wa5bblirc129pnj8jr8iz3xw3gvd"))))
(build-system cargo-build-system)
(arguments
`(#:phases
@@ -483,7 +539,7 @@ blanks grouped by language.")
(install-file "README.md" doc)
#t))))
#:cargo-inputs
- (("rust-clap" ,rust-clap-2)
+ (("rust-embed-resource" ,rust-embed-resource-1.3)
("rust-derive-builder" ,rust-derive-builder-0.9)
("rust-env-logger" ,rust-env-logger-0.7)
("rust-glob" ,rust-glob-0.3)
@@ -492,8 +548,7 @@ blanks grouped by language.")
("rust-log" ,rust-log-0.4)
("rust-nix" ,rust-nix-0.17)
("rust-notify" ,rust-notify-4)
- ("rust-walkdir" ,rust-walkdir-2)
- ("rust-winapi" ,rust-winapi-0.3))))
+ ("rust-walkdir" ,rust-walkdir-2))))
(home-page "https://github.com/watchexec/watchexec")
(synopsis "Executes commands in response to file modifications")
(description
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 91b5d6b6ec..58a9092ac4 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -8,8 +8,9 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
-;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020, 2021 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1319,5 +1320,74 @@ move around."
(rust-bootstrapped-package rust-1.45 "1.46.0"
"0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"))
+(define-public rust-1.47
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.46 "1.47.0"
+ "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
+ (package
+ (inherit base-rust)
+ (inputs
+ (alist-replace "llvm" (list llvm-11)
+ (package-inputs base-rust)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The source code got rearranged: libstd is now in the newly created library folder.
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process.rs"
+ (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
+ (substitute* "library/std/src/sys/unix/process/process_common.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ #t)))
+ (delete 'patch-cargo-checksums)
+ (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
+ ;; Generate checksums after patching generated files (in
+ ;; particular, vendor/jemalloc/rep/Makefile).
+ (lambda* _
+ (use-modules (guix build cargo-utils))
+ (substitute* "Cargo.lock"
+ (("(checksum = )\".*\"" all name)
+ (string-append name "\"" ,%cargo-reference-hash "\"")))
+ (generate-all-checksums "vendor")
+ #t)))))))))
+
+(define-public rust-1.48
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.47 "1.48.0"
+ "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ ;; New patch required due to the second part of the source code rearrangement:
+ ;; the relevant source code is now in the compiler directory.
+ (patches (search-patches "rust-1.48-linker-locale.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; Some tests got split out into separate files.
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process/tests.rs"
+ (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ (substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ #t))))))))))
+
+(define-public rust-1.49
+ (rust-bootstrapped-package rust-1.48 "1.49.0"
+ "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))
+
;; TODO(staging): Bump this variable to the latest packaged rust.
(define-public rust rust-1.45)
diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm
index 943e9ba5b9..7f060155ed 100644
--- a/gnu/packages/sagemath.scm
+++ b/gnu/packages/sagemath.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,14 +45,14 @@
(define-public python-cypari2
(package
(name "python-cypari2")
- (version "2.1.1")
+ (version "2.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cypari2" version))
(sha256
(base32
- "1nwkzgqvbw6361x0rpggy1q5nx663fswhpvg8md6xhqyfwpgc7nz"))))
+ "0ymc4i9y60aazscc1blivirkr1rflzz6akkmvfzyn5l7mgnlbk83"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython)))
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index f869831dec..679e2ab869 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
@@ -64,14 +64,14 @@
(define-public cifs-utils
(package
(name "cifs-utils")
- (version "6.11")
+ (version "6.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/linux-cifs/"
"cifs-utils/cifs-utils-" version ".tar.bz2"))
(sha256 (base32
- "1n98hy3zi4klm1xxhb840br1x7hhz0xx8kp5sch84kr07yd26ndq"))))
+ "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -87,12 +87,6 @@
(arguments
`(#:phases
(modify-phases %standard-phases
- (replace 'bootstrap
- ;; Force a bootstrap to fix a ‘cannot find install-sh, install.sh,
- ;; or shtool’ error since version 6.10.
- (lambda _
- (invoke "autoreconf" "-vfi")
- #t))
(add-before 'configure 'set-root-sbin
(lambda* (#:key outputs #:allow-other-keys)
;; Don't try to install into "/sbin".
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 0a5fa38b30..8293d562b3 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -116,15 +116,14 @@ rich set of boolean query operators.")
(define-public perl-search-xapian
(package
(name "perl-search-xapian")
- (version "1.2.25.2")
+ (version "1.2.25.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/O/OL/OLLY/"
"Search-Xapian-" version ".tar.gz"))
(sha256
- (base32
- "0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"))))
+ (base32 "1pbl8pbgmbs3i8yik4p63g4pd9bhn0dp3d7l667dkvw0kccl66c7"))))
(build-system perl-build-system)
(native-inputs
`(("perl-devel-leak" ,perl-devel-leak)))
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 06e5620cd3..50e6a502ca 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -87,11 +87,11 @@
(("/bin/echo") (which "echo")))
#t)))))
(native-inputs
- `(("pcsc-lite" ,pcsc-lite) ; only required for headers
- ("perl" ,perl)
+ `(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
- `(("libusb" ,libusb)))
+ `(("libusb" ,libusb)
+ ("pcsc-lite" ,pcsc-lite)))
(home-page "https://ccid.apdu.fr/")
(synopsis "PC/SC driver for USB smart card devices")
(description
@@ -104,7 +104,7 @@ readers and is needed to communicate with such devices through the
(define-public eid-mw
(package
(name "eid-mw")
- (version "5.0.8")
+ (version "5.0.11")
(source
(origin
(method git-fetch)
@@ -113,7 +113,7 @@ readers and is needed to communicate with such devices through the
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ckini00iz9w96n9hpkx6w2ivpfkd4yyxyhnmsl9n0k8x4j6jg5a"))))
+ (base32 "0590cz00cny749p99srv880gpgzvxaf9fwm2lghv3nw0qdsilss8"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -134,7 +134,9 @@ readers and is needed to communicate with such devices through the
("libxml2" ,libxml2)
("cyrus-sasl" ,cyrus-sasl)))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list "--disable-static")
+ #:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index 6550a71a1a..f07416c315 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -70,7 +70,7 @@
`(#:tests? #f ;; building the tests requires 9.7GB total
#:rust ,rust-1.46
#:cargo-inputs
- (("rust-anyhow" ,rust-anyhow-1.0)
+ (("rust-anyhow" ,rust-anyhow-1)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-base64" ,rust-base64-0.13)
;;("rust-buffered-reader" included
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 5b3ae21e0d..0b4edbe452 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
@@ -65,14 +65,14 @@
(define-public dash
(package
(name "dash")
- (version "0.5.11.2")
+ (version "0.5.11.3")
(source
(origin
(method url-fetch)
(uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/"
"dash-" version ".tar.gz"))
(sha256
- (base32 "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"))
+ (base32 "0amwphfal2rnfa63f7qd4i9m4ckv0gm3j6jlxkmfi9x6ddkz3fb2"))
(modules '((guix build utils)))
(snippet
'(begin
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 181a640475..c7a941dfa6 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020 aecepoglu <aecepoglu@fastmail.fm>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,8 @@
#:use-module (guix build-system python)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages golang)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
@@ -43,6 +46,46 @@
#:use-module (gnu packages shells)
#:use-module (gnu packages tmux))
+(define-public boxes
+ (package
+ (name "boxes")
+ (version "1.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ascii-boxes/boxes")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0b12rsynrmkldlwcb62drk33kk0aqwbj10mq5y5x3hjf626gjwsi"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:test-target "test"
+ #:make-flags (list (string-append "GLOBALCONF="
+ (assoc-ref %outputs "out")
+ "/etc/boxes-config"))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((dest (assoc-ref outputs "out")))
+ (for-each (lambda (x)
+ (install-file (car x)
+ (string-append dest "/" (cdr x))))
+ '(("src/boxes" . "bin")
+ ("doc/boxes.1" . "share/man/man1")
+ ("boxes-config" . "etc/")))
+ #t))))))
+ (native-inputs `(("flex" ,flex) ("bison" ,bison)))
+ (synopsis "Command line ASCII boxes")
+ (description
+ "This command-line filter program draws ASCII-art boxes around your input
+text.")
+ (home-page "https://boxes.thomasjensen.com/build.html")
+ (license license:gpl2)))
+
(define-public zsh-autosuggestions
(package
(name "zsh-autosuggestions")
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm
index 5d35f563e2..ea1798ac13 100644
--- a/gnu/packages/smalltalk.scm
+++ b/gnu/packages/smalltalk.scm
@@ -26,6 +26,8 @@
#:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
@@ -36,6 +38,7 @@
#:use-module (gnu packages libffi)
#:use-module (gnu packages libsigsegv)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages multiprecision)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xorg))
@@ -43,26 +46,61 @@
(define-public smalltalk
(package
(name "smalltalk")
- (version "3.2.5")
+ (version "3.2.91")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://gnu/smalltalk/smalltalk-"
+ ;; XXX: Revert to mirror://gnu with the next release of Smalltalk.
+ (uri (string-append "https://alpha.gnu.org/gnu/smalltalk/smalltalk-"
version ".tar.xz"))
(sha256
(base32
- "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"))))
+ "1zb2h5cbz1cwybqjl24lflw359lwj7sjvvhwb4x6miypzhwq4qh0"))
+ ;; XXX: To be removed with the next release of Smalltalk.
+ (patches (search-patches "smalltalk-multiplication-overflow.patch"))))
(build-system gnu-build-system)
(native-inputs
- `(("libffi" ,libffi)
+ `(("pkg-config" ,pkg-config)
+ ;; XXX: To be removed with the next release of Smalltalk.
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ ;; TODO: These optional dependencies raise the closure size to ~1 GiB
+ ;; from the current ~100 MiB, although some of them might be very
+ ;; useful for end users:
+ ;; - freeglut
+ ;; - glib
+ ;; - gobject-introspection
+ ;; - gtk+-2
+ ;; - tcl/tk
+ ;; - SDL (sdl-union)
+ ;; - sqlite
+ ;; - zlib
+ (inputs
+ `(("gmp" ,gmp)
+ ("libffi" ,libffi)
("libltdl" ,libltdl)
("libsigsegv" ,libsigsegv)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("zip" ,zip)))
+ ("lightning" ,lightning)
+ ("zip" ,zip)))
(arguments
`(#:phases
(modify-phases %standard-phases
+ ;; XXX: To be removed with the next release of Smalltalk.
+ ;; The overflow patch modifies configure.ac, therefore remove
+ ;; old configure script and enforce an autoreconf.
+ (add-before 'bootstrap 'remove-unpatched-configure
+ (lambda _
+ (delete-file "configure")
+ #t))
+ ;; XXX: To be removed with the next release of Smalltalk.
+ ;; We don't want to regenerate the info files.
+ (add-after 'build 'keep-generated-info-manual
+ (lambda _
+ (for-each (lambda (file)
+ (invoke "touch" file))
+ (find-files "doc" "\\.info"))
+ #t))
(add-before 'configure 'fix-libc
(lambda _
(let ((libc (assoc-ref %build-inputs "libc")))
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 6de99aec86..92aeef7f79 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -261,7 +261,7 @@ Internet and from a wide variety of machine architectures.")
(define-public spice-vdagent
(package
(name "spice-vdagent")
- (version "0.17.0")
+ (version "0.20.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -269,7 +269,7 @@ Internet and from a wide variety of machine architectures.")
"spice-vdagent-" version ".tar.bz2"))
(sha256
(base32
- "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"))))
+ "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -294,6 +294,7 @@ Internet and from a wide variety of machine architectures.")
`(("alsa-lib" ,alsa-lib)
("dbus" ,dbus)
("glib" ,glib)
+ ("libdrm" ,libdrm)
("libpciaccess" ,libpciaccess)
("libx11" ,libx11)
("libxext" ,libxext)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 82d3fa3a21..075fd7e3e6 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;;
@@ -53,7 +53,7 @@
(define-public newsboat
(package
(name "newsboat")
- (version "2.21")
+ (version "2.22")
(source
(origin
(method url-fetch)
@@ -61,7 +61,7 @@
"/newsboat-" version ".tar.xz"))
(sha256
(base32
- "0ccwbb3maini18453wjqn8m3bd7zzm6dn5a9vpb8smxv8vfv6ihc"))))
+ "146p3j46hna1m8zlacb9q1ljnldwv6xrjbaplm94f2x0v4azi1jj"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -87,17 +87,16 @@
("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4)
+ ("rust-cxx" ,rust-cxx-0.5)
+ ("rust-cxx-build" ,rust-cxx-build-0.5)
("rust-gettext-rs" ,rust-gettext-rs-0.5)
- ("rust-gettext-sys" ,rust-gettext-sys-0.19)
- ("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-natord" ,rust-natord-1.0)
- ("rust-nom" ,rust-nom-5)
+ ("rust-nom" ,rust-nom-6)
("rust-once-cell" ,rust-once-cell-1)
("rust-rand" ,rust-rand-0.7)
("rust-url" ,rust-url-2)
- ("rust-unicode-width" ,rust-unicode-width-0.1)
- ("rust-xdg" ,rust-xdg-2.2))
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
#:cargo-development-inputs
(("rust-tempfile" ,rust-tempfile-3)
("rust-proptest" ,rust-proptest-0.9)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
new file mode 100644
index 0000000000..88299c33cb
--- /dev/null
+++ b/gnu/packages/telegram.scm
@@ -0,0 +1,314 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages telegram)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages aidc)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages digest)
+ #:use-module (gnu packages fcitx)
+ #:use-module (gnu packages fcitx5)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages language)
+ #:use-module (gnu packages libreoffice)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages lxqt)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages telephony)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xiph)
+ #:use-module (gnu packages xorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system cmake))
+
+(define-public tdesktop
+ (package
+ (name "tdesktop")
+ (version "2.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/telegramdesktop/tdesktop.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "0drirhkr9gnm1g03lcqmvap5ljlk859c29gbsm63hhsgv15dlw0y"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DTDESKTOP_API_ID=17349"
+ "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
+ "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'copy-inputs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((to (getcwd))
+ (cmake_helpers (assoc-ref inputs "cmake_helpers"))
+ (codegen (assoc-ref inputs "codegen"))
+ (lib_base (assoc-ref inputs "lib_base"))
+ (lib_crl (assoc-ref inputs "lib_crl"))
+ (lib_lottie (assoc-ref inputs "lib_lottie"))
+ (lib_qr (assoc-ref inputs "lib_qr"))
+ (lib_rlottie (assoc-ref inputs "lib_rlottie"))
+ (lib_rpl (assoc-ref inputs "lib_rpl"))
+ (lib_spellcheck (assoc-ref inputs "lib_spellcheck"))
+ (lib_storage (assoc-ref inputs "lib_storage"))
+ (lib_tl (assoc-ref inputs "lib_tl"))
+ (lib_ui (assoc-ref inputs "lib_ui"))
+ (lib_webrtc (assoc-ref inputs "lib_webrtc"))
+ (tgcalls (assoc-ref inputs "tgcalls")))
+ (copy-recursively cmake_helpers (string-append to "/cmake"))
+ (copy-recursively codegen (string-append to "/Telegram/codegen"))
+ (copy-recursively lib_base (string-append to "/Telegram/lib_base"))
+ (copy-recursively lib_crl (string-append to "/Telegram/lib_crl"))
+ (copy-recursively lib_lottie (string-append to "/Telegram/lib_lottie"))
+ (copy-recursively lib_qr (string-append to "/Telegram/lib_qr"))
+ (copy-recursively lib_rlottie (string-append to "/Telegram/lib_rlottie"))
+ (copy-recursively lib_rpl (string-append to "/Telegram/lib_rpl"))
+ (copy-recursively lib_spellcheck (string-append to "/Telegram/lib_spellcheck"))
+ (copy-recursively lib_storage (string-append to "/Telegram/lib_storage"))
+ (copy-recursively lib_tl (string-append to "/Telegram/lib_tl"))
+ (copy-recursively lib_ui (string-append to "/Telegram/lib_ui"))
+ (copy-recursively lib_webrtc (string-append to "/Telegram/lib_webrtc"))
+ (copy-recursively tgcalls (string-append to "/Telegram/ThirdParty/tgcalls")))
+ #t))
+ (add-before 'configure 'patch-cxx-flags
+ (lambda _
+ (substitute* "cmake/options_linux.cmake"
+ (("class-memaccess")
+ "all"))
+ #t)))))
+ (native-inputs
+ `(("cmake_helpers"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/cmake_helpers.git")
+ (commit "a81345a")))
+ (file-name
+ (git-file-name "cmake_helpers" version))
+ (sha256
+ (base32 "0s5hxip68dmkaspjq6j30wx1r5v4prnrjza79hdbznz6i57a2248"))))
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+:bin" ,gtk+ "bin")
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qttools" ,qttools)))
+ (inputs
+ `(("alsa" ,alsa-lib)
+ ("catch" ,catch-framework2)
+ ("codegen"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/codegen.git")
+ (commit "127968d")))
+ (file-name
+ (git-file-name "codegen" version))
+ (sha256
+ (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2"))))
+ ("expected" ,libexpected)
+ ("fcitx-qt5" ,fcitx-qt5)
+ ("fcitx5-qt" ,fcitx5-qt)
+ ("ffmpeg" ,ffmpeg)
+ ("glib" ,glib)
+ ("gsl" ,gsl)
+ ("gtk+" ,gtk+)
+ ("hime" ,hime)
+ ("hunspell" ,hunspell)
+ ("iconv" ,libiconv)
+ ("lib_base"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_base.git")
+ (commit "81df0d0")))
+ (file-name
+ (git-file-name "lib_base" version))
+ (sha256
+ (base32 "0ikddprjnjvg0ic8jr2886xq0f18syp587q6z2kci9xmdnvjl217"))))
+ ("lib_crl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_crl.git")
+ (commit "16150bf")))
+ (file-name
+ (git-file-name "lib_crl" version))
+ (sha256
+ (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q"))))
+ ("lib_lottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_lottie.git")
+ (commit "fb40f37")))
+ (file-name
+ (git-file-name "lib_lottie" version))
+ (sha256
+ (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw"))))
+ ("lib_qr"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_qr.git")
+ (commit "92ce41a")))
+ (file-name
+ (git-file-name "lib_qr" version))
+ (sha256
+ (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj"))))
+ ("lib_rlottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rlottie.git")
+ (commit "0671bf7")))
+ (file-name
+ (git-file-name "lib_rlottie" version))
+ (sha256
+ (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
+ ("lib_rpl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rpl.git")
+ (commit "e1b9639")))
+ (file-name
+ (git-file-name "lib_rpl" version))
+ (sha256
+ (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss"))))
+ ("lib_spellcheck"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_spellcheck.git")
+ (commit "1b540b3")))
+ (file-name
+ (git-file-name "lib_spellcheck" version))
+ (sha256
+ (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7"))))
+ ("lib_storage"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_storage.git")
+ (commit "cbe5172")))
+ (file-name
+ (git-file-name "lib_storage" version))
+ (sha256
+ (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87"))))
+ ("lib_tl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_tl.git")
+ (commit "404c83d")))
+ (file-name
+ (git-file-name "lib_tl" version))
+ (sha256
+ (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f"))))
+ ("lib_ui"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_ui.git")
+ (commit "1e27992")))
+ (file-name
+ (git-file-name "lib_ui" version))
+ (sha256
+ (base32 "0kd4njcvic2700f00qn25vn3b80vsd2flsm3pi2synnldkiy8lcw"))))
+ ("lib_webrtc"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_webrtc.git")
+ (commit "4bc51d6")))
+ (file-name
+ (git-file-name "lib_webrtc" version))
+ (sha256
+ (base32 "06hpyq4qglrj3cb1xg8ghlmzm9ra8f5n6vm7hcy67n2wk8sy4cal"))))
+ ("libdbusmenu-qt" ,libdbusmenu-qt)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libtgvoip" ,libtgvoip)
+ ("lz4" ,lz4)
+ ("materialdecoration" ,materialdecoration)
+ ("minizip" ,minizip)
+ ("nimf" ,nimf)
+ ("openal" ,openal)
+ ("openssl" ,openssl)
+ ("opus" ,opus)
+ ("pulseaudio" ,pulseaudio)
+ ("qrcodegen" ,qrcodegen-cpp)
+ ("qt" ,qtbase)
+ ("qt5ct" ,qt5ct)
+ ("qtwayland" ,qtwayland)
+ ("range-v3" ,range-v3)
+ ("rlottie" ,rlottie)
+ ("tgcalls"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/TelegramMessenger/tgcalls.git")
+ (commit "178983f")))
+ (file-name
+ (git-file-name "tgcalls" version))
+ (sha256
+ (base32 "1xad65c9m6mj6zdj08flafvh8xjkd7xi9r1agcyc64y69lr427d0"))))
+ ("x11" ,libx11)
+ ("xcb" ,libxcb)
+ ("xcb-keysyms" ,xcb-util-keysyms)
+ ("xxhash" ,xxhash)
+ ("zlib" ,zlib)))
+ (synopsis "Telegram Desktop")
+ (description "Tdesktop is the official desktop application for telegram
+messenger.")
+ (home-page "https://desktop.telegram.org/")
+ (license license:gpl3+)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 48e30abfc3..bdb2fc778b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -874,40 +874,38 @@ Initiation Protocol (SIP) and a multimedia framework.")
(url "https://github.com/grishka/libtgvoip")
(commit version)))
(file-name (git-file-name name version))
- ;; Fix compilation on i686-linux architecture.
- ;; NOTE: Applying these patches is order-dependent!
- ;; The patch for WebRTC /must/ precede the patch for SSE2.
(patches
- (search-patches "libtgvoip-disable-webrtc.patch"
- "libtgvoip-disable-sse2.patch"))
+ (search-patches "libtgvoip-pkgconfig.patch"))
(sha256
(base32
"122kn3jx6v0kkldlzlpzvlwqxgp6pmzxsjhrhcxw12bx9c08sar5"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("libopusenc" ,libopusenc)
("openssl" ,openssl)
+ ("opus" ,opus)
("pulseaudio" ,pulseaudio)))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list
+ "--disable-static"
+ "--enable-audio-callback")
+ #:phases
(modify-phases %standard-phases
- ;; libtgvoip wants to dlopen libpulse and libasound, so tell it where
- ;; they are.
- (add-after 'unpack 'patch-dlopen
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "os/linux/AudioPulse.cpp"
- (("libpulse\\.so")
- (string-append (assoc-ref inputs "pulseaudio")
- "/lib/libpulse.so")))
- (substitute* '("os/linux/AudioInputALSA.cpp"
- "os/linux/AudioOutputALSA.cpp")
- (("libasound\\.so")
- (string-append (assoc-ref inputs "alsa-lib")
- "/lib/libasound.so")))
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (for-each delete-file
+ (list
+ "configure"
+ "Makefile.in"))
#t)))))
(synopsis "VoIP library for Telegram clients")
(description "A collection of libraries and header files for implementing
telephony functionality into custom Telegram clients.")
- (home-page "https://github.com/zevlg/libtgvoip")
+ (home-page "https://github.com/grishka/libtgvoip")
(license license:unlicense)))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 881a75d09d..74e1937bbc 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
@@ -932,14 +932,14 @@ than a terminal.")
(define-public python-curtsies
(package
(name "python-curtsies")
- (version "0.2.11")
+ (version "0.3.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "curtsies" version))
(sha256
(base32
- "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"))))
+ "019bpf5wmng4f6ic2ykg893ypfihpfvzi6dhblcagfwbincl79ac"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -954,7 +954,7 @@ than a terminal.")
`(("python-mock" ,python-mock)
("python-pyte" ,python-pyte)
("python-nose" ,python-nose)))
- (home-page "https://github.com/thomasballinger/curtsies")
+ (home-page "https://github.com/bpython/curtsies")
(synopsis "Library for curses-like terminal interaction with colored
strings")
(description "Curtsies is a Python library for interacting with the
@@ -962,9 +962,6 @@ terminal. It features string-like objects which carry formatting information,
per-line fullscreen terminal rendering, and keyboard input event reporting.")
(license license:expat)))
-(define-public python2-curtsies
- (package-with-python2 python-curtsies))
-
(define-public tmate
(package
(name "tmate")
@@ -1432,7 +1429,7 @@ terminal. Note that you need support for OpenGL 3.2 or higher.")
(define-public bootterm
(package
(name "bootterm")
- (version "0.1")
+ (version "0.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1441,7 +1438,7 @@ terminal. Note that you need support for OpenGL 3.2 or higher.")
(file-name (git-file-name name version))
(sha256
(base32
- "1mh2i47ppcrw027nmkpjgbmx55ml21bmqihvwkhlvj1jr0vv8pva"))))
+ "08yb4kiid3028cqsx7wzyrzk46asphxlxlj1y141hi245wbql55n"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no test suite
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 749b93e29f..81915ca52b 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch>
;;; Copyright © 2020 Mark Meyer <mark@ofosos.org>
+;;; Copyright © 2020 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -788,6 +789,14 @@ editors.")
(("/usr/share")
(string-append out "/share")))
#t)))
+ (add-after 'install 'install-desktop-file
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Install desktop file.
+ (let* ((out (assoc-ref outputs "out"))
+ (apps (string-append out "/share/applications"))
+ (source "TeXmacs/misc/mime/texmacs.desktop"))
+ (install-file source apps)
+ #t)))
(add-before 'configure 'gzip-flags
(lambda _
(substitute* "Makefile.in"
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a7754fe649..8e438e3a54 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -553,18 +553,18 @@ required structures.")
(define-public libressl
(package
(name "libressl")
- (version "3.1.4")
+ (version "3.1.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/LibreSSL/"
"libressl-" version ".tar.gz"))
(sha256
(base32
- "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21"))))
+ "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc"))))
(build-system gnu-build-system)
(arguments
- ;; Do as if 'getentropy' was missing since older Linux kernels lack it
- ;; and libc would return ENOSYS, which is not properly handled.
+ ;; Do as if 'getentropy' were missing: Linux kernels before 3.17 lack its
+ ;; underlying 'getrandom' system call and ENOSYS isn't properly handled.
;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
'(#:configure-flags '("ac_cv_func_getentropy=no"
;; Provide a TLS-enabled netcat.
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index aac2ae370f..8f4e9952f2 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
+;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,21 +24,22 @@
(define-module (gnu packages upnp)
#:use-module (gnu packages)
- #:use-module (gnu packages gettext)
#:use-module (gnu packages autotools)
- #:use-module (gnu packages video)
- #:use-module (gnu packages photo)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages image)
#:use-module (gnu packages mp3)
+ #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages xiph)
- #:use-module (gnu packages sqlite)
#:use-module (gnu packages python)
+ #:use-module (gnu packages sqlite)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xiph)
#:use-module (guix build-system gnu)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (ice-9 match))
@@ -89,7 +91,7 @@ while running behind a UPnP-enabled router or firewall. Such applications
include peer-to-peer applications, active-mode FTP clients, DCC file transfers
over IRC, instant messaging, network games, and most server software.")
(license
- (x11-style "file://LICENSE" "See 'LICENSE' file in the distribution"))))
+ (license:x11-style "file://LICENSE" "See 'LICENSE' file in the distribution"))))
(define-public libupnp
(package
@@ -120,43 +122,49 @@ API and code for building control points, devices, and bridges that are
compliant with Version 1.0 of the Universal Plug and Play Device Architecture
Specification and support several operating systems like Linux, *BSD, Solaris
and others.")
- (license bsd-3)))
+ (license license:bsd-3)))
(define-public readymedia
(package
(name "readymedia")
- (version "1.2.1")
+ (version "1.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.code.sf.net/p/minidlna/git")
(commit (string-append
- "v"
- (string-map (match-lambda
- (#\. #\_)
- (chr chr))
- version)))))
+ "v" (string-replace-substring version "." "_")))))
(file-name (git-file-name name version))
(sha256
(base32
- "160915yv38k0p5zmyncs12kkbbcd8m8fk9jq70fkfd5x6dz40xm4"))))
+ "0g04lffj37wdv5bnpl5faxpnmlj6bbk8y7ziaz2wp6h82g6kb5wj"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--with-os-name=Linux") ; uname -s
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-source
+ (lambda _
+ (substitute* "Makefile.am"
+ ((".*LIBAVUTIL_LIBS.*") ""))
+ #t)))))
(native-inputs
- `(("automake" ,automake)
- ("autoconf" ,autoconf)
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
("gettext" ,gettext-minimal)))
(inputs
- `(("libexif" ,libexif)
- ("libjpeg" ,libjpeg-turbo)
- ("libid3tag" ,libid3tag)
+ `(("ffmpeg" ,ffmpeg)
("flac" ,flac)
+ ("libexif" ,libexif)
+ ("libid3tag" ,libid3tag)
+ ("libjpeg" ,libjpeg-turbo)
("libvorbis" ,libvorbis)
("sqlite" ,sqlite)
- ("ffmpeg" ,ffmpeg)))
+ ("zlib" ,zlib)))
(home-page "https://sourceforge.net/projects/minidlna/")
(synopsis "DLNA/UPnP-AV media server")
(description "ReadyMedia (formerly known as MiniDLNA) is a simple media
server, which serves multimedia content to compatible clients on the network.
It aims to be fully compliant with DLNA and UPnP-AV standards.")
- (license gpl2)))
+ (license license:gpl2)))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d20cf7e655..5eaaf2681e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -32,6 +32,7 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -163,14 +164,14 @@ as well as the classic centralized workflow.")
(define-public git
(package
(name "git")
- (version "2.29.2")
+ (version "2.30.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz"))
(sha256
(base32
- "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"))))
+ "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"))))
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
@@ -187,7 +188,7 @@ as well as the classic centralized workflow.")
version ".tar.xz"))
(sha256
(base32
- "14npkg9rnp2yclsx5p622qpm6byzfy5k5wb209vkmm5r60m4mm72"))))
+ "0xngjg60rwzrb9x32d1qbdd8szkzwcyha5qni7ilkldxsl2q8avv"))))
;; For subtree documentation.
("asciidoc" ,asciidoc-py3)
("docbook-xsl" ,docbook-xsl)
@@ -2318,13 +2319,13 @@ based on a manifest file published by servers.")
(define-public b4
(package
(name "b4")
- (version "0.6.1")
+ (version "0.6.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "b4" version))
(sha256
- (base32 "01qid6mvddikcdpf2ihsyn8x3z5j2n64g0ip9pqbx42hrc50pmcz"))))
+ (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; No tests.
(inputs
@@ -2962,3 +2963,54 @@ commit message side by side
If several repos are related, it helps to see their status together.")
(license license:expat))))
+
+(define-public ghq
+ (package
+ (name "ghq")
+ (version "1.1.5")
+ (home-page "https://github.com/x-motemen/ghq")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "098fik155viylq07az7crzbgswcvhpx0hr68xpvyx0rpri792jbq"))))
+ (build-system go-build-system)
+ (arguments
+ '(#:install-source? #f
+ #:import-path "github.com/x-motemen/ghq"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-completions
+ (lambda* (#:key outputs import-path #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bash-completion (string-append out "/etc/bash_completion.d"))
+ (zsh-completion (string-append out "/share/zsh/site-functions")))
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p bash-completion)
+ (copy-file "misc/bash/_ghq"
+ (string-append bash-completion "/ghq"))
+ (mkdir-p zsh-completion)
+ (copy-file "misc/zsh/_ghq"
+ (string-append zsh-completion "/_ghq"))))
+ #t)))))
+ (native-inputs
+ `(("git" ,git-minimal)))
+ (inputs
+ `(("github.com/songmu/gitconfig" ,go-github-com-songmu-gitconfig)
+ ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
+ ("github.com/motemen/go-colorine" ,go-github-com-motemen-go-colorine)
+ ("github.com/saracen/walker" ,go-github-com-saracen-walker)
+ ("github.com/urfave/cli/v2" ,go-github-com-urfave-cli-v2)
+ ("golang.org/x/net/html" ,go-golang-org-x-net-html)
+ ("golang.org/x/sync/errgroup" ,go-golang.org-x-sync-errgroup)))
+ (synopsis "Manage remote repository clones")
+ (description
+ "@code{ghq} provides a way to organize remote repository clones, like
+@code{go get} does. When you clone a remote repository by @code{ghq get}, ghq
+makes a directory under a specific root directory (by default @file{~/ghq})
+using the remote repository URL's host and path.")
+ (license license:expat)))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b99846a3ff..1f68208021 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2016, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Feng Shu <tumashu@163.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 201–72021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@@ -2197,14 +2197,14 @@ To load this plugin, specify the following option when starting mpv:
(define-public youtube-dl
(package
(name "youtube-dl")
- (version "2020.12.14")
+ (version "2021.01.03")
(source (origin
(method url-fetch)
(uri (string-append "https://youtube-dl.org/downloads/latest/"
"youtube-dl-" version ".tar.gz"))
(sha256
(base32
- "0ws2nsvn0qlnnyxz9g95ffygscfmg5npzmwbq8iyyi6b2njsb0cn"))
+ "0qqixcr748nfhnihkjzayzdja26kgrsds45q5s8krmfm3b79ipli"))
(snippet
'(begin
;; Delete the pre-generated files, except for the man page
@@ -2379,7 +2379,7 @@ other site that youtube-dl supports.")
(define-public you-get
(package
(name "you-get")
- (version "0.4.1488")
+ (version "0.4.1500")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2388,7 +2388,7 @@ other site that youtube-dl supports.")
(file-name (git-file-name name version))
(sha256
(base32
- "10dx1gka92m42f8ah1mzylbd71apzrphfa48r5ci7g1j8ysdcs7q"))))
+ "02wkmq6bjg9iz0kccsgs192aiky99l2jnw1xs6zjhvjvq7jyvf7s"))))
(build-system python-build-system)
(inputs
`(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos
@@ -2418,7 +2418,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(define-public youtube-viewer
(package
(name "youtube-viewer")
- (version "3.8.0")
+ (version "3.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2427,7 +2427,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(file-name (git-file-name name version))
(sha256
(base32
- "16gskhzkvgzhfb89zqfmvz7kmhjsyc38f2dl86ksal4p69kn8j3g"))))
+ "0xdybiihd66b79rbsawjhxs9snm78gld5ziz3gnp8vdcw0bshwz7"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
@@ -3078,7 +3078,7 @@ be used for realtime video capture via Linux-specific APIs.")
(define-public obs
(package
(name "obs")
- (version "26.1.0")
+ (version "26.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3087,7 +3087,7 @@ be used for realtime video capture via Linux-specific APIs.")
(file-name (git-file-name name version))
(sha256
(base32
- "0p8wdzm9imn3s17arr206sz92g4pkacfcpfbwvhvgkrrs4w000bx"))))
+ "18b40ayww5isjqnjz63l05fi5xwzrcc64jvwxwq8nqsydn0b14ng"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -4459,7 +4459,7 @@ transitions, and effects and then export your film to many common formats.")
(define-public dav1d
(package
(name "dav1d")
- (version "0.8.0")
+ (version "0.8.1")
(source
(origin
(method git-fetch)
@@ -4468,8 +4468,7 @@ transitions, and effects and then export your film to many common formats.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32
- "0mjn87xjdqv0q1gj4s4f6fdmsj504mhk4qmqiyrhq2rs7yqj4csv"))))
+ (base32 "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"))))
(build-system meson-build-system)
(native-inputs `(("nasm" ,nasm)))
(home-page "https://code.videolan.org/videolan/dav1d")
@@ -4510,7 +4509,7 @@ video from a Wayland session.")
(define-public gaupol
(package
(name "gaupol")
- (version "1.8")
+ (version "1.9")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4519,7 +4518,7 @@ video from a Wayland session.")
(file-name (git-file-name name version))
(sha256
(base32
- "00wxdyja0m6l3yrynjgapa010lkwxpkv1xnnjbmrwi4ayhh5l3gg"))))
+ "1mmjg8nwhif2hmmp8i11643izwzdf839brqdai3ksfg0qkh8rnxk"))))
(build-system python-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -4741,7 +4740,7 @@ result in several formats:
(define-public rav1e
(package
(name "rav1e")
- (version "0.3.4")
+ (version "0.3.5")
(source
(origin
(method url-fetch)
@@ -4750,7 +4749,7 @@ result in several formats:
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1mx6jlx2rdhmyh68h9h34kn9ssa7lv0y97j8fd9qm7qhs2q1n0cj"))))
+ "0c40gq4qid2apmlgzx98f6826jmn2n61prk0rn7sjxaw7yimw854"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 99c37bc044..10eae8ea7d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
@@ -1780,7 +1780,7 @@ DOS or Microsoft Windows.")
(define-public xen
(package
(name "xen")
- (version "4.14.0")
+ (version "4.14.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1789,7 +1789,7 @@ DOS or Microsoft Windows.")
(file-name (git-file-name name version))
(sha256
(base32
- "1s06zhzmkm7wylrxhas5v0sg2ackmmyw01gvv67r9idml55i0dh5"))))
+ "1r90rvypw76ya9clqw5p02gm1k8hxz73f7gr95ca778nnzvb7xjw"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -2017,14 +2017,14 @@ administrators and developers in managing the database.")
(define-public osinfo-db
(package
(name "osinfo-db")
- (version "20201011")
+ (version "20201218")
(source (origin
(method url-fetch)
(uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-"
version ".tar.xz"))
(sha256
(base32
- "1zzx5gsqgzg2zki6h8vl0h7kpcrk5i2s1qhz7gcb18s7g99px8aj"))))
+ "0ydbindwgw7kg861rqii5036gq0dbbbmv35dzrmmv937ddfsxwh0"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
diff --git a/gnu/packages/visidata.scm b/gnu/packages/visidata.scm
index db126eb4ff..c802c088b3 100644
--- a/gnu/packages/visidata.scm
+++ b/gnu/packages/visidata.scm
@@ -31,14 +31,14 @@
(define-public visidata
(package
(name "visidata")
- (version "2.1")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "visidata" version))
(sha256
(base32
- "15y6yif0h610ill57ck85l8n5faw849caw6rhf95rd0x67hkikaa"))))
+ "0sn0hnlrrbydgwdza20g2zdlchsas39hbkxzyxnrc13sp26zmmnx"))))
(build-system python-build-system)
(arguments
'(#:phases
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 8b5da1316b..37555d9b45 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
@@ -559,7 +559,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
(define-public wireguard-linux-compat
(package
(name "wireguard-linux-compat")
- (version "1.0.20201112")
+ (version "1.0.20201221")
(source (origin
(method url-fetch)
(uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/"
@@ -567,7 +567,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
".tar.xz"))
(sha256
(base32
- "1qcpg1rcmy4h529a0spjm50qgxjgjy20j29fpbrqsv5xq3qfgsl9"))))
+ "0ci13in0fqq32n5qamch4qhjgbdq86ygrgmfhc9szsh2nsl8jlkf"))))
(build-system linux-module-build-system)
(outputs '("out"
"kernel-patch"))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index cef1028d34..0b75a27b0c 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -43,7 +43,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
-;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
+;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
@@ -684,7 +684,7 @@ programming language.")))
(define-public lighttpd
(package
(name "lighttpd")
- (version "1.4.57")
+ (version "1.4.58")
(source (origin
(method url-fetch)
(uri (string-append "https://download.lighttpd.net/lighttpd/"
@@ -692,7 +692,7 @@ programming language.")))
"lighttpd-" version ".tar.xz"))
(sha256
(base32
- "0zr1ssagirv5l4r2ii1k9v366a4vwylwbq74nb5pwby1i4drdjjj"))))
+ "03kd28nq6wndvvyk0zs5120ajvg1icnif5bvrsyhw69sl7yyyzr6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -1487,7 +1487,7 @@ used to validate and fix HTML data.")
(define-public esbuild
(package
(name "esbuild")
- (version "0.8.27")
+ (version "0.8.29")
(source
(origin
(method git-fetch)
@@ -1496,7 +1496,7 @@ used to validate and fix HTML data.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1n9h6r3q6mik7p5j0cyybh1sdcllig0awbryrx28r03cxv4ip2ij"))
+ (base32 "142gc21aaqmx0d01vmqsg7zi85pjgi3higr4ba0m52qf3mvxd6as"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -3876,8 +3876,7 @@ exists it is used instead.")
(propagated-inputs
`(("perl-io-socket-ssl" ,perl-io-socket-ssl)
("perl-libwww" ,perl-libwww)
- ;; Users should instead make sure SSL_ca_path is set properly.
- ;; ("perl-mozilla-ca" ,perl-mozilla-ca)
+ ("perl-mozilla-ca" ,perl-mozilla-ca)
("perl-net-http" ,perl-net-http)))
(home-page "https://metacpan.org/release/LWP-Protocol-https")
(synopsis "HTTPS support for LWP::UserAgent")
@@ -4643,8 +4642,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(package-with-python2 python-feedparser))
(define-public guix-data-service
- (let ((commit "c596a1c6a90bb2fe07da5339b8dc832b81d94194")
- (revision "21"))
+ (let ((commit "e3878fefb4184f3ad45a6e6f434767c0bf109db8")
+ (revision "23"))
(package
(name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -4656,7 +4655,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(file-name (git-file-name name version))
(sha256
(base32
- "09gn2imhh3aqkzray0xgkz7slriy567inh5lpkxm74bgmx862g3g"))))
+ "0002ckayjnd6mw7a0m7q307jdwc9vsjgiidp72463xyp0yrnjdjf"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
@@ -5136,6 +5135,7 @@ NetSurf project.")
("perl-xml-feed" ,perl-xml-feed)
("perl-xml-sax" ,perl-xml-sax)
("perl-xml-twig" ,perl-xml-twig)
+ ("perl-yaml-tiny" ,perl-yaml-tiny)
("po4a" ,po4a)))
(propagated-inputs
`(("perl-cgi-formbuilder" ,perl-cgi-formbuilder)
@@ -7662,15 +7662,14 @@ HTTrack is fully configurable, and has an integrated help system.")
(define-public buku
(package
(name "buku")
- (version "4.4")
+ (version "4.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "buku" version))
(file-name (git-file-name name version))
(sha256
- (base32
- "1g1xhdskfn72xaraqzz2v8dl2iza7bzfpn17z2wdrzkq3ih7yvgg"))))
+ (base32 "1bk3h2ya34a5livyf6p7kawh50ikbix5szsq2rkb8cp5bwrzsj5i"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;FIXME: many tests need network access
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index cbcebd7129..e1359c8539 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1301,14 +1301,14 @@ its size
(define-public polybar
(package
(name "polybar")
- (version "3.4.3")
+ (version "3.5.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/polybar/polybar/releases/"
- "download/" version "/polybar-" version ".tar"))
+ "download/" version "/polybar-" version ".tar.gz"))
(sha256
- (base32 "0bw22qvbcdvyd0qv3ax48r34rnclbbb6dyb8h8zljq1r3lf15vfl"))))
+ (base32 "1016g4b981c4hl2pr0m09b4wy0ln1zf3mfp09wrxs73zgfdbngyj"))))
(build-system cmake-build-system)
(arguments
;; Test is disabled because it requires downloading googletest from the
@@ -1378,12 +1378,12 @@ functionality to display information about the most commonly used services.")
("mesa" ,mesa)
("pixman" ,pixman)
("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)
("xcb-util-errors" ,xcb-util-errors)
("xcb-util-wm" ,xcb-util-wm)
("xorg-server-xwayland" ,xorg-server-xwayland)))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("wayland-protocols" ,wayland-protocols)))
+ `(("pkg-config" ,pkg-config)))
(home-page "https://github.com/swaywm/wlroots")
(synopsis "Pluggable, composable, unopinionated modules for building a
Wayland compositor")
@@ -2279,3 +2279,32 @@ start-up.")
(description "XNotify receives a notification specification in stdin and
shows a notification for the user on the screen.")
(license license:expat)))
+
+(define-public cagebreak
+ (package
+ (name "cagebreak")
+ (version "1.4.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/project-repo/cagebreak")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0mnxs1m7jrqdl0asx39nxfzvkp7d4jqpdchi63w2yd1igpj2frb2"))))
+ (build-system meson-build-system)
+ (arguments '(#:configure-flags '("-Dxwayland=true")))
+ (native-inputs
+ `(("pandoc" ,pandoc)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("pango" ,pango)
+ ("wlroots" ,wlroots)))
+ (home-page "https://github.com/project-repo/cagebreak")
+ (synopsis "Tiling wayland compositor inspired by ratpoison")
+ (description
+ "@command{cagebreak} is a slim, keyboard-controlled, tiling compositor
+for wayland conceptually based on the X11 window manager
+@command{ratpoison}.")
+ (license license:expat)))
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 93f23d6722..793150cc5f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -18,7 +18,7 @@
;;; Copyright © 2016 Petter <petter@mykolab.ch>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marek Benc <dusxmt@gmx.com>
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2018 Thomas Sigurdsen <tonton@riseup.net>
@@ -1126,7 +1126,7 @@ Escape key when Left Control is pressed and released on its own.")
(define-public libwacom
(package
(name "libwacom")
- (version "1.6")
+ (version "1.7")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1134,12 +1134,14 @@ Escape key when Left Control is pressed and released on its own.")
"libwacom-" version "/libwacom-" version ".tar.bz2"))
(sha256
(base32
- "1a5ffxyhl6crspybcfsx5ribgrgkzwfl5w9y32slxbgjwczb473h"))))
+ "0797gc055dgg2jfqijy9823bd83jwr4wb2z9id992qlcr0xmz1rw"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags '("--disable-static")))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ;; For tests.
+ ("python" ,python)))
(inputs
`(("gtk+" ,gtk+)
("libgudev" ,libgudev)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3b0ff54308..2192f61dc7 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -577,7 +577,7 @@ keys for controlling the audio volume.")
(define-public xfce4-whiskermenu-plugin
(package
(name "xfce4-whiskermenu-plugin")
- (version "2.4.6")
+ (version "2.5.1")
(source
(origin
(method url-fetch)
@@ -585,7 +585,7 @@ keys for controlling the audio volume.")
"xfce4-whiskermenu-plugin/" (version-major+minor version) "/"
"xfce4-whiskermenu-plugin-" version ".tar.bz2"))
(sha256
- (base32 "0i2pn8852x6zvlys4610knscscyjpha6wjzy7rljixbxr26d6x49"))))
+ (base32 "09b9i68pf5ghq6dj55s4h3fj07jd5zpn1fghjwnnwxmakj54y1xj"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -621,7 +621,7 @@ applications, and includes a search bar to search for applications.")
(define-public xfce4-xkb-plugin
(package
(name "xfce4-xkb-plugin")
- (version "0.8.1")
+ (version "0.8.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -629,7 +629,7 @@ applications, and includes a search bar to search for applications.")
name "-" version ".tar.bz2"))
(sha256
(base32
- "18b7cnaf3zxm598p2i47vim3kbbi8w923ia1hwabdph1c89cz7n1"))))
+ "0rvrz464y7ji989zvi2v85kg47444nqsdq9rv6k8dkbkdwzy2jxv"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1073,7 +1073,7 @@ the desktop wallpaper.")
(define-public xfce4-taskmanager
(package
(name "xfce4-taskmanager")
- (version "1.2.3")
+ (version "1.4.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/"
@@ -1081,7 +1081,7 @@ the desktop wallpaper.")
"xfce4-taskmanager-" version ".tar.bz2"))
(sha256
(base32
- "1i63bnvpjpblnd0d3l1v065x9q1cz74cvlab5hzd0q8zgkd49z6w"))))
+ "0hvx7qqkiyq81axcbkqfv39bn84x8gjzrybq3w3hkz0mzkfq8mk5"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1361,7 +1361,7 @@ A plugin for the Xfce panel is also available.")
(define-public xfce4-cpugraph-plugin
(package
(name "xfce4-cpugraph-plugin")
- (version "1.1.0")
+ (version "1.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1370,7 +1370,7 @@ A plugin for the Xfce panel is also available.")
"/xfce4-cpugraph-plugin-" version ".tar.bz2"))
(sha256
(base32
- "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"))))
+ "19rdc3k085z7bv8365g26vz6iy9dx2f4x4q3wszsjmq5pvdxsrkq"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1450,7 +1450,7 @@ each time a new earthquake occurs.")
(define-public xfce4-datetime-plugin
(package
(name "xfce4-datetime-plugin")
- (version "0.8.0")
+ (version "0.8.1")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1459,7 +1459,7 @@ each time a new earthquake occurs.")
"/xfce4-datetime-plugin-" version ".tar.bz2"))
(sha256
(base32
- "1m7bmpvbmiz2xdffpg675qn80zx2n0cnlf842ppvh1q7zz18ndfd"))))
+ "0h15mxq5lawlxyr6h1vxc60rkf0rpmnv81l0f52mrswww9dz3xp9"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1532,7 +1532,7 @@ governor and frequencies supported and used by your system.")
(define-public xfce4-diskperf-plugin
(package
(name "xfce4-diskperf-plugin")
- (version "2.6.2")
+ (version "2.6.3")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1541,7 +1541,7 @@ governor and frequencies supported and used by your system.")
"/xfce4-diskperf-plugin-" version ".tar.bz2"))
(sha256
(base32
- "0i4nrsvwcn15g5gmnba9p07sad3c96x517l2lybdw8jqv91rhbpx"))))
+ "0n8wsnjvzw98z8r0f0zr8n2gicjz6hhislp86xrjh0r4xcnymcbk"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1594,7 +1594,7 @@ this very convenient.")
(define-public xfce4-fsguard-plugin
(package
(name "xfce4-fsguard-plugin")
- (version "1.1.1")
+ (version "1.1.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1603,7 +1603,7 @@ this very convenient.")
"/xfce4-fsguard-plugin-" version ".tar.bz2"))
(sha256
(base32
- "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"))))
+ "01a1an5z4kpgi68lk98q7wga7sx676fcbnrsd5cpq4d736ifdn37"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1683,7 +1683,7 @@ Caps, Scroll and Num Lock in Xfce panel.")
(define-public xfce4-mailwatch-plugin
(package
(name "xfce4-mailwatch-plugin")
- (version "1.2.0")
+ (version "1.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1692,7 +1692,7 @@ Caps, Scroll and Num Lock in Xfce panel.")
"/xfce4-mailwatch-plugin-" version ".tar.bz2"))
(sha256
(base32
- "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"))))
+ "0bmykjhd3gs1737fl3zn5gg6f3vlncak2xqz89zv5018znz1xy90"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1764,7 +1764,7 @@ right-click menu
(define-public xfce4-mount-plugin
(package
(name "xfce4-mount-plugin")
- (version "1.1.3")
+ (version "1.1.5")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1773,7 +1773,7 @@ right-click menu
"/xfce4-mount-plugin-" version ".tar.bz2"))
(sha256
(base32
- "07lijjhimjrcyrhasr2299km6wm22xcd3fazdfpqvisbk1mvvrda"))))
+ "1hlfnlxwwx0hkm82mcz777f3i22x6bh6k3gzl0yjnm4yj9adjk2q"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1862,7 +1862,7 @@ opens up a menu with the following:
(define-public xfce4-smartbookmark-plugin
(package
(name "xfce4-smartbookmark-plugin")
- (version "0.5.1")
+ (version "0.5.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1871,7 +1871,7 @@ opens up a menu with the following:
"/xfce4-smartbookmark-plugin-" version ".tar.bz2"))
(sha256
(base32
- "001nf2bqly8vm868qvafzgihc9463c488mkim24iw9g2s9ygna1y"))))
+ "1lyd64qc9w6qnpqjb5xk0mjq4l7riv6z7l9aws28clalb8prw9ra"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -1948,7 +1948,7 @@ freedesktop.org specification.")
(define-public xfce4-systemload-plugin
(package
(name "xfce4-systemload-plugin")
- (version "1.2.3")
+ (version "1.2.4")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -1957,7 +1957,7 @@ freedesktop.org specification.")
"/xfce4-systemload-plugin-" version ".tar.bz2"))
(sha256
(base32
- "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"))))
+ "0dcqg13phlcri4i4g9752m4zfkcmidiqpjv4s3l3pfiwjbgvhc85"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -2034,7 +2034,7 @@ period.")
(define-public xfce4-verve-plugin
(package
(name "xfce4-verve-plugin")
- (version "2.0.0")
+ (version "2.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -2043,7 +2043,7 @@ period.")
"/xfce4-verve-plugin-" version ".tar.bz2"))
(sha256
(base32
- "1ljcmgc8ixrbz134ggxbbh4zzdnp7mhi9ay6s5hgrz28djx10rcy"))))
+ "09gqp0jb5ccjh7ny798n5cy9skdx3hpis4kgvjpl4vidnrg5xnpb"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@@ -2068,7 +2068,7 @@ for the Xfce panel. It supports several features, such as:
(define-public xfce4-wavelan-plugin
(package
(name "xfce4-wavelan-plugin")
- (version "0.6.1")
+ (version "0.6.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -2077,7 +2077,7 @@ for the Xfce panel. It supports several features, such as:
"/xfce4-wavelan-plugin-" version ".tar.bz2"))
(sha256
(base32
- "05zdiq1igr1fcvnwlivg8g3szvxmlr3yc7jfj3bwgqrs0vm827zl"))))
+ "07a8nmc60in48licjj0gmwm77vb8divh1lb7jnib35n5a1ka6ypa"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 2d80496330..4a3f25e009 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
@@ -494,7 +494,7 @@ things in between.")
(define-public libshout
(package
(name "libshout")
- (version "2.4.4")
+ (version "2.4.5")
(source (origin
(method url-fetch)
(uri (string-append
@@ -502,7 +502,7 @@ things in between.")
"libshout-" version ".tar.gz"))
(sha256
(base32
- "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"))))
+ "1438da40y73y9068saxrbmm27qq6xqmmzsziwgmr8fb7i9k6irfr"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 69e86d9177..163fff60c0 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2132,7 +2132,7 @@ outputting XML data from Java code.")
(define-public java-xstream
(package
(name "java-xstream")
- (version "1.4.10")
+ (version "1.4.15")
(source
(origin
(method git-fetch)
@@ -2144,7 +2144,7 @@ outputting XML data from Java code.")
version)))))
(file-name (git-file-name name version))
(sha256
- (base32 "12m2bw8bapdc1w0pni9wl5hh2y8jfdgcvxd464jl9917dsp3ai2n"))))
+ (base32 "1178qryrjwjp44439pi5dxzd32896r5zs429z1qhlc09951r7mi9"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "xstream.jar"
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3a26acc802..8f84b894f6 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
@@ -6085,7 +6085,7 @@ to answer a question. Xmessage can also exit after a specified time.")
(define-public xterm
(package
(name "xterm")
- (version "362")
+ (version "363")
(source
(origin
(method url-fetch)
@@ -6095,7 +6095,7 @@ to answer a question. Xmessage can also exit after a specified time.")
(string-append "ftp://ftp.invisible-island.net/xterm/"
"xterm-" version ".tgz")))
(sha256
- (base32 "18mch57f5sypgfdbvna22ailcfpnixw0fc5wkf2j3w58dwigwkqx"))))
+ (base32 "0j0bl5z3kmhahf770mbrj2zwm2nvxkhqpwnwbdvbclk5w8wkc6nq"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts"
diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm
index 72c7779596..1046a7e0c2 100644
--- a/gnu/services/linux.scm
+++ b/gnu/services/linux.scm
@@ -147,35 +147,34 @@ representation."
(define kernel-module-loader-shepherd-service
(match-lambda
((and (? list? kernel-modules) ((? string?) ...))
- (list
- (shepherd-service
- (documentation "Load kernel modules.")
- (provision '(kernel-module-loader))
- (requirement '(file-systems))
- (one-shot? #t)
- (modules `((srfi srfi-1)
- (srfi srfi-34)
- (srfi srfi-35)
- (rnrs io ports)
- ,@%default-modules))
- (start
- #~(lambda _
- (cond
- ((null? '#$kernel-modules) #t)
- ((file-exists? "/proc/sys/kernel/modprobe")
- (let ((modprobe (call-with-input-file
- "/proc/sys/kernel/modprobe" get-line)))
- (guard (c ((message-condition? c)
- (format (current-error-port) "~a~%"
- (condition-message c))
- #f))
- (every (lambda (module)
- (invoke/quiet modprobe "--" module))
- '#$kernel-modules))))
- (else
- (format (current-error-port) "error: ~a~%"
- "Kernel is missing loadable module support.")
- #f)))))))))
+ (shepherd-service
+ (documentation "Load kernel modules.")
+ (provision '(kernel-module-loader))
+ (requirement '(file-systems))
+ (one-shot? #t)
+ (modules `((srfi srfi-1)
+ (srfi srfi-34)
+ (srfi srfi-35)
+ (rnrs io ports)
+ ,@%default-modules))
+ (start
+ #~(lambda _
+ (cond
+ ((null? '#$kernel-modules) #t)
+ ((file-exists? "/proc/sys/kernel/modprobe")
+ (let ((modprobe (call-with-input-file
+ "/proc/sys/kernel/modprobe" get-line)))
+ (guard (c ((message-condition? c)
+ (format (current-error-port) "~a~%"
+ (condition-message c))
+ #f))
+ (every (lambda (module)
+ (invoke/quiet modprobe "--" module))
+ '#$kernel-modules))))
+ (else
+ (format (current-error-port) "error: ~a~%"
+ "Kernel is missing loadable module support.")
+ #f))))))))
(define kernel-module-loader-service-type
(service-type
@@ -183,7 +182,7 @@ representation."
(description "Load kernel modules.")
(extensions
(list (service-extension shepherd-root-service-type
- kernel-module-loader-shepherd-service)))
+ (compose list kernel-module-loader-shepherd-service))))
(compose concatenate)
(extend append)
(default-value '())))
diff --git a/d3.v3.js b/guix/d3.v3.js
similarity index 100%
rename from d3.v3.js
rename to guix/d3.v3.js
diff --git a/graph.js b/guix/graph.js
similarity index 100%
rename from graph.js
rename to guix/graph.js
diff --git a/guix/graph.scm b/guix/graph.scm
index 93ff9ef81a..0d4cd83667 100644
--- a/guix/graph.scm
+++ b/guix/graph.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@@ -274,11 +274,11 @@ text {
var nodes = {},
nodeArray = [],
links = [];
-" (search-path %load-path "d3.v3.js")))
+" (search-path %load-path "guix/d3.v3.js")))
(define (emit-d3js-epilogue port)
(format port "</script><script type=\"text/javascript\" src=\"~a\"></script></body></html>"
- (search-path %load-path "graph.js")))
+ (search-path %load-path "guix/graph.js")))
(define (emit-d3js-node id label port)
(format port "\
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 1d586acab6..c0dc5acf51 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
@@ -419,19 +419,24 @@ type '<elpa-package>'."
(string-drop (package-name package) 6)
(package-name package)))
- (let* ((repo 'gnu)
- (info (elpa-package-info name repo))
- (version (match info
- ((name raw-version . _)
- (elpa-version->string raw-version))))
- (url (match info
- ((_ raw-version reqs synopsis kind . rest)
- (package-source-url kind name version repo)))))
- (upstream-source
- (package (package-name package))
- (version version)
- (urls (list url))
- (signature-urls (list (string-append url ".sig"))))))
+ (define repo 'gnu)
+
+ (match (elpa-package-info name repo)
+ (#f
+ ;; No info, perhaps because PACKAGE is not truly an ELPA package.
+ #f)
+ (info
+ (let* ((version (match info
+ ((name raw-version . _)
+ (elpa-version->string raw-version))))
+ (url (match info
+ ((_ raw-version reqs synopsis kind . rest)
+ (package-source-url kind name version repo)))))
+ (upstream-source
+ (package (package-name package))
+ (version version)
+ (urls (list url))
+ (signature-urls (list (string-append url ".sig"))))))))
(define package-from-gnu.org?
(url-predicate (lambda (url)
diff --git a/guix/lint.scm b/guix/lint.scm
index be6bb4eb01..311bc94cc3 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -1183,7 +1183,7 @@ vulnerability records for PACKAGE by calling PACKAGE-VULNERABILITIES."
(format #f (G_ "while retrieving upstream info for '~a'")
(package-name package))
#f
- (package-latest-release* package (force %updaters)))
+ (package-latest-release* package))
((? upstream-source? source)
(if (version>? (upstream-source-version source)
(package-version package))
diff --git a/guix/scripts.scm b/guix/scripts.scm
index 9792aaebe9..34cba35401 100644
--- a/guix/scripts.scm
+++ b/guix/scripts.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -86,7 +87,8 @@
(development (G_ "software development commands"))
(packaging (G_ "packaging commands"))
(plumbing (G_ "plumbing commands"))
- (internal (G_ "internal commands")))
+ (internal (G_ "internal commands"))
+ (extension (G_ "extension commands")))
(define-syntax define-command
(syntax-rules (category synopsis)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index e435bf0ce4..fbc202c658 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -42,9 +42,7 @@
#:use-module (gnu packages bash)
#:use-module ((gnu packages bootstrap)
#:select (bootstrap-executable %bootstrap-guile))
- #:use-module (ice-9 format)
#:use-module (ice-9 match)
- #:use-module (ice-9 rdelim)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm
index 797b99f053..b8622373cc 100644
--- a/guix/scripts/hash.scm
+++ b/guix/scripts/hash.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
@@ -151,7 +151,8 @@ and 'base16' ('hex' and 'hexadecimal' can be used as well).\n"))
;; Catch and gracefully report possible '&nar-error' conditions.
(with-error-handling
(if (assoc-ref opts 'recursive?)
- (let-values (((port get-hash) (open-sha256-port)))
+ (let-values (((port get-hash)
+ (open-hash-port (assoc-ref opts 'hash-algorithm))))
(write-file file port #:select? select?)
(force-output port)
(get-hash))
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 8084c89ae5..e53de8c304 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -43,6 +43,7 @@
(open-connection-for-uri
. guix:open-connection-for-uri)
store-path-abbreviation byte-count->string))
+ #:autoload (gnutls) (error/invalid-session)
#:use-module (guix progress)
#:use-module ((guix build syscalls)
#:select (set-thread-name))
@@ -1054,9 +1055,12 @@ server certificates."
;; If PORT was cached and the server closed the connection in the
;; meantime, we get EPIPE. In that case, open a fresh connection and
;; retry. We might also get 'bad-response or a similar exception from
- ;; (web response) later on, once we've sent the request.
+ ;; (web response) later on, once we've sent the request, or a
+ ;; ERROR/INVALID-SESSION from GnuTLS.
(if (or (and (eq? key 'system-error)
(= EPIPE (system-error-errno `(,key ,@args))))
+ (and (eq? key 'gnutls-error)
+ (eq? (first args) error/invalid-session))
(memq key '(bad-response bad-header bad-header-component)))
(proc (open-connection uri #:fresh? #t))
(apply throw key args))))))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 0dcf2b3afe..51c8cf2f76 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -48,7 +48,8 @@
#:autoload (guix scripts package) (delete-generations
delete-matching-generations)
#:autoload (guix scripts pull) (channel-commit-hyperlink)
- #:use-module (guix graph)
+ #:autoload (guix graph) (export-graph node-type
+ graph-backend-name %graph-backends)
#:use-module (guix scripts graph)
#:use-module (guix scripts system reconfigure)
#:use-module (guix build utils)
@@ -887,18 +888,28 @@ Run 'herd status' to view the list of services on your system.\n"))))))
(register-root* (list output) gc-root))
(return output)))))))))
-(define (export-extension-graph os port)
- "Export the service extension graph of OS to PORT."
+(define (lookup-backend name) ;TODO: factorize
+ "Return the graph backend called NAME. Raise an error if it is not found."
+ (or (find (lambda (backend)
+ (string=? (graph-backend-name backend) name))
+ %graph-backends)
+ (leave (G_ "~a: unknown backend~%") name)))
+
+(define* (export-extension-graph os port
+ #:key (backend (lookup-backend "graphviz")))
+ "Export the service extension graph of OS to PORT using BACKEND."
(let* ((services (operating-system-services os))
(system (find (lambda (service)
(eq? (service-kind service) system-service-type))
services)))
(export-graph (list system) (current-output-port)
+ #:backend backend
#:node-type (service-node-type services)
#:reverse-edges? #t)))
-(define (export-shepherd-graph os port)
- "Export the graph of shepherd services of OS to PORT."
+(define* (export-shepherd-graph os port
+ #:key (backend (lookup-backend "graphviz")))
+ "Export the graph of shepherd services of OS to PORT using BACKEND."
(let* ((services (operating-system-services os))
(pid1 (fold-services services
#:target-type shepherd-root-service-type))
@@ -907,6 +918,7 @@ Run 'herd status' to view the list of services on your system.\n"))))))
(null? (shepherd-service-requirement service)))
shepherds)))
(export-graph sinks (current-output-port)
+ #:backend backend
#:node-type (shepherd-service-node-type shepherds)
#:reverse-edges? #t)))
@@ -1014,6 +1026,10 @@ Some ACTIONS support additional ARGS.\n"))
(display (G_ "
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
(newline)
+ (display (G_ "
+ --graph-backend=BACKEND
+ use BACKEND for 'extension-graphs' and 'shepherd-graph'"))
+ (newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "
@@ -1109,6 +1125,9 @@ Some ACTIONS support additional ARGS.\n"))
(option '(#\r "root") #t #f
(lambda (opt name arg result)
(alist-cons 'gc-root arg result)))
+ (option '("graph-backend") #t #f
+ (lambda (opt name arg result)
+ (alist-cons 'graph-backend arg result)))
%standard-build-options))
(define %default-options
@@ -1128,7 +1147,8 @@ Some ACTIONS support additional ARGS.\n"))
(image-size . guess)
(install-bootloader? . #t)
(label . #f)
- (volatile-root? . #f)))
+ (volatile-root? . #f)
+ (graph-backend . "graphviz")))
(define (verbosity-level opts)
"Return the verbosity level based on OPTS, the alist of parsed options."
@@ -1191,6 +1211,9 @@ resulting from command-line parsing."
(bootloader-configuration-target
(operating-system-bootloader os)))))
+ (define (graph-backend)
+ (lookup-backend (assoc-ref opts 'graph-backend)))
+
(with-store store
(set-build-options-from-command-line store opts)
@@ -1205,9 +1228,11 @@ resulting from command-line parsing."
(set-guile-for-build (default-guile))
(case action
((extension-graph)
- (export-extension-graph os (current-output-port)))
+ (export-extension-graph os (current-output-port)
+ #:backend (graph-backend)))
((shepherd-graph)
- (export-shepherd-graph os (current-output-port)))
+ (export-shepherd-graph os (current-output-port)
+ #:backend (graph-backend)))
(else
(unless (memq action '(build init))
(warn-about-old-distro #:suggested-command
diff --git a/guix/self.scm b/guix/self.scm
index 7cda6656c9..e2e3198057 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
@@ -880,6 +880,11 @@ itself."
(name name))
(scheme-modules* source "guix"))
(list *core-modules*)
+
+ #:extra-files
+ `(("guix/graph.js" ,(local-file "../guix/graph.js"))
+ ("guix/d3.v3.js" ,(local-file "../guix/d3.v3.js")))
+
#:extensions dependencies
#:guile-for-build guile-for-build))
diff --git a/guix/ui.scm b/guix/ui.scm
index fce2878354..bd504c68da 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
@@ -13,7 +13,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2019, 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -528,7 +528,7 @@ See the \"Application Setup\" section in the manual, for more info.\n"))
"Display version information for COMMAND and `(exit 0)'."
(simple-format #t "~a (~a) ~a~%"
command %guix-package-name %guix-version)
- (format #t "Copyright ~a 2020 ~a"
+ (format #t "Copyright ~a 2021 ~a"
;; TRANSLATORS: Translate "(C)" to the copyright symbol
;; (C-in-a-circle), if this symbol is available in the user's
;; locale. Otherwise, do not translate "(C)"; leave it as-is. */
@@ -2021,10 +2021,11 @@ optionally contain a version number and an output name, as in these examples:
on the 'define-command' top-level form found therein, or #f if FILE does not
contain a 'define-command' form."
(define command-name
- (match (string-split file #\/)
- ((_ ... "guix" "scripts" name)
+ (match (filter (negate string-null?)
+ (string-split file #\/))
+ ((_ ... "guix" (or "scripts" "extensions") name)
(list (file-sans-extension name)))
- ((_ ... "guix" "scripts" first second)
+ ((_ ... "guix" (or "scripts" "extensions") first second)
(list first (file-sans-extension second)))))
;; The strategy here is to parse FILE. This is much cheaper than a
@@ -2046,24 +2047,34 @@ contain a 'define-command' form."
(_
(loop)))))))
-(define (command-files)
+(define* (command-files #:optional directory)
"Return the list of source files that define Guix sub-commands."
- (define directory
- (and=> (search-path %load-path "guix.scm")
- (compose (cut string-append <> "/guix/scripts")
- dirname)))
+ (define directory*
+ (or directory
+ (and=> (search-path %load-path "guix.scm")
+ (compose (cut string-append <> "/guix/scripts")
+ dirname))))
(define dot-scm?
(cut string-suffix? ".scm" <>))
- (if directory
- (map (cut string-append directory "/" <>)
- (scandir directory dot-scm?))
+ (if directory*
+ (map (cut string-append directory* "/" <>)
+ (scandir directory* dot-scm?))
'()))
+(define (extension-directories)
+ "Return the list of directories containing Guix extensions."
+ (filter file-exists?
+ (parse-path
+ (getenv "GUIX_EXTENSIONS_PATH"))))
+
(define (commands)
"Return the list of commands, alphabetically sorted."
- (filter-map source-file-command (command-files)))
+ (filter-map source-file-command
+ (append (command-files)
+ (append-map command-files
+ (extension-directories)))))
(define (show-guix-help)
(define (internal? command)
@@ -2098,9 +2109,14 @@ Run COMMAND with ARGS.\n"))
(('internal . _)
#t) ;hide internal commands
((category . synopsis)
- (format #t "~% ~a~%" (G_ synopsis))
- (display-commands (filter (category-predicate category)
- commands))))
+ (let ((relevant-commands (filter (category-predicate category)
+ commands)))
+ ;; Only print categories that contain commands.
+ (match relevant-commands
+ ((one . more)
+ (format #t "~% ~a~%" (G_ synopsis))
+ (display-commands relevant-commands))
+ (_ #f)))))
categories))
(show-bug-report-information))
@@ -2111,10 +2127,21 @@ found."
(catch 'misc-error
(lambda ()
(resolve-interface `(guix scripts ,command)))
- (lambda -
- (format (current-error-port)
- (G_ "guix: ~a: command not found~%") command)
- (show-guix-usage))))
+ (lambda _
+ ;; Check if there is a matching extension.
+ (catch 'misc-error
+ (lambda ()
+ (match (search-path (extension-directories)
+ (format #f "~a.scm" command))
+ (#f
+ (throw 'misc-error))
+ (file
+ (load file)
+ (resolve-interface `(guix extensions ,command)))))
+ (lambda _
+ (format (current-error-port)
+ (G_ "guix: ~a: command not found~%") command)
+ (show-guix-usage))))))
(let ((command-main (module-ref module
(symbol-append 'guix- command))))
diff --git a/guix/upstream.scm b/guix/upstream.scm
index 6584d5e4c4..a8ed1d81cd 100644
--- a/guix/upstream.scm
+++ b/guix/upstream.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
@@ -248,7 +248,8 @@ correspond to the same version."
'()
(importer-modules))))
-(define (lookup-updater package updaters)
+(define* (lookup-updater package
+ #:optional (updaters (force %updaters)))
"Return an updater among UPDATERS that matches PACKAGE, or #f if none of
them matches."
(find (match-lambda
@@ -256,7 +257,9 @@ them matches."
(pred package)))
updaters))
-(define (package-latest-release package updaters)
+(define* (package-latest-release package
+ #:optional
+ (updaters (force %updaters)))
"Return an upstream source to update PACKAGE, a <package> object, or #f if
none of UPDATERS matches PACKAGE. It is the caller's responsibility to ensure
that the returned source is newer than the current one."
@@ -265,7 +268,9 @@ that the returned source is newer than the current one."
((upstream-updater-latest updater) package))
(_ #f)))
-(define (package-latest-release* package updaters)
+(define* (package-latest-release* package
+ #:optional
+ (updaters (force %updaters)))
"Like 'package-latest-release', but ensure that the return source is newer
than that of PACKAGE."
(match (package-latest-release package updaters)
@@ -402,7 +407,8 @@ SOURCE, an <upstream-source>."
;; Mapping of origin methods to source update procedures.
`((,url-fetch . ,package-update/url-fetch)))
-(define* (package-update store package updaters
+(define* (package-update store package
+ #:optional (updaters (force %updaters))
#:key (key-download 'interactive))
"Return the new version, the file name of the new version tarball, and input
changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date.
diff --git a/tests/guix-hash.sh b/tests/guix-hash.sh
index 346355539f..c4461fa955 100644
--- a/tests/guix-hash.sh
+++ b/tests/guix-hash.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2013, 2014, 2016, 2020 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013, 2014, 2016, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
#
# This file is part of GNU Guix.
@@ -43,6 +43,7 @@ chmod +x "$tmpdir/exe"
mkdir "$tmpdir/subdir"
test `guix hash -r "$tmpdir"` = 10k1lw41wyrjf9mxydi0is5nkpynlsvgslinics4ppir13g7d74p
+test `guix hash -r "$tmpdir" -H sha512` = 301ra58c2vahczzxiyfin41mpyb0ljh4dh9zn3ijvwviaw1j40sfzw5skh9x945da88n3785ggifzig7acd6k72h0mpsc20m1f66m9n
# Without '-r', this should fail.
! guix hash "$tmpdir"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 1:54 [Telegram-Desktop]: Help with packaging Raghav Gururajan
@ 2021-01-08 1:59 ` Raghav Gururajan
2021-01-08 12:11 ` Ekaitz Zarraga
2021-01-08 12:16 ` Ricardo Wurmus
2021-01-09 1:59 ` Raghav Gururajan
2021-01-12 3:32 ` Raghav Gururajan
2 siblings, 2 replies; 10+ messages in thread
From: Raghav Gururajan @ 2021-01-08 1:59 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
Hello Guix!
> With this email, I have attached the complete diff, which is to be
> applied on top of master.
I have attached wrong file before. Here is the correct one attached.
Regards,
RG.
[-- Attachment #2: telegram.diff --]
[-- Type: text/x-patch, Size: 48625 bytes --]
diff --git a/gnu/local.mk b/gnu/local.mk
index dfd44ac769..4332f16a82 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -533,6 +533,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/task-management.scm \
%D%/packages/tbb.scm \
%D%/packages/tcl.scm \
+ %D%/packages/telegram.scm \
%D%/packages/telephony.scm \
%D%/packages/terminals.scm \
%D%/packages/terraform.scm \
@@ -1124,6 +1125,7 @@ dist_patch_DATA = \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
+ %D%/packages/patches/gsl-gtest.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
@@ -1288,8 +1290,7 @@ dist_patch_DATA = \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
- %D%/packages/patches/libtgvoip-disable-sse2.patch \
- %D%/packages/patches/libtgvoip-disable-webrtc.patch \
+ %D%/packages/patches/libtgvoip-pkgconfig.patch \
%D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtirpc-hurd-client.patch \
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 56b32792fe..ab74650066 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -31,6 +31,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
@@ -43,6 +44,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
#:use-module (gnu packages hurd)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization)
@@ -52,6 +54,33 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
+(define-public cmake-shared
+ (package
+ (name "cmake-shared")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/cmake-shared.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ; No target
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (synopsis "Shared CMake functions and macros")
+ (description "CMake-Shared are shared functions and macros for projects
+using the CMake build system.")
+ (home-page "https://github.com/lirios/cmake-shared/")
+ (license license:bsd-3)))
+
;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system.
(define %common-build-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 00e006928e..f92cfe0c26 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -39,16 +39,19 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
@@ -63,6 +66,96 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
+(define-public rlottie
+ (package
+ (name "rlottie")
+ (version "0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Samsung/rlottie.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-Dlog=true"
+ "-Dtest=true")))
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Lottie Animation Library")
+ (description "Rlottie is a platform independent standalone c++ library for
+rendering vector based animations and art in realtime.")
+ (home-page "https://github.com/Samsung/rlottie/")
+ (license license:expat)))
+
+(define-public range-v3
+ (package
+ (name "range-v3")
+ (version "0.11.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/ericniebler/range-v3.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("perl" ,perl)))
+ (inputs
+ `(("boost" ,boost)))
+ (synopsis "Range library for C++14/17/20")
+ (description "Range-v3 is the range library for C++14/17/20. This code was
+the basis of a formal proposal to add range support to the C++ standard library.")
+ (home-page "https://github.com/ericniebler/range-v3/")
+ (license
+ (list
+ ;; Dual-Licensed
+ license:expat
+ license:ncsa))))
+
+(define-public gsl
+ (package
+ (name "gsl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/microsoft/GSL.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (patches
+ (search-patches "gsl-gtest.patch"))
+ (sha256
+ (base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Guidelines Support Library")
+ (description "GSL contains functions and types that are suggested for use by
+the C++ Core Guidelines maintained by the Standard C++ Foundation.")
+ (home-page "https://github.com/microsoft/GSL/")
+ (license license:expat)))
+
(define-public libzen
(package
(name "libzen")
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index d52edf1750..18d7d4ee34 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -19,11 +19,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages fcitx)
- #:use-module ((guix licenses) #:select (gpl2+))
+ #:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system qt)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
@@ -33,14 +35,69 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg))
+
+(define-public fcitx-qt5
+ (package
+ (name "fcitx-qt5")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/fcitx/fcitx-qt5.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-dir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "quickphrase-editor/CMakeLists.txt"
+ (("\\$\\{FCITX4_ADDON_INSTALL_DIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/fcitx")))
+ (substitute* "platforminputcontext/CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_QTPLUGINDIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("fcitx" ,fcitx)
+ ("libintl" ,intltool)
+ ("libxkbcommon" ,libxkbcommon)))
+ (propagated-inputs
+ `(("qtbase" ,qtbase)))
+ (synopsis "Fcitx Qt5 Input Context")
+ (description "Fcitx support for Qt5")
+ (home-page "https://github.com/fcitx/fcitx-qt5/")
+ (license
+ (list
+ ;; Plugin
+ bsd-3
+ ;; Others
+ gpl2+))))
(define-public presage
(package
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ef35349ec2..6dd37005ae 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2021,14 +2021,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("gtk+" ,gtk+)
- ("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator)
("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("libdbusmenu" ,libdbusmenu)))
(arguments
;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3")
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 3f17465039..1d1fe94690 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -23,36 +23,278 @@
(define-module (gnu packages language)
#:use-module (gnu packages)
+ #:use-module (gnu packages anthy)
#:use-module (gnu packages autotools)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages docbook)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages ibus)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages ocr)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages perl-check)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:select
- (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1))
+ (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils))
+(define-public nimf
+ (package
+ (name "nimf")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hamonikr/nimf.git")
+ (commit
+ (string-append "nimf-" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--with-im-config-data"
+ "--with-imsettings-data"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-flags
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("-Werror")
+ "-Wno-error"))
+ #t))
+ (add-after 'patch-flags 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "nimf-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml-4.3")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'patch-docbook-xml 'patch-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("/usr/share/anthy/anthy.dic")
+ (string-append (assoc-ref inputs "anthy")
+ "/share/anthy/anthy.dic")))
+ (substitute* "configure.ac"
+ (("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0")
+ (string-append (assoc-ref inputs "gtk+:bin")
+ "/bin:$GTK3_LIBDIR/libgtk-3-0"))
+ (("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0")
+ (string-append (assoc-ref inputs "gtk+-2:bin")
+ "/bin:$GTK2_LIBDIR/libgtk2.0-0")))
+ (substitute* "modules/clients/gtk/Makefile.am"
+ (("\\$\\(GTK3_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib"))
+ (("\\$\\(GTK2_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt4/Makefile.am"
+ (("\\$\\(QT4_LIB_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt5/Makefile.am"
+ (("\\$\\(QT5_IM_MODULE_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib/qt5/plugins/inputmethods")))
+ (substitute* '("bin/nimf-settings/Makefile.am"
+ "data/apparmor-abstractions/Makefile.am"
+ "data/Makefile.am" "data/im-config/Makefile.am"
+ "data/imsettings/Makefile.am")
+ (("/etc")
+ (string-append (assoc-ref outputs "out")
+ "/etc"))
+ (("/usr/share")
+ (string-append (assoc-ref outputs "out")
+ "/share")))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("docbook-xml-4.3" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+-2:bin" ,gtk+-2 "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("gtk+-2" ,gtk+-2)
+ ("gtk+" ,gtk+)
+ ("hangul" ,libhangul)
+ ("m17n-db" ,m17n-db)
+ ("m17n-lib" ,m17n-lib)
+ ("qt-4" ,qt-4)
+ ("qtbase" ,qtbase)
+ ("rime" ,librime)
+ ("rsvg" ,librsvg)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)
+ ("x11" ,libx11)
+ ("xkbcommon" ,libxkbcommon)
+ ("xklavier" ,libxklavier)))
+ (propagated-inputs
+ `(("glib" ,glib)))
+ (synopsis "Korean input method framework")
+ (description "Nimf is a lightweight, fast and extensible input method
+framework.")
+ (home-page "https://github.com/hamonikr/nimf/")
+ (license lgpl3+)))
+
+(define-public libchewing
+ (package
+ (name "libchewing")
+ (version "0.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/chewing/libchewing.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "test/Makefile.am"
+ ((" test-bopomofo ")
+ "")
+ ((" test-config ")
+ "")
+ ((" test-reset ")
+ "")
+ ((" test-symbol ")
+ "")
+ ((" test-keyboardless ")
+ "")
+ ((" test-special-symbol ")
+ ""))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("texinfo" ,texinfo)))
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("sqlite" ,sqlite)))
+ (synopsis "Chinese phonetic input method")
+ (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input
+method, one of the most popular choices for Traditional Chinese users.")
+ (home-page "http://chewing.im/")
+ (license lgpl2.1+)))
+
+(define-public hime
+ (package
+ (name "hime")
+ (version "0.9.11")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hime-ime/hime.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1wn0ici78x5qh6hvv50bf76ld7ds42hzzl4l5qz34hp8wyvrwakw"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ ;; FIXME
+ ;; error: unknown type name ‘GtkStatusIcon’
+ "--disable-system-tray")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-std
+ (lambda _
+ (substitute* '("configure" "Makefile")
+ (("17")
+ "11"))
+ #t)))))
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)
+ ("whereis" ,util-linux)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("chewing" ,libchewing)
+ ("gtk+" ,gtk+)
+ ("qtbase" ,qtbase)
+ ("xtst" ,libxtst)))
+ (synopsis "HIME Input Method Editor")
+ (description "Hime is an extremely easy-to-use input method framework. It
+is lightweight, stable, powerful and supports many commonly used input methods,
+including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin,
+Random Cage Fighting Birds, Cool Music etc.")
+ (home-page "http://hime-ime.github.io/")
+ (license
+ (list
+ gpl2+
+ lgpl2.1+
+ ;; Documentation
+ fdl1.2+))))
+
(define-public liblouis
(package
(name "liblouis")
diff --git a/gnu/packages/patches/gsl-gtest.patch b/gnu/packages/patches/gsl-gtest.patch
new file mode 100644
index 0000000000..2def650292
--- /dev/null
+++ b/gnu/packages/patches/gsl-gtest.patch
@@ -0,0 +1,96 @@
+From f5cf01083baf7e8dc8318db3648bc6098dc32d67 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <guriev-ns@ya.ru>
+Date: Sat, 18 Apr 2020 13:30:17 +0300
+Subject: [PATCH] Search for GoogleTest via pkg-config first
+
+---
+ tests/CMakeLists.txt | 55 ++++++++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 25 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 02193197..53d475c2 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,36 +1,41 @@
+ cmake_minimum_required(VERSION 3.0.2)
+
+ project(GSLTests CXX)
++include(FindPkgConfig)
+
+ # will make visual studio generated project group files
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++pkg_search_module(GTestMain gtest_main)
++if (NOT GTestMain_FOUND)
++ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} --build .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} --build .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(GTestMain_LIBRARIES gtest_main)
+
+-add_subdirectory(
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
+- EXCLUDE_FROM_ALL
+-)
++ add_subdirectory(
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
++ EXCLUDE_FROM_ALL
++ )
++endif()
+
+ if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
+ set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
+@@ -149,7 +154,7 @@ function(add_gsl_test name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
+@@ -254,7 +259,7 @@ function(add_gsl_test_noexcept name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config_noexcept
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
diff --git a/gnu/packages/patches/libtgvoip-disable-sse2.patch b/gnu/packages/patches/libtgvoip-disable-sse2.patch
deleted file mode 100644
index 0e4faeab26..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-sse2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Copied from Debian.
-
-Description: Disable SSE2 code on i386
- This patch is not complete. A high-graded solution may use automatic switching
- between SSE2 and C++ implementations based on the results of runtime checks.
- The webrtc code already provides for one of them inside its GetCPUInfo function.
-Bug-Debian: https://bugs.debian.org/892823
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:38 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -871,11 +871,7 @@
- 'WEBRTC_POSIX',
- ],
- 'conditions': [
-- [ '"<!(uname -m)" == "i686"', {
-- 'cflags_cc': [
-- '-msse2',
-- ],
-- }], ['"<!(uname -s)" == "Linux"', {
-+ [ '"<!(uname -s)" == "Linux"', {
- 'defines': [
- 'WEBRTC_LINUX',
- ],
---- a/webrtc_dsp/rtc_base/system/arch.h
-+++ b/webrtc_dsp/rtc_base/system/arch.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
---- a/webrtc_dsp/typedefs.h
-+++ b/webrtc_dsp/typedefs.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
diff --git a/gnu/packages/patches/libtgvoip-disable-webrtc.patch b/gnu/packages/patches/libtgvoip-disable-webrtc.patch
deleted file mode 100644
index 0ca532301c..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-webrtc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copied from Debian.
-
-Description: Fix build of WebRTC on non-Linux systems
- * Define the WEBRTC_LINUX macro only on Linux, and not on GNU/Hurd or FreeBSD.
- * Fix type cast in the CurrentThreadId function.
-Bug-Debian: https://bugs.debian.org/920851
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:44 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -869,20 +869,18 @@
- '"<(OS)" == "linux"', {
- 'defines': [
- 'WEBRTC_POSIX',
-- 'WEBRTC_LINUX',
- ],
- 'conditions': [
- [ '"<!(uname -m)" == "i686"', {
- 'cflags_cc': [
- '-msse2',
- ],
-+ }], ['"<!(uname -s)" == "Linux"', {
-+ 'defines': [
-+ 'WEBRTC_LINUX',
-+ ],
- }]
- ],
-- 'direct_dependent_settings': {
-- 'libraries': [
--
-- ],
-- },
- },
- ],
- ],
---- a/webrtc_dsp/rtc_base/platform_thread_types.cc
-+++ b/webrtc_dsp/rtc_base/platform_thread_types.cc
-@@ -31,7 +31,7 @@ PlatformThreadId CurrentThreadId() {
- return syscall(__NR_gettid);
- #else
- // Default implementation for nacl and solaris.
-- return reinterpret_cast<pid_t>(pthread_self());
-+ return static_cast<pid_t>(pthread_self());
- #endif
- #endif // defined(WEBRTC_POSIX)
- }
diff --git a/gnu/packages/patches/libtgvoip-pkgconfig.patch b/gnu/packages/patches/libtgvoip-pkgconfig.patch
new file mode 100644
index 0000000000..23794e8d77
--- /dev/null
+++ b/gnu/packages/patches/libtgvoip-pkgconfig.patch
@@ -0,0 +1,61 @@
+From 4ce5e22ed2dc24e9211c4874c1dd6b05faad2a87 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sun, 5 Jan 2020 12:25:31 +0400
+Subject: [PATCH] Add support for pkg-config
+
+---
+ Makefile.am | 2 ++
+ configure.ac | 4 +++-
+ tgvoip.pc.in | 10 ++++++++++
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 tgvoip.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 03c8866..a9c9715 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -755,6 +755,8 @@ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
+ tgvoipincludedir = $(includedir)/tgvoip
+ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
+
++pkgconfig_DATA = tgvoip.pc
++
+ CXXFLAGS += -std=gnu++0x $(CFLAGS)
+ if TARGET_OS_OSX
+ OBJCFLAGS = $(CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index 222f541..e2df927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,8 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AM_SILENT_RULES([yes])
+ LT_INIT
+
++PKG_INSTALLDIR
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+@@ -109,5 +111,5 @@ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname])
+
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile tgvoip.pc])
+ AC_OUTPUT
+diff --git a/tgvoip.pc.in b/tgvoip.pc.in
+new file mode 100644
+index 0000000..1ca7758
+--- /dev/null
++++ b/tgvoip.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tgvoip
++Description: VoIP library for Telegram clients
++Version: 2.4.4
++Libs: -L${libdir} -ltgvoip
++Cflags: -I${includedir}/tgvoip
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0b94063373..fac7831ab7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -45,6 +45,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (guix utils)
@@ -71,6 +72,7 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -102,6 +104,79 @@
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1))
+(define-public qt5ct
+ (package
+ (name "qt5ct")
+ (version "1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
+ (sha256
+ (base32 "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "qt5ct.pro"
+ (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
+ (string-append (assoc-ref inputs "qttools")
+ "/bin/lrelease")))
+ #t))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (invoke "qmake"
+ (string-append "PREFIX=" out)
+ (string-append "BINDIR=" out "/bin")
+ (string-append "DATADIR=" out "/share")
+ (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("qttools" ,qttools)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
+ (synopsis "Qt5 Configuration Tool")
+ (description "Qt5CT is a program that allows users to configure Qt5 settings
+(theme, font, icons, etc.) under DE/WM without Qt integration.")
+ (home-page "https://qt5ct.sourceforge.io/")
+ (license license:bsd-2)))
+
+(define-public materialdecoration
+ (package
+ (name "materialdecoration")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/materialdecoration.git")
+ (commit "2079487116c6c794af3a15452342a69293039b46")))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("cmake-shared" ,cmake-shared)
+ ("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtwayland" ,qtwayland)
+ ("wayland" ,wayland)))
+ (synopsis "Material Decoration for Qt")
+ (description "MaterialDecoration is the client-side decoration for Qt
+applications on Wayland.")
+ (home-page "https://github.com/lirios/materialdecoration")
+ (license license:lgpl3+)))
+
(define-public grantlee
(package
(name "grantlee")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
new file mode 100644
index 0000000000..88299c33cb
--- /dev/null
+++ b/gnu/packages/telegram.scm
@@ -0,0 +1,314 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages telegram)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages aidc)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages digest)
+ #:use-module (gnu packages fcitx)
+ #:use-module (gnu packages fcitx5)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages language)
+ #:use-module (gnu packages libreoffice)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages lxqt)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages telephony)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xiph)
+ #:use-module (gnu packages xorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system cmake))
+
+(define-public tdesktop
+ (package
+ (name "tdesktop")
+ (version "2.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/telegramdesktop/tdesktop.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "0drirhkr9gnm1g03lcqmvap5ljlk859c29gbsm63hhsgv15dlw0y"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DTDESKTOP_API_ID=17349"
+ "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
+ "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'copy-inputs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((to (getcwd))
+ (cmake_helpers (assoc-ref inputs "cmake_helpers"))
+ (codegen (assoc-ref inputs "codegen"))
+ (lib_base (assoc-ref inputs "lib_base"))
+ (lib_crl (assoc-ref inputs "lib_crl"))
+ (lib_lottie (assoc-ref inputs "lib_lottie"))
+ (lib_qr (assoc-ref inputs "lib_qr"))
+ (lib_rlottie (assoc-ref inputs "lib_rlottie"))
+ (lib_rpl (assoc-ref inputs "lib_rpl"))
+ (lib_spellcheck (assoc-ref inputs "lib_spellcheck"))
+ (lib_storage (assoc-ref inputs "lib_storage"))
+ (lib_tl (assoc-ref inputs "lib_tl"))
+ (lib_ui (assoc-ref inputs "lib_ui"))
+ (lib_webrtc (assoc-ref inputs "lib_webrtc"))
+ (tgcalls (assoc-ref inputs "tgcalls")))
+ (copy-recursively cmake_helpers (string-append to "/cmake"))
+ (copy-recursively codegen (string-append to "/Telegram/codegen"))
+ (copy-recursively lib_base (string-append to "/Telegram/lib_base"))
+ (copy-recursively lib_crl (string-append to "/Telegram/lib_crl"))
+ (copy-recursively lib_lottie (string-append to "/Telegram/lib_lottie"))
+ (copy-recursively lib_qr (string-append to "/Telegram/lib_qr"))
+ (copy-recursively lib_rlottie (string-append to "/Telegram/lib_rlottie"))
+ (copy-recursively lib_rpl (string-append to "/Telegram/lib_rpl"))
+ (copy-recursively lib_spellcheck (string-append to "/Telegram/lib_spellcheck"))
+ (copy-recursively lib_storage (string-append to "/Telegram/lib_storage"))
+ (copy-recursively lib_tl (string-append to "/Telegram/lib_tl"))
+ (copy-recursively lib_ui (string-append to "/Telegram/lib_ui"))
+ (copy-recursively lib_webrtc (string-append to "/Telegram/lib_webrtc"))
+ (copy-recursively tgcalls (string-append to "/Telegram/ThirdParty/tgcalls")))
+ #t))
+ (add-before 'configure 'patch-cxx-flags
+ (lambda _
+ (substitute* "cmake/options_linux.cmake"
+ (("class-memaccess")
+ "all"))
+ #t)))))
+ (native-inputs
+ `(("cmake_helpers"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/cmake_helpers.git")
+ (commit "a81345a")))
+ (file-name
+ (git-file-name "cmake_helpers" version))
+ (sha256
+ (base32 "0s5hxip68dmkaspjq6j30wx1r5v4prnrjza79hdbznz6i57a2248"))))
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+:bin" ,gtk+ "bin")
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qttools" ,qttools)))
+ (inputs
+ `(("alsa" ,alsa-lib)
+ ("catch" ,catch-framework2)
+ ("codegen"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/codegen.git")
+ (commit "127968d")))
+ (file-name
+ (git-file-name "codegen" version))
+ (sha256
+ (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2"))))
+ ("expected" ,libexpected)
+ ("fcitx-qt5" ,fcitx-qt5)
+ ("fcitx5-qt" ,fcitx5-qt)
+ ("ffmpeg" ,ffmpeg)
+ ("glib" ,glib)
+ ("gsl" ,gsl)
+ ("gtk+" ,gtk+)
+ ("hime" ,hime)
+ ("hunspell" ,hunspell)
+ ("iconv" ,libiconv)
+ ("lib_base"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_base.git")
+ (commit "81df0d0")))
+ (file-name
+ (git-file-name "lib_base" version))
+ (sha256
+ (base32 "0ikddprjnjvg0ic8jr2886xq0f18syp587q6z2kci9xmdnvjl217"))))
+ ("lib_crl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_crl.git")
+ (commit "16150bf")))
+ (file-name
+ (git-file-name "lib_crl" version))
+ (sha256
+ (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q"))))
+ ("lib_lottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_lottie.git")
+ (commit "fb40f37")))
+ (file-name
+ (git-file-name "lib_lottie" version))
+ (sha256
+ (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw"))))
+ ("lib_qr"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_qr.git")
+ (commit "92ce41a")))
+ (file-name
+ (git-file-name "lib_qr" version))
+ (sha256
+ (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj"))))
+ ("lib_rlottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rlottie.git")
+ (commit "0671bf7")))
+ (file-name
+ (git-file-name "lib_rlottie" version))
+ (sha256
+ (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
+ ("lib_rpl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rpl.git")
+ (commit "e1b9639")))
+ (file-name
+ (git-file-name "lib_rpl" version))
+ (sha256
+ (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss"))))
+ ("lib_spellcheck"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_spellcheck.git")
+ (commit "1b540b3")))
+ (file-name
+ (git-file-name "lib_spellcheck" version))
+ (sha256
+ (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7"))))
+ ("lib_storage"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_storage.git")
+ (commit "cbe5172")))
+ (file-name
+ (git-file-name "lib_storage" version))
+ (sha256
+ (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87"))))
+ ("lib_tl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_tl.git")
+ (commit "404c83d")))
+ (file-name
+ (git-file-name "lib_tl" version))
+ (sha256
+ (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f"))))
+ ("lib_ui"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_ui.git")
+ (commit "1e27992")))
+ (file-name
+ (git-file-name "lib_ui" version))
+ (sha256
+ (base32 "0kd4njcvic2700f00qn25vn3b80vsd2flsm3pi2synnldkiy8lcw"))))
+ ("lib_webrtc"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_webrtc.git")
+ (commit "4bc51d6")))
+ (file-name
+ (git-file-name "lib_webrtc" version))
+ (sha256
+ (base32 "06hpyq4qglrj3cb1xg8ghlmzm9ra8f5n6vm7hcy67n2wk8sy4cal"))))
+ ("libdbusmenu-qt" ,libdbusmenu-qt)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libtgvoip" ,libtgvoip)
+ ("lz4" ,lz4)
+ ("materialdecoration" ,materialdecoration)
+ ("minizip" ,minizip)
+ ("nimf" ,nimf)
+ ("openal" ,openal)
+ ("openssl" ,openssl)
+ ("opus" ,opus)
+ ("pulseaudio" ,pulseaudio)
+ ("qrcodegen" ,qrcodegen-cpp)
+ ("qt" ,qtbase)
+ ("qt5ct" ,qt5ct)
+ ("qtwayland" ,qtwayland)
+ ("range-v3" ,range-v3)
+ ("rlottie" ,rlottie)
+ ("tgcalls"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/TelegramMessenger/tgcalls.git")
+ (commit "178983f")))
+ (file-name
+ (git-file-name "tgcalls" version))
+ (sha256
+ (base32 "1xad65c9m6mj6zdj08flafvh8xjkd7xi9r1agcyc64y69lr427d0"))))
+ ("x11" ,libx11)
+ ("xcb" ,libxcb)
+ ("xcb-keysyms" ,xcb-util-keysyms)
+ ("xxhash" ,xxhash)
+ ("zlib" ,zlib)))
+ (synopsis "Telegram Desktop")
+ (description "Tdesktop is the official desktop application for telegram
+messenger.")
+ (home-page "https://desktop.telegram.org/")
+ (license license:gpl3+)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 48e30abfc3..bdb2fc778b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -874,40 +874,38 @@ Initiation Protocol (SIP) and a multimedia framework.")
(url "https://github.com/grishka/libtgvoip")
(commit version)))
(file-name (git-file-name name version))
- ;; Fix compilation on i686-linux architecture.
- ;; NOTE: Applying these patches is order-dependent!
- ;; The patch for WebRTC /must/ precede the patch for SSE2.
(patches
- (search-patches "libtgvoip-disable-webrtc.patch"
- "libtgvoip-disable-sse2.patch"))
+ (search-patches "libtgvoip-pkgconfig.patch"))
(sha256
(base32
"122kn3jx6v0kkldlzlpzvlwqxgp6pmzxsjhrhcxw12bx9c08sar5"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("libopusenc" ,libopusenc)
("openssl" ,openssl)
+ ("opus" ,opus)
("pulseaudio" ,pulseaudio)))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list
+ "--disable-static"
+ "--enable-audio-callback")
+ #:phases
(modify-phases %standard-phases
- ;; libtgvoip wants to dlopen libpulse and libasound, so tell it where
- ;; they are.
- (add-after 'unpack 'patch-dlopen
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "os/linux/AudioPulse.cpp"
- (("libpulse\\.so")
- (string-append (assoc-ref inputs "pulseaudio")
- "/lib/libpulse.so")))
- (substitute* '("os/linux/AudioInputALSA.cpp"
- "os/linux/AudioOutputALSA.cpp")
- (("libasound\\.so")
- (string-append (assoc-ref inputs "alsa-lib")
- "/lib/libasound.so")))
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (for-each delete-file
+ (list
+ "configure"
+ "Makefile.in"))
#t)))))
(synopsis "VoIP library for Telegram clients")
(description "A collection of libraries and header files for implementing
telephony functionality into custom Telegram clients.")
- (home-page "https://github.com/zevlg/libtgvoip")
+ (home-page "https://github.com/grishka/libtgvoip")
(license license:unlicense)))
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 1:59 ` Raghav Gururajan
@ 2021-01-08 12:11 ` Ekaitz Zarraga
2021-01-08 12:20 ` Julien Lepiller
2021-01-08 12:16 ` Ricardo Wurmus
1 sibling, 1 reply; 10+ messages in thread
From: Ekaitz Zarraga @ 2021-01-08 12:11 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: guix-devel@gnu.org
Hi,
I'm not sure about what I'm going to say so take it with care:
About the permission error I think the build directories are write protected by default it Guix, please someone correct me if I'm wrong.
I'd say you can change the permissions of the folder with the chmod util, you can see many packages do it. Just call it like:
(chmod filename mode)
Being `mode` something like #o664 for an equivalent `chmod 664 filename` bash call.
So I guess you need an extra build phase to correct the permissions on the folder so the script can write to it.
Maybe that will fix both errors, but make sure also that you have the dependencies for ElementTree, just in case.
I hope this helps...
Best,
Ekaitz
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 1:59 ` Raghav Gururajan
2021-01-08 12:11 ` Ekaitz Zarraga
@ 2021-01-08 12:16 ` Ricardo Wurmus
2021-01-08 21:21 ` Mark H Weaver
1 sibling, 1 reply; 10+ messages in thread
From: Ricardo Wurmus @ 2021-01-08 12:16 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: guix-devel
Raghav Gururajan <rg@raghavgururajan.name> writes:
> Hello Guix!
>
>> With this email, I have attached the complete diff, which is to be
>> applied on top of master.
>
> I have attached wrong file before. Here is the correct one attached.
The error you posted is this:
--8<---------------cut here---------------start------------->8---
Traceback (most recent call last):
File "/gnu/store/q9rm8h9imazsq2c4qiv2yjpvlvliywqb-python-3.8.2/lib/python3.8/xml/etree/ElementTree.py", line 786, in _get_writer
write = file_or_filename.write
AttributeError: 'str' object has no attribute 'write'
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/tmp/guix-build-tdesktop-2.5.1.drv-0/source/Telegram/build/changelog2appdata.py", line 73, in <module>
main()
File "/tmp/guix-build-tdesktop-2.5.1.drv-0/source/Telegram/build/changelog2appdata.py", line 68, in main
update_appdata(args.appdata_path,
File "/tmp/guix-build-tdesktop-2.5.1.drv-0/source/Telegram/build/changelog2appdata.py", line 60, in update_appdata
appdata.write(appdata_path, encoding="utf-8", xml_declaration=True)
File "/gnu/store/q9rm8h9imazsq2c4qiv2yjpvlvliywqb-python-3.8.2/lib/python3.8/xml/etree/ElementTree.py", line 756, in write
with _get_writer(file_or_filename, enc_lower) as write:
File "/gnu/store/q9rm8h9imazsq2c4qiv2yjpvlvliywqb-python-3.8.2/lib/python3.8/contextlib.py", line 113, in __enter__
return next(self.gen)
File "/gnu/store/q9rm8h9imazsq2c4qiv2yjpvlvliywqb-python-3.8.2/lib/python3.8/xml/etree/ElementTree.py", line 792, in _get_writer
file = open(file_or_filename, "w", encoding=encoding,
PermissionError: [Errno 13] Permission denied: '/tmp/guix-build-tdesktop-2.5.1.drv-0/build/Telegram/telegramdesktop.appdata.xml'
--8<---------------cut here---------------end--------------->8---
Because you are fetching from git and the git checkout is not writable
You need a build phase like this:
--8<---------------cut here---------------start------------->8---
(add-after 'unpack 'make-writable
(lambda _
(map make-file-writable
(find-files "." ".*"))
#t))
--8<---------------cut here---------------end--------------->8---
--
Ricardo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 12:11 ` Ekaitz Zarraga
@ 2021-01-08 12:20 ` Julien Lepiller
0 siblings, 0 replies; 10+ messages in thread
From: Julien Lepiller @ 2021-01-08 12:20 UTC (permalink / raw)
To: Ekaitz Zarraga, Raghav Gururajan; +Cc: guix-devel@gnu.org
Le 8 janvier 2021 07:11:38 GMT-05:00, Ekaitz Zarraga <ekaitz@elenq.tech> a écrit :
>Hi,
>
>I'm not sure about what I'm going to say so take it with care:
>
>About the permission error I think the build directories are write
>protected by default it Guix, please someone correct me if I'm wrong.
>I'd say you can change the permissions of the folder with the chmod
>util, you can see many packages do it. Just call it like:
>
>(chmod filename mode)
>
>Being `mode` something like #o664 for an equivalent `chmod 664
>filename` bash call.
Well, not by default: /gnu is read-only, but the package wants to write to /tmp, which is read-write. However, since you're using the git-fetch method for the sources, they are copied as is. Since they come from the store, the files are read-only, whicg makes your sources read-only.
>
>So I guess you need an extra build phase to correct the permissions on
>the folder so the script can write to it.
>
>Maybe that will fix both errors, but make sure also that you have the
>dependencies for ElementTree, just in case.
>
>I hope this helps...
>
>Best,
>Ekaitz
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 12:16 ` Ricardo Wurmus
@ 2021-01-08 21:21 ` Mark H Weaver
2021-01-08 22:04 ` Ricardo Wurmus
0 siblings, 1 reply; 10+ messages in thread
From: Mark H Weaver @ 2021-01-08 21:21 UTC (permalink / raw)
To: Ricardo Wurmus, Raghav Gururajan; +Cc: guix-devel
Hi,
Ricardo Wurmus <rekado@elephly.net> writes:
> Because you are fetching from git and the git checkout is not writable
> You need a build phase like this:
>
> --8<---------------cut here---------------start------------->8---
> (add-after 'unpack 'make-writable
> (lambda _
> (map make-file-writable
> (find-files "." ".*"))
> #t))
> --8<---------------cut here---------------end--------------->8---
It's more appropriate to use 'for-each' here. 'map' collects all of the
results into a list and returns that list, which is not needed here, and
is slightly less readable. Also, the second argument to 'find-files' is
optional; omitting it does what's needed more efficiently. So, in the
interest of promoting better practices, I would recommend this instead:
--8<---------------cut here---------------start------------->8---
(add-after 'unpack 'make-writable
(lambda _
(for-each make-file-writable
(find-files "."))
#t))
--8<---------------cut here---------------end--------------->8---
Regards,
Mark
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 21:21 ` Mark H Weaver
@ 2021-01-08 22:04 ` Ricardo Wurmus
2021-01-08 22:52 ` Raghav Gururajan
0 siblings, 1 reply; 10+ messages in thread
From: Ricardo Wurmus @ 2021-01-08 22:04 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel, Raghav Gururajan
Hi Mark,
> It's more appropriate to use 'for-each' here. 'map' collects all of the
> results into a list and returns that list, which is not needed here, and
> is slightly less readable. Also, the second argument to 'find-files' is
> optional; omitting it does what's needed more efficiently. So, in the
> interest of promoting better practices, I would recommend this instead:
>
> --8<---------------cut here---------------start------------->8---
> (add-after 'unpack 'make-writable
> (lambda _
> (for-each make-file-writable
> (find-files "."))
> #t))
> --8<---------------cut here---------------end--------------->8---
Thank you for this better variant. I copied it from an existing
instance in our code. We should clean those up at some point :)
--
Ricardo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 22:04 ` Ricardo Wurmus
@ 2021-01-08 22:52 ` Raghav Gururajan
0 siblings, 0 replies; 10+ messages in thread
From: Raghav Gururajan @ 2021-01-08 22:52 UTC (permalink / raw)
To: Ricardo Wurmus, Mark H Weaver; +Cc: guix-devel
Hi Mark and Ricardo!
>> It's more appropriate to use 'for-each' here. 'map' collects all of the
>> results into a list and returns that list, which is not needed here, and
>> is slightly less readable. Also, the second argument to 'find-files' is
>> optional; omitting it does what's needed more efficiently. So, in the
>> interest of promoting better practices, I would recommend this instead:
>>
>> --8<---------------cut here---------------start------------->8---
>> (add-after 'unpack 'make-writable
>> (lambda _
>> (for-each make-file-writable
>> (find-files "."))
>> #t))
>> --8<---------------cut here---------------end--------------->8---
>
> Thank you for this better variant. I copied it from an existing
> instance in our code. We should clean those up at some point :)
This worked. :-)
Regards,
RG.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 1:54 [Telegram-Desktop]: Help with packaging Raghav Gururajan
2021-01-08 1:59 ` Raghav Gururajan
@ 2021-01-09 1:59 ` Raghav Gururajan
2021-01-12 3:32 ` Raghav Gururajan
2 siblings, 0 replies; 10+ messages in thread
From: Raghav Gururajan @ 2021-01-09 1:59 UTC (permalink / raw)
To: guix-devel
Hello Guix!
While building 'tdesktop', I get this error:
https://paste.debian.net/1180280/
Any ideas?
Regards,
RG.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Telegram-Desktop]: Help with packaging
2021-01-08 1:54 [Telegram-Desktop]: Help with packaging Raghav Gururajan
2021-01-08 1:59 ` Raghav Gururajan
2021-01-09 1:59 ` Raghav Gururajan
@ 2021-01-12 3:32 ` Raghav Gururajan
2 siblings, 0 replies; 10+ messages in thread
From: Raghav Gururajan @ 2021-01-12 3:32 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
Hello Guix!
Currently, while building tdesktop, I get this error
(https://paste.debian.net/plain/1180757).
New diff file is attached with this email, which is to be applied on top
off master (efa773f94a18b40f2c63795f364ae87dade76f60).
Any ideas on how to rectify this error?
Regards,
RG.
[-- Attachment #2: telegram.diff --]
[-- Type: text/x-patch, Size: 51023 bytes --]
diff --git a/gnu/local.mk b/gnu/local.mk
index 1151d4642e..788f1d736e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -534,6 +534,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/task-management.scm \
%D%/packages/tbb.scm \
%D%/packages/tcl.scm \
+ %D%/packages/telegram.scm \
%D%/packages/telephony.scm \
%D%/packages/terminals.scm \
%D%/packages/terraform.scm \
@@ -1124,6 +1125,7 @@ dist_patch_DATA = \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
+ %D%/packages/patches/gsl-gtest.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
@@ -1288,8 +1290,7 @@ dist_patch_DATA = \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
- %D%/packages/patches/libtgvoip-disable-sse2.patch \
- %D%/packages/patches/libtgvoip-disable-webrtc.patch \
+ %D%/packages/patches/libtgvoip-pkgconfig.patch \
%D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtirpc-hurd-client.patch \
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 56b32792fe..ab74650066 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -31,6 +31,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (guix build-system gnu)
@@ -43,6 +44,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
#:use-module (gnu packages hurd)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages serialization)
@@ -52,6 +54,33 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
+(define-public cmake-shared
+ (package
+ (name "cmake-shared")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/cmake-shared.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f)) ; No target
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (synopsis "Shared CMake functions and macros")
+ (description "CMake-Shared are shared functions and macros for projects
+using the CMake build system.")
+ (home-page "https://github.com/lirios/cmake-shared/")
+ (license license:bsd-3)))
+
;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system.
(define %common-build-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 45d3faeafb..4295e6cc3d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -39,16 +39,19 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
@@ -63,6 +66,96 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
+(define-public rlottie
+ (package
+ (name "rlottie")
+ (version "0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/Samsung/rlottie.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-Dlog=true"
+ "-Dtest=true")))
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Lottie Animation Library")
+ (description "Rlottie is a platform independent standalone c++ library for
+rendering vector based animations and art in realtime.")
+ (home-page "https://github.com/Samsung/rlottie/")
+ (license license:expat)))
+
+(define-public range-v3
+ (package
+ (name "range-v3")
+ (version "0.11.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/ericniebler/range-v3.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("perl" ,perl)))
+ (inputs
+ `(("boost" ,boost)))
+ (synopsis "Range library for C++14/17/20")
+ (description "Range-v3 is the range library for C++14/17/20. This code was
+the basis of a formal proposal to add range support to the C++ standard library.")
+ (home-page "https://github.com/ericniebler/range-v3/")
+ (license
+ (list
+ ;; Dual-Licensed
+ license:expat
+ license:ncsa))))
+
+(define-public gsl
+ (package
+ (name "gsl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/microsoft/GSL.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (patches
+ (search-patches "gsl-gtest.patch"))
+ (sha256
+ (base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Guidelines Support Library")
+ (description "GSL contains functions and types that are suggested for use by
+the C++ Core Guidelines maintained by the Standard C++ Foundation.")
+ (home-page "https://github.com/microsoft/GSL/")
+ (license license:expat)))
+
(define-public libzen
(package
(name "libzen")
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index d52edf1750..18d7d4ee34 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -19,11 +19,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages fcitx)
- #:use-module ((guix licenses) #:select (gpl2+))
+ #:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system qt)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
@@ -33,14 +35,69 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages iso-codes)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages man)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg))
+
+(define-public fcitx-qt5
+ (package
+ (name "fcitx-qt5")
+ (version "1.2.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/fcitx/fcitx-qt5.git")
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1d56bp11jp85b2r4syw1clfg4vqxqfh7gygpwz8wk5sxmfmmdq83"))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-dir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "quickphrase-editor/CMakeLists.txt"
+ (("\\$\\{FCITX4_ADDON_INSTALL_DIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/fcitx")))
+ (substitute* "platforminputcontext/CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_QTPLUGINDIR\\}")
+ (string-append
+ (assoc-ref outputs "out")
+ "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("fcitx" ,fcitx)
+ ("libintl" ,intltool)
+ ("libxkbcommon" ,libxkbcommon)))
+ (propagated-inputs
+ `(("qtbase" ,qtbase)))
+ (synopsis "Fcitx Qt5 Input Context")
+ (description "Fcitx support for Qt5")
+ (home-page "https://github.com/fcitx/fcitx-qt5/")
+ (license
+ (list
+ ;; Plugin
+ bsd-3
+ ;; Others
+ gpl2+))))
(define-public presage
(package
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ef35349ec2..6dd37005ae 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2021,14 +2021,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("gtk+" ,gtk+)
- ("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator)
("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("libdbusmenu" ,libdbusmenu)))
(arguments
;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3")
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 3f17465039..1d1fe94690 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -23,36 +23,278 @@
(define-module (gnu packages language)
#:use-module (gnu packages)
+ #:use-module (gnu packages anthy)
#:use-module (gnu packages autotools)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages docbook)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages ibus)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages ocr)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages perl-check)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:select
- (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1))
+ (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils))
+(define-public nimf
+ (package
+ (name "nimf")
+ (version "1.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hamonikr/nimf.git")
+ (commit
+ (string-append "nimf-" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--with-im-config-data"
+ "--with-imsettings-data"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-flags
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("-Werror")
+ "-Wno-error"))
+ #t))
+ (add-after 'patch-flags 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "nimf-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml-4.3")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'patch-docbook-xml 'patch-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("/usr/share/anthy/anthy.dic")
+ (string-append (assoc-ref inputs "anthy")
+ "/share/anthy/anthy.dic")))
+ (substitute* "configure.ac"
+ (("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0")
+ (string-append (assoc-ref inputs "gtk+:bin")
+ "/bin:$GTK3_LIBDIR/libgtk-3-0"))
+ (("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0")
+ (string-append (assoc-ref inputs "gtk+-2:bin")
+ "/bin:$GTK2_LIBDIR/libgtk2.0-0")))
+ (substitute* "modules/clients/gtk/Makefile.am"
+ (("\\$\\(GTK3_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib"))
+ (("\\$\\(GTK2_LIBDIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt4/Makefile.am"
+ (("\\$\\(QT4_LIB_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib")))
+ (substitute* "modules/clients/qt5/Makefile.am"
+ (("\\$\\(QT5_IM_MODULE_DIR\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib/qt5/plugins/inputmethods")))
+ (substitute* '("bin/nimf-settings/Makefile.am"
+ "data/apparmor-abstractions/Makefile.am"
+ "data/Makefile.am" "data/im-config/Makefile.am"
+ "data/imsettings/Makefile.am")
+ (("/etc")
+ (string-append (assoc-ref outputs "out")
+ "/etc"))
+ (("/usr/share")
+ (string-append (assoc-ref outputs "out")
+ "/share")))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("docbook-xml-4.3" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+-2:bin" ,gtk+-2 "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("gtk+-2" ,gtk+-2)
+ ("gtk+" ,gtk+)
+ ("hangul" ,libhangul)
+ ("m17n-db" ,m17n-db)
+ ("m17n-lib" ,m17n-lib)
+ ("qt-4" ,qt-4)
+ ("qtbase" ,qtbase)
+ ("rime" ,librime)
+ ("rsvg" ,librsvg)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)
+ ("x11" ,libx11)
+ ("xkbcommon" ,libxkbcommon)
+ ("xklavier" ,libxklavier)))
+ (propagated-inputs
+ `(("glib" ,glib)))
+ (synopsis "Korean input method framework")
+ (description "Nimf is a lightweight, fast and extensible input method
+framework.")
+ (home-page "https://github.com/hamonikr/nimf/")
+ (license lgpl3+)))
+
+(define-public libchewing
+ (package
+ (name "libchewing")
+ (version "0.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/chewing/libchewing.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "test/Makefile.am"
+ ((" test-bopomofo ")
+ "")
+ ((" test-config ")
+ "")
+ ((" test-reset ")
+ "")
+ ((" test-symbol ")
+ "")
+ ((" test-keyboardless ")
+ "")
+ ((" test-special-symbol ")
+ ""))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("texinfo" ,texinfo)))
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("sqlite" ,sqlite)))
+ (synopsis "Chinese phonetic input method")
+ (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input
+method, one of the most popular choices for Traditional Chinese users.")
+ (home-page "http://chewing.im/")
+ (license lgpl2.1+)))
+
+(define-public hime
+ (package
+ (name "hime")
+ (version "0.9.11")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hime-ime/hime.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1wn0ici78x5qh6hvv50bf76ld7ds42hzzl4l5qz34hp8wyvrwakw"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ ;; FIXME
+ ;; error: unknown type name ‘GtkStatusIcon’
+ "--disable-system-tray")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-std
+ (lambda _
+ (substitute* '("configure" "Makefile")
+ (("17")
+ "11"))
+ #t)))))
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)
+ ("whereis" ,util-linux)))
+ (inputs
+ `(("anthy" ,anthy)
+ ("appindicator" ,libappindicator)
+ ("chewing" ,libchewing)
+ ("gtk+" ,gtk+)
+ ("qtbase" ,qtbase)
+ ("xtst" ,libxtst)))
+ (synopsis "HIME Input Method Editor")
+ (description "Hime is an extremely easy-to-use input method framework. It
+is lightweight, stable, powerful and supports many commonly used input methods,
+including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin,
+Random Cage Fighting Birds, Cool Music etc.")
+ (home-page "http://hime-ime.github.io/")
+ (license
+ (list
+ gpl2+
+ lgpl2.1+
+ ;; Documentation
+ fdl1.2+))))
+
(define-public liblouis
(package
(name "liblouis")
diff --git a/gnu/packages/patches/gsl-gtest.patch b/gnu/packages/patches/gsl-gtest.patch
new file mode 100644
index 0000000000..2def650292
--- /dev/null
+++ b/gnu/packages/patches/gsl-gtest.patch
@@ -0,0 +1,96 @@
+From f5cf01083baf7e8dc8318db3648bc6098dc32d67 Mon Sep 17 00:00:00 2001
+From: Nicholas Guriev <guriev-ns@ya.ru>
+Date: Sat, 18 Apr 2020 13:30:17 +0300
+Subject: [PATCH] Search for GoogleTest via pkg-config first
+
+---
+ tests/CMakeLists.txt | 55 ++++++++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 25 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 02193197..53d475c2 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,36 +1,41 @@
+ cmake_minimum_required(VERSION 3.0.2)
+
+ project(GSLTests CXX)
++include(FindPkgConfig)
+
+ # will make visual studio generated project group files
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++pkg_search_module(GTestMain gtest_main)
++if (NOT GTestMain_FOUND)
++ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-execute_process(
+- COMMAND ${CMAKE_COMMAND} --build .
+- RESULT_VARIABLE result
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
+-)
+-if(result)
+- message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+-endif()
++ execute_process(
++ COMMAND ${CMAKE_COMMAND} --build .
++ RESULT_VARIABLE result
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
++ )
++ if(result)
++ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
++ endif()
+
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ set(GTestMain_LIBRARIES gtest_main)
+
+-add_subdirectory(
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
+- EXCLUDE_FROM_ALL
+-)
++ add_subdirectory(
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
++ ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
++ EXCLUDE_FROM_ALL
++ )
++endif()
+
+ if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
+ set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
+@@ -149,7 +154,7 @@ function(add_gsl_test name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
+@@ -254,7 +259,7 @@ function(add_gsl_test_noexcept name)
+ target_link_libraries(${name}
+ GSL
+ gsl_tests_config_noexcept
+- gtest_main
++ ${GTestMain_LIBRARIES}
+ )
+ add_test(
+ ${name}
diff --git a/gnu/packages/patches/libtgvoip-disable-sse2.patch b/gnu/packages/patches/libtgvoip-disable-sse2.patch
deleted file mode 100644
index 0e4faeab26..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-sse2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Copied from Debian.
-
-Description: Disable SSE2 code on i386
- This patch is not complete. A high-graded solution may use automatic switching
- between SSE2 and C++ implementations based on the results of runtime checks.
- The webrtc code already provides for one of them inside its GetCPUInfo function.
-Bug-Debian: https://bugs.debian.org/892823
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:38 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -871,11 +871,7 @@
- 'WEBRTC_POSIX',
- ],
- 'conditions': [
-- [ '"<!(uname -m)" == "i686"', {
-- 'cflags_cc': [
-- '-msse2',
-- ],
-- }], ['"<!(uname -s)" == "Linux"', {
-+ [ '"<!(uname -s)" == "Linux"', {
- 'defines': [
- 'WEBRTC_LINUX',
- ],
---- a/webrtc_dsp/rtc_base/system/arch.h
-+++ b/webrtc_dsp/rtc_base/system/arch.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
---- a/webrtc_dsp/typedefs.h
-+++ b/webrtc_dsp/typedefs.h
-@@ -28,7 +28,10 @@
- #define WEBRTC_ARCH_64_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #elif defined(_M_IX86) || defined(__i386__)
-+#if defined(__SSE2__)
-+// This macro is mostly used to detect SSE2 extension.
- #define WEBRTC_ARCH_X86_FAMILY
-+#endif
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
diff --git a/gnu/packages/patches/libtgvoip-disable-webrtc.patch b/gnu/packages/patches/libtgvoip-disable-webrtc.patch
deleted file mode 100644
index 0ca532301c..0000000000
--- a/gnu/packages/patches/libtgvoip-disable-webrtc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copied from Debian.
-
-Description: Fix build of WebRTC on non-Linux systems
- * Define the WEBRTC_LINUX macro only on Linux, and not on GNU/Hurd or FreeBSD.
- * Fix type cast in the CurrentThreadId function.
-Bug-Debian: https://bugs.debian.org/920851
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Tue, 29 Jan 2019 23:26:44 +0300
-
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -869,20 +869,18 @@
- '"<(OS)" == "linux"', {
- 'defines': [
- 'WEBRTC_POSIX',
-- 'WEBRTC_LINUX',
- ],
- 'conditions': [
- [ '"<!(uname -m)" == "i686"', {
- 'cflags_cc': [
- '-msse2',
- ],
-+ }], ['"<!(uname -s)" == "Linux"', {
-+ 'defines': [
-+ 'WEBRTC_LINUX',
-+ ],
- }]
- ],
-- 'direct_dependent_settings': {
-- 'libraries': [
--
-- ],
-- },
- },
- ],
- ],
---- a/webrtc_dsp/rtc_base/platform_thread_types.cc
-+++ b/webrtc_dsp/rtc_base/platform_thread_types.cc
-@@ -31,7 +31,7 @@ PlatformThreadId CurrentThreadId() {
- return syscall(__NR_gettid);
- #else
- // Default implementation for nacl and solaris.
-- return reinterpret_cast<pid_t>(pthread_self());
-+ return static_cast<pid_t>(pthread_self());
- #endif
- #endif // defined(WEBRTC_POSIX)
- }
diff --git a/gnu/packages/patches/libtgvoip-pkgconfig.patch b/gnu/packages/patches/libtgvoip-pkgconfig.patch
new file mode 100644
index 0000000000..23794e8d77
--- /dev/null
+++ b/gnu/packages/patches/libtgvoip-pkgconfig.patch
@@ -0,0 +1,61 @@
+From 4ce5e22ed2dc24e9211c4874c1dd6b05faad2a87 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sun, 5 Jan 2020 12:25:31 +0400
+Subject: [PATCH] Add support for pkg-config
+
+---
+ Makefile.am | 2 ++
+ configure.ac | 4 +++-
+ tgvoip.pc.in | 10 ++++++++++
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 tgvoip.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 03c8866..a9c9715 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -755,6 +755,8 @@ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
+ tgvoipincludedir = $(includedir)/tgvoip
+ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
+
++pkgconfig_DATA = tgvoip.pc
++
+ CXXFLAGS += -std=gnu++0x $(CFLAGS)
+ if TARGET_OS_OSX
+ OBJCFLAGS = $(CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index 222f541..e2df927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,8 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AM_SILENT_RULES([yes])
+ LT_INIT
+
++PKG_INSTALLDIR
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+@@ -109,5 +111,5 @@ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname])
+
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile tgvoip.pc])
+ AC_OUTPUT
+diff --git a/tgvoip.pc.in b/tgvoip.pc.in
+new file mode 100644
+index 0000000..1ca7758
+--- /dev/null
++++ b/tgvoip.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tgvoip
++Description: VoIP library for Telegram clients
++Version: 2.4.4
++Libs: -L${libdir} -ltgvoip
++Cflags: -I${includedir}/tgvoip
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 79d41b3e73..cd24f2c319 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -45,6 +45,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (guix utils)
@@ -72,6 +73,7 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -103,6 +105,79 @@
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1))
+(define-public qt5ct
+ (package
+ (name "qt5ct")
+ (version "1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
+ (sha256
+ (base32 "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "qt5ct.pro"
+ (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
+ (string-append (assoc-ref inputs "qttools")
+ "/bin/lrelease")))
+ #t))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (invoke "qmake"
+ (string-append "PREFIX=" out)
+ (string-append "BINDIR=" out "/bin")
+ (string-append "DATADIR=" out "/share")
+ (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))
+ #t)))))
+ (native-inputs
+ `(("qttools" ,qttools)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)))
+ (synopsis "Qt5 Configuration Tool")
+ (description "Qt5CT is a program that allows users to configure Qt5 settings
+(theme, font, icons, etc.) under DE/WM without Qt integration.")
+ (home-page "https://qt5ct.sourceforge.io/")
+ (license license:bsd-2)))
+
+(define-public materialdecoration
+ (package
+ (name "materialdecoration")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/lirios/materialdecoration.git")
+ (commit "2079487116c6c794af3a15452342a69293039b46")))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("cmake-shared" ,cmake-shared)
+ ("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtwayland" ,qtwayland)
+ ("wayland" ,wayland)))
+ (synopsis "Material Decoration for Qt")
+ (description "MaterialDecoration is the client-side decoration for Qt
+applications on Wayland.")
+ (home-page "https://github.com/lirios/materialdecoration")
+ (license license:lgpl3+)))
+
(define-public grantlee
(package
(name "grantlee")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
new file mode 100644
index 0000000000..513f2246df
--- /dev/null
+++ b/gnu/packages/telegram.scm
@@ -0,0 +1,321 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages telegram)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages aidc)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages digest)
+ #:use-module (gnu packages fcitx)
+ #:use-module (gnu packages fcitx5)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages language)
+ #:use-module (gnu packages libreoffice)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages lxqt)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages telephony)
+ #:use-module (gnu packages tls)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xiph)
+ #:use-module (gnu packages xorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system cmake))
+
+(define-public tdesktop
+ (package
+ (name "tdesktop")
+ (version "2.5.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/telegramdesktop/tdesktop.git")
+ (commit
+ (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "0drirhkr9gnm1g03lcqmvap5ljlk859c29gbsm63hhsgv15dlw0y"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DTDESKTOP_API_ID=17349"
+ "-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'make-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files "."))
+ #t))
+ (add-after 'make-writable 'copy-inputs
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((to (getcwd))
+ (cmake_helpers (assoc-ref inputs "cmake_helpers"))
+ (codegen (assoc-ref inputs "codegen"))
+ (lib_base (assoc-ref inputs "lib_base"))
+ (lib_crl (assoc-ref inputs "lib_crl"))
+ (lib_lottie (assoc-ref inputs "lib_lottie"))
+ (lib_qr (assoc-ref inputs "lib_qr"))
+ (lib_rlottie (assoc-ref inputs "lib_rlottie"))
+ (lib_rpl (assoc-ref inputs "lib_rpl"))
+ (lib_spellcheck (assoc-ref inputs "lib_spellcheck"))
+ (lib_storage (assoc-ref inputs "lib_storage"))
+ (lib_tl (assoc-ref inputs "lib_tl"))
+ (lib_ui (assoc-ref inputs "lib_ui"))
+ (lib_webrtc (assoc-ref inputs "lib_webrtc"))
+ (tgcalls (assoc-ref inputs "tgcalls")))
+ (copy-recursively cmake_helpers (string-append to "/cmake"))
+ (copy-recursively codegen (string-append to "/Telegram/codegen"))
+ (copy-recursively lib_base (string-append to "/Telegram/lib_base"))
+ (copy-recursively lib_crl (string-append to "/Telegram/lib_crl"))
+ (copy-recursively lib_lottie (string-append to "/Telegram/lib_lottie"))
+ (copy-recursively lib_qr (string-append to "/Telegram/lib_qr"))
+ (copy-recursively lib_rlottie (string-append to "/Telegram/lib_rlottie"))
+ (copy-recursively lib_rpl (string-append to "/Telegram/lib_rpl"))
+ (copy-recursively lib_spellcheck (string-append to "/Telegram/lib_spellcheck"))
+ (copy-recursively lib_storage (string-append to "/Telegram/lib_storage"))
+ (copy-recursively lib_tl (string-append to "/Telegram/lib_tl"))
+ (copy-recursively lib_ui (string-append to "/Telegram/lib_ui"))
+ (copy-recursively lib_webrtc (string-append to "/Telegram/lib_webrtc"))
+ (copy-recursively tgcalls (string-append to "/Telegram/ThirdParty/tgcalls")))
+ #t))
+ (add-before 'configure 'patch-cxx-flags
+ (lambda _
+ (substitute* "cmake/options_linux.cmake"
+ (("class-memaccess")
+ "all"))
+ #t)))))
+ (native-inputs
+ `(("cmake_helpers"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/cmake_helpers.git")
+ (commit "a81345a")))
+ (file-name
+ (git-file-name "cmake_helpers" version))
+ (sha256
+ (base32 "0s5hxip68dmkaspjq6j30wx1r5v4prnrjza79hdbznz6i57a2248"))))
+ ("gcc" ,gcc-9)
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk+:bin" ,gtk+ "bin")
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qttools" ,qttools)))
+ (inputs
+ `(("alsa" ,alsa-lib)
+ ("catch" ,catch-framework2)
+ ("codegen"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/codegen.git")
+ (commit "127968d")))
+ (file-name
+ (git-file-name "codegen" version))
+ (sha256
+ (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2"))))
+ ("expected" ,libexpected)
+ ("fcitx-qt5" ,fcitx-qt5)
+ ("fcitx5-qt" ,fcitx5-qt)
+ ("ffmpeg" ,ffmpeg)
+ ("glib" ,glib)
+ ("gsl" ,gsl)
+ ("gtk+" ,gtk+)
+ ("hime" ,hime)
+ ("hunspell" ,hunspell)
+ ("iconv" ,libiconv)
+ ("lib_base"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_base.git")
+ (commit "81df0d0")))
+ (file-name
+ (git-file-name "lib_base" version))
+ (sha256
+ (base32 "0ikddprjnjvg0ic8jr2886xq0f18syp587q6z2kci9xmdnvjl217"))))
+ ("lib_crl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_crl.git")
+ (commit "16150bf")))
+ (file-name
+ (git-file-name "lib_crl" version))
+ (sha256
+ (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q"))))
+ ("lib_lottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_lottie.git")
+ (commit "fb40f37")))
+ (file-name
+ (git-file-name "lib_lottie" version))
+ (sha256
+ (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw"))))
+ ("lib_qr"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_qr.git")
+ (commit "92ce41a")))
+ (file-name
+ (git-file-name "lib_qr" version))
+ (sha256
+ (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj"))))
+ ("lib_rlottie"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rlottie.git")
+ (commit "0671bf7")))
+ (file-name
+ (git-file-name "lib_rlottie" version))
+ (sha256
+ (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
+ ("lib_rpl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_rpl.git")
+ (commit "e1b9639")))
+ (file-name
+ (git-file-name "lib_rpl" version))
+ (sha256
+ (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss"))))
+ ("lib_spellcheck"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_spellcheck.git")
+ (commit "1b540b3")))
+ (file-name
+ (git-file-name "lib_spellcheck" version))
+ (sha256
+ (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7"))))
+ ("lib_storage"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_storage.git")
+ (commit "cbe5172")))
+ (file-name
+ (git-file-name "lib_storage" version))
+ (sha256
+ (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87"))))
+ ("lib_tl"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_tl.git")
+ (commit "404c83d")))
+ (file-name
+ (git-file-name "lib_tl" version))
+ (sha256
+ (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f"))))
+ ("lib_ui"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_ui.git")
+ (commit "1e27992")))
+ (file-name
+ (git-file-name "lib_ui" version))
+ (sha256
+ (base32 "0kd4njcvic2700f00qn25vn3b80vsd2flsm3pi2synnldkiy8lcw"))))
+ ("lib_webrtc"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/lib_webrtc.git")
+ (commit "4bc51d6")))
+ (file-name
+ (git-file-name "lib_webrtc" version))
+ (sha256
+ (base32 "06hpyq4qglrj3cb1xg8ghlmzm9ra8f5n6vm7hcy67n2wk8sy4cal"))))
+ ("libdbusmenu-qt" ,libdbusmenu-qt)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libtgvoip" ,libtgvoip)
+ ("lz4" ,lz4)
+ ("materialdecoration" ,materialdecoration)
+ ("minizip" ,minizip)
+ ("nimf" ,nimf)
+ ("openal" ,openal)
+ ("openssl" ,openssl)
+ ("opus" ,opus)
+ ("pulseaudio" ,pulseaudio)
+ ("qrcodegen" ,qrcodegen-cpp)
+ ("qt" ,qtbase)
+ ("qt5ct" ,qt5ct)
+ ("qtwayland" ,qtwayland)
+ ("range-v3" ,range-v3)
+ ("rlottie" ,rlottie)
+ ("tg_owt" ,tg_owt)
+ ("tgcalls"
+ ,(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/TelegramMessenger/tgcalls.git")
+ (commit "178983f")))
+ (file-name
+ (git-file-name "tgcalls" version))
+ (sha256
+ (base32 "1xad65c9m6mj6zdj08flafvh8xjkd7xi9r1agcyc64y69lr427d0"))))
+ ("x11" ,libx11)
+ ("xcb" ,libxcb)
+ ("xcb-keysyms" ,xcb-util-keysyms)
+ ("xxhash" ,xxhash)
+ ("zlib" ,zlib)))
+ (synopsis "Telegram Desktop")
+ (description "Tdesktop is the official desktop application for telegram
+messenger.")
+ (home-page "https://desktop.telegram.org/")
+ (license license:gpl3+)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 48e30abfc3..2f9d2c8cc6 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -40,6 +40,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages aidc)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages audio)
@@ -47,6 +48,7 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages docbook)
@@ -93,6 +95,54 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system qt))
+(define-public tg_owt
+ (package
+ (name "tg_owt")
+ (version "0.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/desktop-app/tg_owt.git")
+ (commit "10b988a")))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "12wwj1hgmklpxs1m0mx6xa2a3n6prfvi539kx444pny31440nhpj"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ "-DCMAKE_C_FLAGS=-fPIC"
+ "-DCMAKE_CXX_FLAGS=-fPIC"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DTG_OWT_USE_PROTOBUF=ON")))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("yasm" ,yasm)))
+ (inputs
+ `(("abseil-cpp" ,abseil-cpp)
+ ("alsa" ,alsa-lib)
+ ("ffmpeg" ,ffmpeg)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libsrtp" ,libsrtp)
+ ("libvpx" ,libvpx)
+ ;; ("libyuv" ,libyuv)
+ ("openh264" ,openh264)
+ ("openssl" ,openssl)
+ ("opus" ,opus)
+ ("protobuf" ,protobuf)
+ ("pulseaudio" ,pulseaudio)
+ ("rnnoise" ,rnnoise)))
+ (synopsis "WebRTC build for Telegram")
+ (description "TG_OWT is the packaged build of WebRTC, for its use in
+Telegram-Desktop application.")
+ (home-page "https://github.com/desktop-app/tg_owt")
+ (license license:bsd-3)))
+
(define-public libilbc
(package
(name "libilbc")
@@ -874,40 +924,38 @@ Initiation Protocol (SIP) and a multimedia framework.")
(url "https://github.com/grishka/libtgvoip")
(commit version)))
(file-name (git-file-name name version))
- ;; Fix compilation on i686-linux architecture.
- ;; NOTE: Applying these patches is order-dependent!
- ;; The patch for WebRTC /must/ precede the patch for SSE2.
(patches
- (search-patches "libtgvoip-disable-webrtc.patch"
- "libtgvoip-disable-sse2.patch"))
+ (search-patches "libtgvoip-pkgconfig.patch"))
(sha256
(base32
"122kn3jx6v0kkldlzlpzvlwqxgp6pmzxsjhrhcxw12bx9c08sar5"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("libopusenc" ,libopusenc)
("openssl" ,openssl)
+ ("opus" ,opus)
("pulseaudio" ,pulseaudio)))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list
+ "--disable-static"
+ "--enable-audio-callback")
+ #:phases
(modify-phases %standard-phases
- ;; libtgvoip wants to dlopen libpulse and libasound, so tell it where
- ;; they are.
- (add-after 'unpack 'patch-dlopen
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "os/linux/AudioPulse.cpp"
- (("libpulse\\.so")
- (string-append (assoc-ref inputs "pulseaudio")
- "/lib/libpulse.so")))
- (substitute* '("os/linux/AudioInputALSA.cpp"
- "os/linux/AudioOutputALSA.cpp")
- (("libasound\\.so")
- (string-append (assoc-ref inputs "alsa-lib")
- "/lib/libasound.so")))
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (for-each delete-file
+ (list
+ "configure"
+ "Makefile.in"))
#t)))))
(synopsis "VoIP library for Telegram clients")
(description "A collection of libraries and header files for implementing
telephony functionality into custom Telegram clients.")
- (home-page "https://github.com/zevlg/libtgvoip")
+ (home-page "https://github.com/grishka/libtgvoip")
(license license:unlicense)))
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-01-12 3:34 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-08 1:54 [Telegram-Desktop]: Help with packaging Raghav Gururajan
2021-01-08 1:59 ` Raghav Gururajan
2021-01-08 12:11 ` Ekaitz Zarraga
2021-01-08 12:20 ` Julien Lepiller
2021-01-08 12:16 ` Ricardo Wurmus
2021-01-08 21:21 ` Mark H Weaver
2021-01-08 22:04 ` Ricardo Wurmus
2021-01-08 22:52 ` Raghav Gururajan
2021-01-09 1:59 ` Raghav Gururajan
2021-01-12 3:32 ` Raghav Gururajan
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.