me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into staging

master
Marius Bakke 2020-05-26 22:34:46 +02:00
parent 8ab211dbdb b4f04e0eff
commit aa13c5657d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
125 changed files with 4678 additions and 1588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dir-locals.el
View File

@ -85,6 +85,7 @@
(eval . (put 'with-imported-modules 'scheme-indent-function 1)) (eval . (put 'with-imported-modules 'scheme-indent-function 1))
(eval . (put 'with-extensions 'scheme-indent-function 1)) (eval . (put 'with-extensions 'scheme-indent-function 1))
(eval . (put 'with-parameters 'scheme-indent-function 1)) (eval . (put 'with-parameters 'scheme-indent-function 1))
(eval . (put 'let-system 'scheme-indent-function 1))
(eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'with-database 'scheme-indent-function 2))
(eval . (put 'call-with-transaction 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2))

2
.gitignore vendored
View File

@ -66,6 +66,7 @@
/doc/stamp-vti /doc/stamp-vti
/doc/version.texi /doc/version.texi
/doc/version-*.texi /doc/version-*.texi
/etc/gnu-store.mount
/etc/guix-daemon.cil /etc/guix-daemon.cil
/etc/guix-daemon.conf /etc/guix-daemon.conf
/etc/guix-daemon.service /etc/guix-daemon.service
@ -149,7 +150,6 @@ stamp-h[0-9]
tmp tmp
/doc/os-config-lightweight-desktop.texi /doc/os-config-lightweight-desktop.texi
/nix/scripts/download /nix/scripts/download
/etc/indent-code.el
/.version /.version
/doc/stamp-[0-9] /doc/stamp-[0-9]
/gnu/packages/bootstrap /gnu/packages/bootstrap

1
.mailmap
View File

@ -47,6 +47,7 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
Mathieu Othacehe <m.othacehe@gmail.com> Mathieu Othacehe <m.othacehe@gmail.com>
Mathieu Othacehe <mathieu.othacehe@parrot.com> Mathieu Othacehe <mathieu.othacehe@parrot.com>
Mathieu Othacehe <othacehe@gnu.org>
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
nikita <nikita@n0.is> nikita <nikita@n0.is>
nikita <nikita@n0.is> ng0 <ng0@n0.is> nikita <nikita@n0.is> ng0 <ng0@n0.is>

9
configure.ac
View File

@ -286,15 +286,6 @@ dnl Documentation translation.
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])
dnl Emacs (optional), for 'etc/indent-code.el'.
AC_PATH_PROG([EMACS], [emacs])
if test "x$EMACS" = x; then
AC_MSG_WARN([Please install GNU Emacs to use etc/indent-code.el.])
else
AC_SUBST([EMACS])
AC_CONFIG_FILES([etc/indent-code.el], [chmod +x etc/indent-code.el])
fi
case "$storedir" in case "$storedir" in
/gnu/store) /gnu/store)
;; ;;

37
doc/build.scm
View File

@ -182,30 +182,27 @@ content=\"width=device-width, initial-scale=1\" />"))
;; Guile-Lib with a hotfix for (htmlprag). ;; Guile-Lib with a hotfix for (htmlprag).
(package (package
(inherit guile-lib) (inherit guile-lib)
(source (origin
(inherit (package-source guile-lib))
(modules '(( guix build utils)))
(snippet
'(begin
;; When parsing
;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
;; 'html->shtml' would mistakenly close 'blockquote' right
;; before <p>. This patch removes 'p' from the
;; 'parent-constraints' alist to fix that.
(substitute* "src/htmlprag.scm"
(("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
""))
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guile-lib) (substitute-keyword-arguments (package-arguments guile-lib)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'check 'skip-known-failure (add-before 'build 'fix-htmlprag
(lambda _ (lambda _
;; XXX: The above change causes one test failure among ;; When parsing
;; the htmlprag tests. ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
(setenv "XFAIL_TESTS" "htmlprag.scm") ;; 'html->shtml' would mistakenly close 'blockquote' right
#t)))))))) ;; before <p>. This patch removes 'p' from the
;; 'parent-constraints' alist to fix that.
(substitute* "src/htmlprag.scm"
(("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
""))
#t))
(add-before 'check 'skip-known-failure
(lambda _
;; XXX: The above change causes one test failure among
;; the htmlprag tests.
(setenv "XFAIL_TESTS" "htmlprag.scm")
#t))))))))
(define* (syntax-highlighted-html input (define* (syntax-highlighted-html input
#:key #:key

187
doc/guix.texi
View File

@ -228,6 +228,7 @@ Development
* Invoking guix environment:: Setting up development environments. * Invoking guix environment:: Setting up development environments.
* Invoking guix pack:: Creating software bundles. * Invoking guix pack:: Creating software bundles.
* The GCC toolchain:: Working with languages supported by GCC.
Programming Interface Programming Interface
@ -659,9 +660,10 @@ with these commands:
@c https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01199.html @c https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01199.html
@example @example
# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \ # cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \
~root/.config/guix/current/lib/systemd/system/guix-daemon.service \
/etc/systemd/system/ /etc/systemd/system/
# systemctl enable --now guix-daemon # systemctl enable --now gnu-store.mount guix-daemon
@end example @end example
If your host distro uses the Upstart init system: If your host distro uses the Upstart init system:
@ -1772,13 +1774,6 @@ want to avoid auto-loading the Emacs packages installed with Guix, you
can do so by running Emacs with the @option{--no-site-file} option can do so by running Emacs with the @option{--no-site-file} option
(@pxref{Init File,,, emacs, The GNU Emacs Manual}). (@pxref{Init File,,, emacs, The GNU Emacs Manual}).
@subsection The GCC toolchain
@c XXX: The contents of this section were moved under
@c ``Development'', since it makes more sense there and is not specific
@c foreign distros. Remove it from here eventually?
@xref{Packages for C Development}, for information on packages for C/C++
development.
@node Upgrading Guix @node Upgrading Guix
@section Upgrading Guix @section Upgrading Guix
@ -3044,6 +3039,7 @@ availability of packages:
@item --search=@var{regexp} @item --search=@var{regexp}
@itemx -s @var{regexp} @itemx -s @var{regexp}
@anchor{guix-search}
@cindex searching for packages @cindex searching for packages
List the available packages whose name, synopsis, or description matches List the available packages whose name, synopsis, or description matches
@var{regexp} (in a case-insensitive fashion), sorted by relevance. @var{regexp} (in a case-insensitive fashion), sorted by relevance.
@ -4475,6 +4471,9 @@ produce a list of channel specifications in JSON format;
produce a list of channel specifications in Recutils format. produce a list of channel specifications in Recutils format.
@end table @end table
@item --list-formats
Display available formats for @option{--format} option.
@item --profile=@var{profile} @item --profile=@var{profile}
@itemx -p @var{profile} @itemx -p @var{profile}
Display information about @var{profile}. Display information about @var{profile}.
@ -4674,9 +4673,9 @@ pack} command allows you to create @dfn{application bundles} that can be
easily distributed to users who do not run Guix. easily distributed to users who do not run Guix.
@menu @menu
* Invoking guix environment:: Setting up development environments. * Invoking guix environment:: Setting up development environments.
* Invoking guix pack:: Creating software bundles. * Invoking guix pack:: Creating software bundles.
* Packages for C Development:: Working with C code with Guix. * The GCC toolchain:: Working with languages supported by GCC.
@end menu @end menu
@node Invoking guix environment @node Invoking guix environment
@ -5387,13 +5386,15 @@ In addition, @command{guix pack} supports all the common build options
(@pxref{Common Build Options}) and all the package transformation (@pxref{Common Build Options}) and all the package transformation
options (@pxref{Package Transformation Options}). options (@pxref{Package Transformation Options}).
@node Packages for C Development
@section Packages for C Development @node The GCC toolchain
@section The GCC toolchain
@cindex GCC @cindex GCC
@cindex ld-wrapper @cindex ld-wrapper
@cindex linker wrapper @cindex linker wrapper
@cindex toolchain, for C development @cindex toolchain, for C development
@cindex toolchain, for Fortran development
If you need a complete toolchain for compiling and linking C or C++ If you need a complete toolchain for compiling and linking C or C++
source code, use the @code{gcc-toolchain} package. This package source code, use the @code{gcc-toolchain} package. This package
@ -5407,7 +5408,9 @@ invoke the actual linker with this new set of arguments. You can instruct the
wrapper to refuse to link against libraries not in the store by setting the wrapper to refuse to link against libraries not in the store by setting the
@env{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}. @env{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}.
The package @code{gfortran-toolchain} provides a complete GCC toolchain
for Fortran development. For other languages, please use
@samp{guix search gcc toolchain} (@pxref{guix-search,, Invoking guix package}).
@c ********************************************************************* @c *********************************************************************
@node Programming Interface @node Programming Interface
@ -6808,8 +6811,9 @@ following phases changed to some specific for Meson:
@item configure @item configure
The phase runs @code{meson} with the flags specified in The phase runs @code{meson} with the flags specified in
@code{#:configure-flags}. The flag @option{--build-type} is always set to @code{#:configure-flags}. The flag @option{--buildtype} is always set to
@code{plain} unless something else is specified in @code{#:build-type}. @code{debugoptimized} unless something else is specified in
@code{#:build-type}.
@item build @item build
The phase runs @code{ninja} to build the package in parallel by default, but The phase runs @code{ninja} to build the package in parallel by default, but
@ -8123,6 +8127,32 @@ the second case, the resulting script contains a @code{(string-append
@dots{})} expression to construct the file name @emph{at run time}. @dots{})} expression to construct the file name @emph{at run time}.
@end deffn @end deffn
@deffn {Scheme Syntax} let-system @var{system} @var{body}@dots{}
@deffnx {Scheme Syntax} let-system (@var{system} @var{target}) @var{body}@dots{}
Bind @var{system} to the currently targeted system---e.g.,
@code{"x86_64-linux"}---within @var{body}.
In the second case, additionally bind @var{target} to the current
cross-compilation target---a GNU triplet such as
@code{"arm-linux-gnueabihf"}---or @code{#f} if we are not
cross-compiling.
@code{let-system} is useful in the occasional case where the object
spliced into the gexp depends on the target system, as in this example:
@example
#~(system*
#+(let-system system
(cond ((string-prefix? "armhf-" system)
(file-append qemu "/bin/qemu-system-arm"))
((string-prefix? "x86_64-" system)
(file-append qemu "/bin/qemu-system-x86_64"))
(else
(error "dunno!"))))
"-net" "user" #$image)
@end example
@end deffn
@deffn {Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp} @deffn {Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp}
This macro is similar to the @code{parameterize} form for This macro is similar to the @code{parameterize} form for
dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU
@ -11664,10 +11694,14 @@ update time on the in-memory version of the file inode), and
Manual}, for more information on these flags. Manual}, for more information on these flags.
@item @code{options} (default: @code{#f}) @item @code{options} (default: @code{#f})
This is either @code{#f}, or a string denoting mount options passed to the This is either @code{#f}, or a string denoting mount options passed to
file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C Library the file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C
Reference Manual}, for details and run @command{man 8 mount} for options for Library Reference Manual}, for details and run @command{man 8 mount} for
various file systems. options for various file systems. Note that the
@code{file-system-options->alist} and @code{alist->file-system-options}
procedures from @code{(gnu system file-systems)} can be used to convert
file system options given as an association list to the string
representation, and vice-versa.
@item @code{mount?} (default: @code{#t}) @item @code{mount?} (default: @code{#t})
This value indicates whether to automatically mount the file system when This value indicates whether to automatically mount the file system when
@ -11748,6 +11782,110 @@ and unmount user-space FUSE file systems. This requires the
@code{fuse.ko} kernel module to be loaded. @code{fuse.ko} kernel module to be loaded.
@end defvr @end defvr
@node Btrfs file system
@subsection Btrfs file system
The Btrfs has special features, such as subvolumes, that merit being
explained in more details. The following section attempts to cover
basic as well as complex uses of a Btrfs file system with the Guix
System.
In its simplest usage, a Btrfs file system can be described, for
example, by:
@lisp
(file-system
(mount-point "/home")
(type "btrfs")
(device (file-system-label "my-home")))
@end lisp
The example below is more complex, as it makes use of a Btrfs
subvolume, named @code{rootfs}. The parent Btrfs file system is labeled
@code{my-btrfs-pool}, and is located on an encrypted device (hence the
dependency on @code{mapped-devices}):
@lisp
(file-system
(device (file-system-label "my-btrfs-pool"))
(mount-point "/")
(type "btrfs")
(options "subvol=rootfs")
(dependencies mapped-devices))
@end lisp
Some bootloaders, for example GRUB, only mount a Btrfs partition at its
top level during the early boot, and rely on their configuration to
refer to the correct subvolume path within that top level. The
bootloaders operating in this way typically produce their configuration
on a running system where the Btrfs partitions are already mounted and
where the subvolume information is readily available. As an example,
@command{grub-mkconfig}, the configuration generator command shipped
with GRUB, reads @file{/proc/self/mountinfo} to determine the top-level
path of a subvolume.
The Guix System produces a bootloader configuration using the operating
system configuration as its sole input; it is therefore necessary to
extract the subvolume name on which @file{/gnu/store} lives (if any)
from that operating system configuration. To better illustrate,
consider a subvolume named 'rootfs' which contains the root file system
data. In such situation, the GRUB bootloader would only see the top
level of the root Btrfs partition, e.g.:
@example
/ (top level)
├── rootfs (subvolume directory)
├── gnu (normal directory)
├── store (normal directory)
[...]
@end example
Thus, the subvolume name must be prepended to the @file{/gnu/store} path
of the kernel, initrd binaries and any other files referred to in the
GRUB configuration that must be found during the early boot.
The next example shows a nested hierarchy of subvolumes and
directories:
@example
/ (top level)
├── rootfs (subvolume)
├── gnu (normal directory)
├── store (subvolume)
[...]
@end example
This scenario would work without mounting the 'store' subvolume.
Mounting 'rootfs' is sufficient, since the subvolume name matches its
intended mount point in the file system hierarchy. Alternatively, the
'store' subvolume could be referred to by setting the @code{subvol}
option to either @code{/rootfs/gnu/store} or @code{rootfs/gnu/store}.
Finally, a more contrived example of nested subvolumes:
@example
/ (top level)
├── root-snapshots (subvolume)
├── root-current (subvolume)
├── guix-store (subvolume)
[...]
@end example
Here, the 'guix-store' subvolume doesn't match its intended mount point,
so it is necessary to mount it. The subvolume must be fully specified,
by passing its file name to the @code{subvol} option. To illustrate,
the 'guix-store' subvolume could be mounted on @file{/gnu/store} by using
a file system declaration such as:
@lisp
(file-system
(device (file-system-label "btrfs-pool-1"))
(mount-point "/gnu/store")
(type "btrfs")
(options "subvol=root-snapshots/root-current/guix-store,\
compress-force=zstd,space_cache=v2"))
@end lisp
@node Mapped Devices @node Mapped Devices
@section Mapped Devices @section Mapped Devices
@ -26504,9 +26642,10 @@ service activation programs and then spawns the GNU@tie{}Shepherd, the
initialization system. initialization system.
@item --root=@var{root} @item --root=@var{root}
Mount @var{root} as the root file system. @var{root} can be a Mount @var{root} as the root file system. @var{root} can be a device
device name like @code{/dev/sda1}, a file system label, or a file system name like @code{/dev/sda1}, a file system label, or a file system UUID.
UUID. When unspecified, the device name from the root file system of the
operating system declaration is used.
@item --system=@var{system} @item --system=@var{system}
Have @file{/run/booted-system} and @file{/run/current-system} point to Have @file{/run/booted-system} and @file{/run/current-system} point to

14
etc/gnu-store.mount.in 100644
View File

@ -0,0 +1,14 @@
[Unit]
Description=Read-only @storedir@ for GNU Guix
DefaultDependencies=no
ConditionPathExists=@storedir@
Before=guix-daemon.service
[Install]
WantedBy=guix-daemon.service
[Mount]
What=@storedir@
Where=@storedir@
Type=none
Options=bind,ro

17
etc/guix-install.sh
View File

@ -3,7 +3,7 @@
# Copyright © 2017 sharlatan <sharlatanus@gmail.com> # Copyright © 2017 sharlatan <sharlatanus@gmail.com>
# Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
# Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
# Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
# #
@ -342,7 +342,16 @@ sys_enable_guix_daemon()
_msg "${PAS}enabled Guix daemon via upstart" _msg "${PAS}enabled Guix daemon via upstart"
;; ;;
systemd) systemd)
{ cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ { # systemd .mount units must be named after the target directory.
# Here we assume a hard-coded name of /gnu/store.
# XXX Work around <https://issues.guix.gnu.org/41356> until next release.
if [ -f "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" ]; then
cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \
/etc/systemd/system/;
chmod 664 /etc/systemd/system/gnu-store.mount;
fi
cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \
/etc/systemd/system/; /etc/systemd/system/;
chmod 664 /etc/systemd/system/guix-daemon.service; chmod 664 /etc/systemd/system/guix-daemon.service;
@ -357,8 +366,8 @@ sys_enable_guix_daemon()
fi; fi;
systemctl daemon-reload && systemctl daemon-reload &&
systemctl start guix-daemon && systemctl start gnu-store.mount guix-daemon &&
systemctl enable guix-daemon; } && systemctl enable gnu-store.mount guix-daemon; } &&
_msg "${PAS}enabled Guix daemon via systemd" _msg "${PAS}enabled Guix daemon via systemd"
;; ;;
sysv-init) sysv-init)

52
etc/indent-code.el.in → etc/indent-code.el
View File

@ -1,8 +1,9 @@
#!@EMACS@ --script :;exec emacs --batch --quick --load="$0" --funcall=main "$@"
;;; indent-code.el --- Run Emacs to indent a package definition. ;;; indent-code.el --- Run Emacs to indent a package definition.
;; Copyright © 2017 Alex Kost <alezost@gmail.com> ;; Copyright © 2017 Alex Kost <alezost@gmail.com>
;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;; This file is part of GNU Guix. ;; This file is part of GNU Guix.
@ -86,29 +87,30 @@
(with-syntax 1)) (with-syntax 1))
(pcase command-line-args-left (defun main ()
(`(,file-name ,package-name) (pcase command-line-args-left
;; Indent the definition of PACKAGE-NAME in FILE-NAME. (`(,file-name ,package-name)
(find-file file-name) ;; Indent the definition of PACKAGE-NAME in FILE-NAME.
(goto-char (point-min)) (find-file file-name)
(if (re-search-forward (concat "^(define\\(-public\\) +" (goto-char (point-min))
package-name) (if (re-search-forward (concat "^(define\\(-public\\) +"
nil t) package-name)
(let ((indent-tabs-mode nil)) nil t)
(beginning-of-defun) (let ((indent-tabs-mode nil))
(indent-sexp) (beginning-of-defun)
(save-buffer) (indent-sexp)
(message "Done!")) (save-buffer)
(error "Package '%s' not found in '%s'" (message "Done!"))
package-name file-name))) (error "Package '%s' not found in '%s'"
(`(,file-name) package-name file-name)))
;; Indent all of FILE-NAME. (`(,file-name)
(find-file file-name) ;; Indent all of FILE-NAME.
(let ((indent-tabs-mode nil)) (find-file file-name)
(indent-region (point-min) (point-max)) (let ((indent-tabs-mode nil))
(save-buffer) (indent-region (point-min) (point-max))
(message "Done!"))) (save-buffer)
(x (message "Done!")))
(error "Usage: indent-code.el FILE [PACKAGE]"))) (x
(error "Usage: indent-code.el FILE [PACKAGE]"))))
;;; indent-code.el ends here ;;; indent-code.el ends here

57
etc/news.scm
View File

@ -1,8 +1,10 @@
;; GNU Guix news, for use by 'guix pull'. ;; GNU Guix news, for use by 'guix pull'.
;; ;;
;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;; ;;
;; Copying and distribution of this file, with or without modification, are ;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and ;; permitted in any medium without royalty provided the copyright notice and
@ -11,9 +13,39 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b")
(title (en "Add support to boot from a Btrfs subvolume")
(de "Unterstützung für Systemstart von einem
Btrfs-Unterlaufwerk hinzugefügt")
(fr "Ajout du support pour démarrer depuis un sous-volume Btrfs")
(nl "Nieuwe ondersteuning voor het opstarten vanaf een Btrfs-subvolume"))
(body
(en "The generation of the GRUB configuration file produced from an
operating system declaration now takes into account the use of a Btrfs
subvolume for the partition holding @file{/gnu/store}. Run the command
@command{info \"(guix) Btrfs file system\"} for more information and
examples.")
(de "Für die Erzeugung einer GRUB-Konfigurationsdatei aus einer
Betriebssystemdeklaration kann jetzt ein Btrfs-Unterlaufwerk („Subvolume“) für
die Partition mit @file{/gnu/store} angegeben werden. Führen Sie
@command{info \"(guix) Btrfs file system\"} aus, wenn Sie mehr Informationen
und Beispiele sehen möchten.")
(fr "La génération du fichier de configuration de GRUB produite à
partir de la déclaration d'un @code{operating-system} tient maintenant compte
de l'utilisation d'un sous-volume Btrfs pour la partition contenant
@file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file
system\"} pour des exemples et plus d'information.")
(nl "Het opmaken van het GRUB-configuratiebestand op basis van
een @code{operating-system}-declaratie houdt nu rekening met het gebruik van
een Btrfs-subvolume voor de partitie die @file{/gnu/store} bevat. Voer
@command{info \"(guix) Btrfs file system\"} uit voor meer informatie en
voorbeelden.")))
(entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e")
(title (en "@command{guix pack -RR} introduces a new execution (title (en "@command{guix pack -RR} introduces a new execution
engine")) engine")
(de "@command{guix pack -RR} führt neuen Ausführungstreiber
ein"))
(body (body
(en "The @command{guix pack -RR} command allows you to create a (en "The @command{guix pack -RR} command allows you to create a
tarball containing @dfn{relocatable binaries}. Until now, those would rely tarball containing @dfn{relocatable binaries}. Until now, those would rely
@ -31,7 +63,28 @@ GUIX_EXECUTION_ENGINE=performance
export GUIX_EXECUTION_ENGINE export GUIX_EXECUTION_ENGINE
@end example @end example
Run @command{info \"(guix) Invoking guix pack\"} for more information."))) Run @command{info \"(guix) Invoking guix pack\"} for more information.")
(de "Mit dem Befehl @command{guix pack -RR} können Sie einen Tarball
mit @dfn{verschieblichen Binärdateien} erzeugen (englisch „Relocatable
Binaries“). Bisher wurden diese entweder in „unprivilegierten
Benutzernamensräumen“ ohne Berechtigungen ausgeführt, oder in PRoot, wenn
keine unprivilegierten Benutzernamensräume unterstützt wurden. Allerdings
fällt bei der Ausführung mit PRoot bei manchen Anwendungen deutlich mehr
Rechenaufwand an.
Um dem entgegenzuwirken, stellt @command{guix pack -RR} nun eine dritte Option
zur Verfügung, die sich eine Erweiterung des GNU-Laufzeit-Binders („Run-Time
Linker“, ld.so) und Fakechroot zu Nutze macht. Dadurch entsteht fast kein
Mehraufwand. Sie können sich die schnellste Option aussuchen, wenn Sie eine
verschiebliche Binärdatei ausführen, zum Beispiel so:
@example
GUIX_EXECUTION_ENGINE=performance
export GUIX_EXECUTION_ENGINE
@end example
Führen Sie @command{info \"(guix.de) Aufruf von guix pack\"} aus, wenn Sie
mehr wissen wollen.")))
(entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f") (entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f")
(title (en "New @option{--path} option for @command{guix graph}") (title (en "New @option{--path} option for @command{guix graph}")

3
gnu/bootloader/depthcharge.scm
View File

@ -82,7 +82,8 @@
(define* (depthcharge-configuration-file config entries (define* (depthcharge-configuration-file config entries
#:key #:key
(system (%current-system)) (system (%current-system))
(old-entries '())) (old-entries '())
#:allow-other-keys)
(match entries (match entries
((entry) ((entry)
(let ((kernel (menu-entry-linux entry)) (let ((kernel (menu-entry-linux entry))

3
gnu/bootloader/extlinux.scm
View File

@ -28,7 +28,8 @@
(define* (extlinux-configuration-file config entries (define* (extlinux-configuration-file config entries
#:key #:key
(system (%current-system)) (system (%current-system))
(old-entries '())) (old-entries '())
#:allow-other-keys)
"Return the U-Boot configuration file corresponding to CONFIG, a "Return the U-Boot configuration file corresponding to CONFIG, a
<u-boot-configuration> object, and where the store is available at STORE-FS, a <u-boot-configuration> object, and where the store is available at STORE-FS, a
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries <file-system> object. OLD-ENTRIES is taken to be a list of menu entries

216
gnu/bootloader/grub.scm
View File

@ -37,19 +37,13 @@
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-2) #:use-module (srfi srfi-2)
#:export (grub-image #:export (grub-theme
grub-image?
grub-image-aspect-ratio
grub-image-file
grub-theme
grub-theme? grub-theme?
grub-theme-images grub-theme-image
grub-theme-resolution
grub-theme-color-normal grub-theme-color-normal
grub-theme-color-highlight grub-theme-color-highlight
grub-theme-gfxmode
%background-image
%default-theme
grub-bootloader grub-bootloader
grub-efi-bootloader grub-efi-bootloader
@ -64,96 +58,95 @@
;;; ;;;
;;; Code: ;;; Code:
(define (strip-mount-point mount-point file) (define* (normalize-file file mount-point btrfs-subvolume-file-name)
"Strip MOUNT-POINT from FILE, which is a gexp or other lowerable object "Strip MOUNT-POINT and prepend BTRFS-SUBVOLUME-FILE-NAME to FILE, a
denoting a file name." G-expression or other lowerable object denoting a file name."
(match mount-point
((? string? mount-point) (define (strip-mount-point mount-point file)
(if (string=? mount-point "/") (if mount-point
file (if (string=? mount-point "/")
#~(let ((file #$file)) file
(if (string-prefix? #$mount-point file) #~(let ((file #$file))
(substring #$file #$(string-length mount-point)) (if (string-prefix? #$mount-point file)
file)))) (substring #$file #$(string-length mount-point))
(#f file))) file)))
file))
(define (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name file)
(if btrfs-subvolume-file-name
#~(string-append #$btrfs-subvolume-file-name #$file)
file))
(prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name
(strip-mount-point mount-point file)))
(define-record-type* <grub-image>
grub-image make-grub-image
grub-image?
(aspect-ratio grub-image-aspect-ratio ;rational number
(default 4/3))
(file grub-image-file)) ;file-valued gexp (SVG)
(define-record-type* <grub-theme> (define-record-type* <grub-theme>
;; Default theme contributed by Felipe López.
grub-theme make-grub-theme grub-theme make-grub-theme
grub-theme? grub-theme?
(images grub-theme-images (image grub-theme-image
(default '())) ;list of <grub-image> (default (file-append %artwork-repository
"/grub/GuixSD-fully-black-4-3.svg")))
(resolution grub-theme-resolution
(default '(1024 . 768)))
(color-normal grub-theme-color-normal (color-normal grub-theme-color-normal
(default '((fg . cyan) (bg . blue)))) (default '((fg . light-gray) (bg . black))))
(color-highlight grub-theme-color-highlight (color-highlight grub-theme-color-highlight
(default '((fg . white) (bg . blue)))) (default '((fg . yellow) (bg . black))))
(gfxmode grub-gfxmode (gfxmode grub-theme-gfxmode
(default '("auto")))) ;list of string (default '("auto")))) ;list of string
(define %background-image
(grub-image
(aspect-ratio 4/3)
(file (file-append %artwork-repository
"/grub/GuixSD-fully-black-4-3.svg"))))
(define %default-theme
;; Default theme contributed by Felipe López.
(grub-theme
(images (list %background-image))
(color-highlight '((fg . yellow) (bg . black)))
(color-normal '((fg . light-gray) (bg . black))))) ;XXX: #x303030
;;; ;;;
;;; Background image & themes. ;;; Background image & themes.
;;; ;;;
(define (bootloader-theme config) (define (bootloader-theme config)
"Return user defined theme in CONFIG if defined or %default-theme "Return user defined theme in CONFIG if defined or a default theme
otherwise." otherwise."
(or (bootloader-configuration-theme config) %default-theme)) (or (bootloader-configuration-theme config) (grub-theme)))
(define* (svg->png svg #:key width height) (define* (image->png image #:key width height)
"Build a PNG of HEIGHT x WIDTH from SVG." "Build a PNG of HEIGHT x WIDTH from IMAGE if its file suffix is \".svg\".
Otherwise the picture in IMAGE is just copied."
(computed-file "grub-image.png" (computed-file "grub-image.png"
(with-imported-modules '((gnu build svg)) (with-imported-modules '((gnu build svg))
(with-extensions (list guile-rsvg guile-cairo) (with-extensions (list guile-rsvg guile-cairo)
#~(begin #~(if (string-suffix? ".svg" #+image)
(use-modules (gnu build svg)) (begin
(svg->png #+svg #$output (use-modules (gnu build svg))
#:width #$width (svg->png #+image #$output
#:height #$height)))))) #:width #$width
#:height #$height))
(copy-file #+image #$output))))))
(define* (grub-background-image config #:key (width 1024) (height 768)) (define* (grub-background-image config)
"Return the GRUB background image defined in CONFIG with a ratio of "Return the GRUB background image defined in CONFIG or #f if none was found.
WIDTH/HEIGHT, or #f if none was found." If the suffix of the image file is \".svg\", then it is converted into a PNG
(let* ((ratio (/ width height)) file with the resolution provided in CONFIG."
(image (find (lambda (image) (let* ((theme (bootloader-theme config))
(= (grub-image-aspect-ratio image) ratio)) (image (grub-theme-image theme)))
(grub-theme-images
(bootloader-theme config)))))
(and image (and image
(svg->png (grub-image-file image) (match (grub-theme-resolution theme)
#:width width #:height height)))) (((? number? width) . (? number? height))
(image->png image #:width width #:height height))
(_ #f)))))
(define* (eye-candy config store-device store-mount-point (define* (eye-candy config store-device store-mount-point
#:key system port) #:key btrfs-store-subvolume-file-name system port)
"Return a gexp that writes to PORT (a port-valued gexp) the "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part
'grub.cfg' part concerned with graphics mode, background images, colors, and concerned with graphics mode, background images, colors, and all that.
all that. STORE-DEVICE designates the device holding the store, and STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is
STORE-MOUNT-POINT is its mount point; these are used to determine where the its mount point; these are used to determine where the background image and
background image and fonts must be searched for. SYSTEM must be the target fonts must be searched for. SYSTEM must be the target system string---e.g.,
system string---e.g., \"x86_64-linux\"." \"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of the
Btrfs subvolume, to be prepended to any store path, if any."
(define setup-gfxterm-body (define setup-gfxterm-body
(let ((gfxmode (let ((gfxmode
(or (and-let* ((theme (bootloader-configuration-theme config)) (or (and-let* ((theme (bootloader-configuration-theme config))
(gfxmode (grub-gfxmode theme))) (gfxmode (grub-theme-gfxmode theme)))
(string-join gfxmode ";")) (string-join gfxmode ";"))
"auto"))) "auto")))
@ -176,7 +169,7 @@ system string---e.g., \"x86_64-linux\"."
(if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config))
#~(format #f "if loadfont ~a; then #~(format #f "if loadfont ~a; then
setup_gfxterm setup_gfxterm
fi~%" #$font-file) fi~%" #+font-file)
"")) ""))
(define (theme-colors type) (define (theme-colors type)
@ -186,11 +179,14 @@ fi~%" #$font-file)
(symbol->string (assoc-ref colors 'bg))))) (symbol->string (assoc-ref colors 'bg)))))
(define font-file (define font-file
(strip-mount-point store-mount-point (normalize-file (file-append grub "/share/grub/unicode.pf2")
(file-append grub "/share/grub/unicode.pf2"))) store-mount-point
btrfs-store-subvolume-file-name))
(define image (define image
(grub-background-image config)) (normalize-file (grub-background-image config)
store-mount-point
btrfs-store-subvolume-file-name))
(and image (and image
#~(format #$port " #~(format #$port "
@ -215,7 +211,7 @@ fi~%"
#$(setup-gfxterm config font-file) #$(setup-gfxterm config font-file)
#$(grub-setup-io config) #$(grub-setup-io config)
#$(strip-mount-point store-mount-point image) #$image
#$(theme-colors grub-theme-color-normal) #$(theme-colors grub-theme-color-normal)
#$(theme-colors grub-theme-color-highlight)))) #$(theme-colors grub-theme-color-highlight))))
@ -237,7 +233,7 @@ the 'share/X11/xkb/symbols/' directory of 'xkeyboard-config'."
;; 'grub-kbdcomp' passes all its arguments but '-o' to 'ckbcomp' ;; 'grub-kbdcomp' passes all its arguments but '-o' to 'ckbcomp'
;; (from the 'console-setup' package). ;; (from the 'console-setup' package).
(invoke #$(file-append grub "/bin/grub-mklayout") (invoke #+(file-append grub "/bin/grub-mklayout")
"-i" #+(keyboard-layout->console-keymap layout) "-i" #+(keyboard-layout->console-keymap layout)
"-o" #$output)))) "-o" #$output))))
@ -323,52 +319,66 @@ code."
(define* (grub-configuration-file config entries (define* (grub-configuration-file config entries
#:key #:key
(system (%current-system)) (system (%current-system))
(old-entries '())) (old-entries '())
btrfs-subvolume-file-name)
"Return the GRUB configuration file corresponding to CONFIG, a "Return the GRUB configuration file corresponding to CONFIG, a
<bootloader-configuration> object, and where the store is available at <bootloader-configuration> object, and where the store is available at
STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list
entries corresponding to old generations of the system." of menu entries corresponding to old generations of the system.
BTRFS-SUBVOLUME-FILE-NAME may be used to specify on which subvolume a
Btrfs root file system resides."
(define all-entries (define all-entries
(append entries (bootloader-configuration-menu-entries config))) (append entries (bootloader-configuration-menu-entries config)))
(define (menu-entry->gexp entry) (define (menu-entry->gexp entry)
(let ((device (menu-entry-device entry)) (let* ((device (menu-entry-device entry))
(device-mount-point (menu-entry-device-mount-point entry)) (device-mount-point (menu-entry-device-mount-point entry))
(label (menu-entry-label entry)) (label (menu-entry-label entry))
(kernel (menu-entry-linux entry)) (arguments (menu-entry-linux-arguments entry))
(arguments (menu-entry-linux-arguments entry)) (kernel (normalize-file (menu-entry-linux entry)
(initrd (menu-entry-initrd entry))) device-mount-point
btrfs-subvolume-file-name))
(initrd (normalize-file (menu-entry-initrd entry)
device-mount-point
btrfs-subvolume-file-name)))
;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point.
;; Use the right file names for KERNEL and INITRD in case ;; Use the right file names for KERNEL and INITRD in case
;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a
;; separate partition. ;; separate partition.
(let ((kernel (strip-mount-point device-mount-point kernel))
(initrd (strip-mount-point device-mount-point initrd))) ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the kernel and
#~(format port "menuentry ~s { ;; initrd paths, to allow booting from a Btrfs subvolume.
#~(format port "menuentry ~s {
~a ~a
linux ~a ~a linux ~a ~a
initrd ~a initrd ~a
}~%" }~%"
#$label #$label
#$(grub-root-search device kernel) #$(grub-root-search device kernel)
#$kernel (string-join (list #$@arguments)) #$kernel (string-join (list #$@arguments))
#$initrd)))) #$initrd)))
(define sugar (define sugar
(eye-candy config (eye-candy config
(menu-entry-device (first all-entries)) (menu-entry-device (first all-entries))
(menu-entry-device-mount-point (first all-entries)) (menu-entry-device-mount-point (first all-entries))
#:btrfs-store-subvolume-file-name btrfs-subvolume-file-name
#:system system #:system system
#:port #~port)) #:port #~port))
(define keyboard-layout-config (define keyboard-layout-config
(let ((layout (bootloader-configuration-keyboard-layout config)) (let* ((layout (bootloader-configuration-keyboard-layout config))
(grub (bootloader-package (grub (bootloader-package
(bootloader-configuration-bootloader config)))) (bootloader-configuration-bootloader config)))
#~(let ((keymap #$(and layout (keymap* (and layout
(keyboard-layout-file layout #:grub grub)))) (keyboard-layout-file layout #:grub grub)))
(when keymap (keymap (and keymap*
(format port "\ (if btrfs-subvolume-file-name
#~(string-append #$btrfs-subvolume-file-name
#$keymap*)
keymap*))))
#~(when #$keymap
(format port "\
insmod keylayouts insmod keylayouts
keymap ~a~%" keymap))))) keymap ~a~%" #$keymap))))
(define builder (define builder
#~(call-with-output-file #$output #~(call-with-output-file #$output

6
gnu/build/file-systems.scm
View File

@ -661,8 +661,10 @@ were found."
(match spec (match spec
((? string?) ((? string?)
;; Nothing to do, but wait until SPEC shows up. (if (string-contains spec ":/")
(resolve identity spec identity)) spec ; do not resolve NFS devices
;; Nothing to do, but wait until SPEC shows up.
(resolve identity spec identity)))
((? file-system-label?) ((? file-system-label?)
;; Resolve the label. ;; Resolve the label.
(resolve find-partition-by-label (resolve find-partition-by-label

63
gnu/build/linux-boot.scm
View File

@ -498,25 +498,13 @@ upon error."
(define (root-mount-point? fs) (define (root-mount-point? fs)
(string=? (file-system-mount-point fs) "/")) (string=? (file-system-mount-point fs) "/"))
(define root-fs-type (define (device-string->file-system-device device-string)
(or (any (lambda (fs) ;; The "--root=SPEC" kernel command-line option always provides a
(and (root-mount-point? fs) ;; string, but the string can represent a device, a UUID, or a
(file-system-type fs))) ;; label. So check for all three.
mounts) (cond ((string-prefix? "/" device-string) device-string)
"ext4")) ((uuid device-string) => identity)
(else (file-system-label device-string))))
(define root-fs-flags
(mount-flags->bit-mask (or (any (lambda (fs)
(and (root-mount-point? fs)
(file-system-flags fs)))
mounts)
'())))
(define root-fs-options
(any (lambda (fs)
(and (root-mount-point? fs)
(file-system-options fs)))
mounts))
(display "Welcome, this is GNU's early boot Guile.\n") (display "Welcome, this is GNU's early boot Guile.\n")
(display "Use '--repl' for an initrd REPL.\n\n") (display "Use '--repl' for an initrd REPL.\n\n")
@ -526,7 +514,21 @@ upon error."
(mount-essential-file-systems) (mount-essential-file-systems)
(let* ((args (linux-command-line)) (let* ((args (linux-command-line))
(to-load (find-long-option "--load" args)) (to-load (find-long-option "--load" args))
(root (find-long-option "--root" args))) (root-fs (find root-mount-point? mounts))
(root-fs-type (or (and=> root-fs file-system-type)
"ext4"))
(root-fs-device (and=> root-fs file-system-device))
(root-fs-flags (mount-flags->bit-mask
(or (and=> root-fs file-system-flags)
'())))
(root-options (if root-fs
(file-system-options root-fs)
#f))
;; --root takes precedence over the 'device' field of the root
;; <file-system> record.
(root-device (or (and=> (find-long-option "--root" args)
device-string->file-system-device)
root-fs-device)))
(when (member "--repl" args) (when (member "--repl" args)
(start-repl)) (start-repl))
@ -561,21 +563,12 @@ upon error."
(setenv "EXT2FS_NO_MTAB_OK" "1") (setenv "EXT2FS_NO_MTAB_OK" "1")
(if root (if root-device
;; The "--root=SPEC" kernel command-line option always provides a (mount-root-file-system (canonicalize-device-spec root-device)
;; string, but the string can represent a device, a UUID, or a root-fs-type
;; label. So check for all three. #:volatile-root? volatile-root?
(let ((device-spec (cond ((string-prefix? "/" root) root) #:flags root-fs-flags
((uuid root) => identity) #:options root-options)
((string-contains root ":/") #f) ; nfs
(else (file-system-label root)))))
(mount-root-file-system (if device-spec
(canonicalize-device-spec device-spec)
root)
root-fs-type
#:volatile-root? volatile-root?
#:flags root-fs-flags
#:options root-fs-options))
(mount "none" "/root" "tmpfs")) (mount "none" "/root" "tmpfs"))
;; Mount the specified file systems. ;; Mount the specified file systems.

8
gnu/local.mk
View File

@ -394,6 +394,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/nvi.scm \ %D%/packages/nvi.scm \
%D%/packages/ocaml.scm \ %D%/packages/ocaml.scm \
%D%/packages/ocr.scm \ %D%/packages/ocr.scm \
%D%/packages/openkinect.scm \
%D%/packages/onc-rpc.scm \ %D%/packages/onc-rpc.scm \
%D%/packages/opencl.scm \ %D%/packages/opencl.scm \
%D%/packages/openbox.scm \ %D%/packages/openbox.scm \
@ -403,6 +404,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/orpheus.scm \ %D%/packages/orpheus.scm \
%D%/packages/ots.scm \ %D%/packages/ots.scm \
%D%/packages/package-management.scm \ %D%/packages/package-management.scm \
%D%/packages/pantheon.scm \
%D%/packages/parallel.scm \ %D%/packages/parallel.scm \
%D%/packages/password-utils.scm \ %D%/packages/password-utils.scm \
%D%/packages/patchutils.scm \ %D%/packages/patchutils.scm \
@ -1079,6 +1081,7 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \
%D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-cross.patch \
%D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \
@ -1135,8 +1138,6 @@ dist_patch_DATA = \
%D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \
%D%/packages/patches/kmplayer-aarch64.patch \ %D%/packages/patches/kmplayer-aarch64.patch \
%D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \ %D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \
%D%/packages/patches/kpmcore-fix-tests.patch \
%D%/packages/patches/kpmcore-remove-broken-test.patch \
%D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
%D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
@ -1274,6 +1275,7 @@ dist_patch_DATA = \
%D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/multipath-tools-sans-systemd.patch \
%D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mumps-shared-libseq.patch \ %D%/packages/patches/mumps-shared-libseq.patch \
%D%/packages/patches/mumps-shared-mumps.patch \ %D%/packages/patches/mumps-shared-mumps.patch \
@ -1432,6 +1434,7 @@ dist_patch_DATA = \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
%D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \
%D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python-slugify-depend-on-unidecode.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \
@ -1495,7 +1498,6 @@ dist_patch_DATA = \
%D%/packages/patches/slim-display.patch \ %D%/packages/patches/slim-display.patch \
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \
%D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \

37
gnu/packages/admin.scm
View File

@ -1229,7 +1229,7 @@ at once based on a Perl regular expression.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location `(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location
"--localstatedir=/var") "--localstatedir=/var")
;; Install example config files in OUT/etc. ;; Install example config files in OUT/etc.
@ -1243,6 +1243,20 @@ at once based on a Perl regular expression.")
(substitute* "rc/rc" (substitute* "rc/rc"
(("/usr/sbin/sendmail") "sendmail")) (("/usr/sbin/sendmail") "sendmail"))
#t)) #t))
(add-after 'unpack 'fix-configure
(lambda* (#:key inputs native-inputs #:allow-other-keys)
;; Replace outdated config.sub and config.guess:
(for-each (lambda (file)
(install-file
(string-append
(assoc-ref
(or native-inputs inputs) "automake")
"/share/automake-"
,(version-major+minor
(package-version automake))
"/" file) "."))
'("config.sub" "config.guess"))
#t))
(add-after 'build 'set-packdir (add-after 'build 'set-packdir
(lambda _ (lambda _
;; Set a default location for archived logs. ;; Set a default location for archived logs.
@ -1263,6 +1277,7 @@ at once based on a Perl regular expression.")
(lambda _ (lambda _
(invoke "make" "install-info")))))) (invoke "make" "install-info"))))))
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("automake" ,automake)
("util-linux" ,util-linux))) ; for 'cal' ("util-linux" ,util-linux))) ; for 'cal'
(home-page "https://www.gnu.org/software/rottlog/") (home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management") (synopsis "Log rotation and management")
@ -1676,7 +1691,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica (define-public acpica
(package (package
(name "acpica") (name "acpica")
(version "20200326") (version "20200430")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1684,7 +1699,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by")))) "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("flex" ,flex) (native-inputs `(("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
@ -1696,14 +1711,16 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
#:tests? #f ; no 'check' target #:tests? #f ; no 'check' target
#:phases (modify-phases %standard-phases (delete 'configure)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "https://acpica.org/") (home-page "https://acpica.org/")
(synopsis "Tools for the development and debug of ACPI tables") (synopsis "Tools for the development and debugging of ACPI tables")
(description (description
"The ACPI Component Architecture (@dfn{ACPICA}) project provides an "The @acronym{ACPICA, ACPI Component Architecture} project provides an
OS-independent reference implementation of the Advanced Configuration and OS-independent reference implementation of the @acronym{ACPI, Advanced
Power Interface Specification (@dfn{ACPI}). ACPICA code contains those portions Configuration and Power Interface} specification. ACPICA code contains those
of ACPI meant to be directly integrated into the host OS as a kernel-resident portions of ACPI meant to be directly integrated into the host OS as a
subsystem, and a small set of tools to assist in developing and debugging ACPI kernel-resident subsystem, and a small set of tools to assist in developing and
tables. This package contains only the user-space tools needed for ACPI table debugging ACPI tables.
This package contains only the user-space tools needed for ACPI table
development, not the kernel implementation of ACPI.") development, not the kernel implementation of ACPI.")
(license license:gpl2))) ; dual GPLv2/ACPICA Licence (license license:gpl2))) ; dual GPLv2/ACPICA Licence

9
gnu/packages/antivirus.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,14 +44,14 @@
(define-public clamav (define-public clamav
(package (package
(name "clamav") (name "clamav")
(version "0.102.2") (version "0.102.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/" (uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz")) "clamav-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49")) "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -59,7 +59,8 @@
'("win32" ; unnecessary '("win32" ; unnecessary
"libclamav/c++/llvm" ; use system llvm "libclamav/c++/llvm" ; use system llvm
"libclamav/tomsfastmath" ; use system tomsfastmath "libclamav/tomsfastmath" ; use system tomsfastmath
"libclamunrar")))) ; non-free license "libclamunrar")) ; non-free license
#t))
(patches (patches
(search-patches "clamav-system-tomsfastmath.patch" (search-patches "clamav-system-tomsfastmath.patch"
"clamav-config-llvm-libs.patch")))) "clamav-config-llvm-libs.patch"))))

10
gnu/packages/astronomy.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 by Amar Singh <nly@disroot.org> ;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
@ -128,7 +128,7 @@ header.")
(define-public gnuastro (define-public gnuastro
(package (package
(name "gnuastro") (name "gnuastro")
(version "0.11") (version "0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -136,7 +136,10 @@ header.")
version ".tar.lz")) version ".tar.lz"))
(sha256 (sha256
(base32 (base32
"0c1yc2qb7vrqad96savfn06rn01izlfz0va738signv93qqj5k3v")))) "0ypk1c72q778cixfa52vjxzbd5m4qc6hfjgnipy16sfa7mnspmyf"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
(inputs (inputs
`(("cfitsio" ,cfitsio) `(("cfitsio" ,cfitsio)
("gsl" ,gsl) ("gsl" ,gsl)
@ -147,7 +150,6 @@ header.")
(native-inputs (native-inputs
`(("libtool" ,libtool) `(("libtool" ,libtool)
("lzip" ,lzip))) ("lzip" ,lzip)))
(build-system gnu-build-system)
(home-page "https://www.gnu.org/software/gnuastro/") (home-page "https://www.gnu.org/software/gnuastro/")
(synopsis "Astronomy utilities") (synopsis "Astronomy utilities")
(description "The GNU Astronomy Utilities (Gnuastro) is a suite of (description "The GNU Astronomy Utilities (Gnuastro) is a suite of

10
gnu/packages/audio.scm
View File

@ -2191,7 +2191,7 @@ buffers, and audio capture.")
(define-public patchage (define-public patchage
(package (package
(name "patchage") (name "patchage")
(version "1.0.0") (version "1.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.drobilla.net/patchage-" (uri (string-append "https://download.drobilla.net/patchage-"
@ -2199,10 +2199,10 @@ buffers, and audio capture.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1agdpwwi42176l4mxj0c4fsvdiv1ig56bfnnx0msckxmy57df8bb")))) "0dk3fiac10m83mwss3026yz7ygc47c2iw924cwwnh2fyydc9bsy6"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:python ,python-2)) #:python ,python-2))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -3373,14 +3373,14 @@ with support for HD extensions.")
(define-public bs1770gain (define-public bs1770gain
(package (package
(name "bs1770gain") (name "bs1770gain")
(version "0.6.7") (version "0.6.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/"
version "/bs1770gain-" version ".tar.gz")) version "/bs1770gain-" version ".tar.gz"))
(sha256 (sha256
(base32 "13hsbqj1dkpz1gbclnjxv50kr7b4gcjai6c1l38g01433h217qjc")) (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

4
gnu/packages/backup.scm
View File

@ -1029,14 +1029,14 @@ is format-agnostic, so you can feed virtually any files to it.")
(define-public burp (define-public burp
(package (package
(name "burp") (name "burp")
(version "2.3.24") (version "2.3.26")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/burp/burp-" version (uri (string-append "mirror://sourceforge/burp/burp-" version
"/burp-" version ".tar.bz2")) "/burp-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0dmahqx8ldqdrx9b47r7ag3m801n7h3kclcqja1cc1jzhfhfq27w")))) "1kwm8wwmzla02cqacgpmac6n5466dqd5czx83lkbp97rmg9017h8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

29
gnu/packages/bioinformatics.scm
View File

@ -5723,7 +5723,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
(define-public ngs-sdk (define-public ngs-sdk
(package (package
(name "ngs-sdk") (name "ngs-sdk")
(version "2.9.6") (version "2.10.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5732,7 +5732,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0d5k5kabgl15as37kj9x65xc92j4gcqms86hvihw3yb6wag0r0q3")))) "1ix51c25hjn57w93qmwzw80xh2i34wx8j2hn7szh8p6w8i3az5qa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f ; not supported `(#:parallel-build? #f ; not supported
@ -5789,7 +5789,7 @@ simultaneously.")
(define-public ncbi-vdb (define-public ncbi-vdb
(package (package
(name "ncbi-vdb") (name "ncbi-vdb")
(version "2.9.6") (version "2.10.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5798,7 +5798,7 @@ simultaneously.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0knkj1sq34hlivgv5qd6jlczqrs3ldmfgn6vbbw7p4mqxvb9mirk")))) "0m8hlxscidsfqm9x9fyi62q6lpf1dv5115kgjjgnrkl49q9c27m6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f ; not supported `(#:parallel-build? #f ; not supported
@ -6148,7 +6148,7 @@ sequence itself can be retrieved from these databases.")
(define-public sra-tools (define-public sra-tools
(package (package
(name "sra-tools") (name "sra-tools")
(version "2.9.6") (version "2.10.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6158,11 +6158,11 @@ sequence itself can be retrieved from these databases.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0vqzap68v81k0zif2mnqfy8pnw2nrhsg87p6mgq8qk3nk2jv2rgy")))) "1cr2mijkfs5sm35ffjs6861qsd1qkgnhnbavdv65zg5d655abbjf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f ; not supported `(#:parallel-build? #f ; not supported
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:make-flags #:make-flags
(list (string-append "DEFAULT_CRT=" (list (string-append "DEFAULT_CRT="
(assoc-ref %build-inputs "ncbi-vdb") (assoc-ref %build-inputs "ncbi-vdb")
@ -6205,6 +6205,9 @@ sequence itself can be retrieved from these databases.")
;; Dynamic linking ;; Dynamic linking
(substitute* "tools/copycat/Makefile" (substitute* "tools/copycat/Makefile"
(("smagic-static") "lmagic")) (("smagic-static") "lmagic"))
(substitute* "tools/driver-tool/utf8proc/Makefile"
(("CC\\?=gcc") "myCC=gcc")
(("\\(CC\\)") "(myCC)"))
;; The 'configure' script doesn't recognize things like ;; The 'configure' script doesn't recognize things like
;; '--enable-fast-install'. ;; '--enable-fast-install'.
@ -6217,8 +6220,9 @@ sequence itself can be retrieved from these databases.")
(string-append "--with-magic-prefix=" (string-append "--with-magic-prefix="
(assoc-ref inputs "libmagic")) (assoc-ref inputs "libmagic"))
;; TODO: building with libxml2 fails with linker errors ;; TODO: building with libxml2 fails with linker errors
;; (string-append "--with-xml2-prefix=" #;
;; (assoc-ref inputs "libxml2")) (string-append "--with-xml2-prefix="
(assoc-ref inputs "libxml2"))
(string-append "--with-ncbi-vdb-sources=" (string-append "--with-ncbi-vdb-sources="
(assoc-ref inputs "ncbi-vdb")) (assoc-ref inputs "ncbi-vdb"))
(string-append "--with-ncbi-vdb-build=" (string-append "--with-ncbi-vdb-build="
@ -6234,8 +6238,9 @@ sequence itself can be retrieved from these databases.")
("ncbi-vdb" ,ncbi-vdb) ("ncbi-vdb" ,ncbi-vdb)
("libmagic" ,file) ("libmagic" ,file)
("fuse" ,fuse) ("fuse" ,fuse)
("hdf5" ,hdf5) ("hdf5" ,hdf5-1.10)
("zlib" ,zlib))) ("zlib" ,zlib)
("python" ,python-wrapper)))
(home-page (home-page
"https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software") "https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software")
(synopsis "Tools and libraries for reading and writing sequencing data") (synopsis "Tools and libraries for reading and writing sequencing data")

41
gnu/packages/boost.scm
View File

@ -13,6 +13,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -241,12 +242,40 @@ across a broad spectrum of applications.")
(arguments (substitute-keyword-arguments (package-arguments boost) (arguments (substitute-keyword-arguments (package-arguments boost)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
;; This was removed after boost-1.67. (replace 'configure
(add-before 'configure 'more-bin-sh-patching (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda _ (let ((icu (assoc-ref inputs "icu4c"))
(substitute* "tools/build/doc/bjam.qbk" (out (assoc-ref outputs "out")))
(("/bin/sh") (which "sh"))))) (substitute* (append
(delete 'provide-libboost_python))))) (find-files "tools/build/src/engine/" "execunix\\.c.*")
'("libs/config/configure"
"libs/spirit/classic/phoenix/test/runtest.sh"
"tools/build/doc/bjam.qbk"
"tools/build/src/engine/Jambase"))
(("/bin/sh") (which "sh")))
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
,@(if (%current-target-system)
`((call-with-output-file "user-config.jam"
(lambda (port)
(format port
"using gcc : cross : ~a-c++ ;"
,(%current-target-system)))))
'())
(invoke "./bootstrap.sh"
(string-append "--prefix=" out)
;; Auto-detection looks for ICU only in traditional
;; install locations.
(string-append "--with-icu=" icu)
"--with-toolset=gcc"))))
(delete 'provide-libboost_python)))
((#:make-flags make-flags)
`(cons* "--without-python" ,make-flags))))
(native-inputs
(alist-delete "python" (package-native-inputs boost)))
(properties '((hidden? . #t))))) (properties '((hidden? . #t)))))
(define-public boost-sync (define-public boost-sync

6
gnu/packages/busybox.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -113,7 +113,7 @@ any small or embedded system.")
(define-public toybox (define-public toybox
(package (package
(name "toybox") (name "toybox")
(version "0.8.2") (version "0.8.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -121,7 +121,7 @@ any small or embedded system.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mgya8zxgf30i5w3rhsb3n70kwlhifxbajh6wqdsz6rf8kx609ws")))) "00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

5
gnu/packages/check.scm
View File

@ -1703,14 +1703,13 @@ normally the case.")
(define-public python-pytest-sugar (define-public python-pytest-sugar
(package (package
(name "python-pytest-sugar") (name "python-pytest-sugar")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-sugar" version)) (uri (pypi-uri "pytest-sugar" version))
(sha256 (sha256
(base32 (base32 "1i0hv3h49zvl62jbiyjag84carbrp3zprqzxffdr291nxavvac0n"))))
"1asq7yc4g8bx2sn7yy974mhc9ywvaihasjab4inkirdwn9s7mn7w"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-packaging" ,python-packaging) `(("python-packaging" ,python-packaging)

6
gnu/packages/cpp.scm
View File

@ -297,7 +297,7 @@ tools (containers, algorithms) used by other QuantStack packages.")
(define-public ccls (define-public ccls
(package (package
(name "ccls") (name "ccls")
(version "0.20190823.5") (version "0.20190823.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -305,11 +305,11 @@ tools (containers, algorithms) used by other QuantStack packages.")
(url "https://github.com/MaskRay/ccls") (url "https://github.com/MaskRay/ccls")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5")) (base32 "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; no check target. '(#:tests? #f)) ; no check target
(inputs (inputs
`(("rapidjson" ,rapidjson))) `(("rapidjson" ,rapidjson)))
(native-inputs (native-inputs

2
gnu/packages/cups.scm
View File

@ -244,7 +244,7 @@ device-specific programs to convert and print many types of files.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public cups (define-public cups
(package (inherit cups-minimal) (package/inherit cups-minimal
(name "cups") (name "cups")
(arguments (arguments
`(;; Three tests fail: `(;; Three tests fail:

26
gnu/packages/databases.scm
View File

@ -1459,7 +1459,7 @@ extremely small.")
(define-public perl-dbi (define-public perl-dbi
(package (package
(name "perl-dbi") (name "perl-dbi")
(version "1.642") (version "1.643")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1467,7 +1467,7 @@ extremely small.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z")))) "1yinx39960y241vf2sknxj0dfz82a5m9gvklq5rw78k0nlyrjawa"))))
(build-system perl-build-system) (build-system perl-build-system)
(synopsis "Database independent interface for Perl") (synopsis "Database independent interface for Perl")
(description "This package provides an database interface for Perl.") (description "This package provides an database interface for Perl.")
@ -1703,7 +1703,7 @@ columns, primary keys, unique constraints and relationships.")
(define-public perl-dbd-sqlite (define-public perl-dbd-sqlite
(package (package
(name "perl-dbd-sqlite") (name "perl-dbd-sqlite")
(version "1.62") (version "1.64")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1711,7 +1711,7 @@ columns, primary keys, unique constraints and relationships.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx")))) "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs `(("sqlite" ,sqlite))) (inputs `(("sqlite" ,sqlite)))
(propagated-inputs `(("perl-dbi" ,perl-dbi))) (propagated-inputs `(("perl-dbi" ,perl-dbi)))
@ -2049,17 +2049,14 @@ database.")
(define-public perl-db-file (define-public perl-db-file
(package (package
(name "perl-db-file") (name "perl-db-file")
(version "1.852") (version "1.853")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/DB_File-"
"mirror://cpan/authors/id/P/PM/PMQS/DB_File-" version ".tar.gz"))
version
".tar.gz"))
(sha256 (sha256
(base32 (base32 "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h"))))
"14c30xyqx9c1hxw40bqbzls41al8gmklxv5jbk2kknmn4dsrbdrs"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs `(("bdb" ,bdb))) (inputs `(("bdb" ,bdb)))
(native-inputs `(("perl-test-pod" ,perl-test-pod))) (native-inputs `(("perl-test-pod" ,perl-test-pod)))
@ -2382,13 +2379,13 @@ etc., and an SQL engine for performing simple SQL queries.")
(define-public python-lmdb (define-public python-lmdb
(package (package
(name "python-lmdb") (name "python-lmdb")
(version "0.95") (version "0.98")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "lmdb" version)) (uri (pypi-uri "lmdb" version))
(sha256 (sha256
(base32 (base32
"0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91")) "027pgbdhhdcbwj53vrzr6a60gjhmz4s75gl3180fd4q8pwlbq986"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled lmdb source files. ;; Delete bundled lmdb source files.
@ -2424,9 +2421,6 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
;; but not actually needed on platforms currently supported by Guix. ;; but not actually needed on platforms currently supported by Guix.
license:bsd-3)))) license:bsd-3))))
(define-public python2-lmdb
(package-with-python2 python-lmdb))
(define-public python-orator (define-public python-orator
(package (package
(name "python-orator") (name "python-orator")

4
gnu/packages/dictionaries.scm
View File

@ -231,7 +231,7 @@ and a Python library.")
(define-public translate-shell (define-public translate-shell
(package (package
(name "translate-shell") (name "translate-shell")
(version "0.9.6.11") (version "0.9.6.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -240,7 +240,7 @@ and a Python library.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm")))) (base32 "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

8
gnu/packages/dns.scm
View File

@ -119,7 +119,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
(define-public isc-bind (define-public isc-bind
(package (package
(name "bind") (name "bind")
(version "9.16.2") (version "9.16.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -127,7 +127,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gwr4p14zy5jqq050n762rfc33km51qwipcwy6bsvk55ziybgrfr")))) "0zjgaspnx0p0rp83h4yj595s25da7fjis94z9frhv3azvq9nbb17"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs
@ -595,14 +595,14 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.9.3") (version "2.9.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
"knot-" version ".tar.xz")) "knot-" version ".tar.xz"))
(sha256 (sha256
(base32 "0zm0642hkb16sqkqpa84f89f3s0bw44m837r1nia8m89swvz3bgj")) (base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

4
gnu/packages/docker.scm
View File

@ -544,7 +544,9 @@ built-in registry server of Docker.")
(install-file (string-append "bundles/dynbinary-daemon/dockerd-" (install-file (string-append "bundles/dynbinary-daemon/dockerd-"
(getenv "VERSION")) (getenv "VERSION"))
out-bin) out-bin)
#t)))))) #t)))
(add-after 'install 'remove-go-references
(assoc-ref go:%standard-phases 'remove-go-references)))))
(inputs (inputs
`(("btrfs-progs" ,btrfs-progs) `(("btrfs-progs" ,btrfs-progs)
("containerd" ,containerd) ; for containerd-shim ("containerd" ,containerd) ; for containerd-shim

8
gnu/packages/efi.scm
View File

@ -37,14 +37,14 @@
(define-public gnu-efi (define-public gnu-efi
(package (package
(name "gnu-efi") (name "gnu-efi")
(version "3.0.11") (version "3.0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gnu-efi/" (uri (string-append "mirror://sourceforge/gnu-efi/"
"gnu-efi-" version ".tar.bz2")) "gnu-efi-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj")))) (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; none exist `(#:tests? #f ; none exist
@ -54,8 +54,8 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(synopsis "EFI toolchain") (synopsis "EFI toolchain")
(description "This package provides an EFI (Extensible Firmware (description "This package provides an @acronym{EFI, Extensible Firmware
Interface) toolchain for building programs that can run in the Interface} toolchain for building programs that can run in the
environment presented by Intel's EFI.") environment presented by Intel's EFI.")
(home-page "https://directory.fsf.org/wiki/GNU_EFI") (home-page "https://directory.fsf.org/wiki/GNU_EFI")
;; Distribution is allowed only when accepting all those licenses. ;; Distribution is allowed only when accepting all those licenses.

13
gnu/packages/elf.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@ -38,7 +38,9 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public elfutils (define-public elfutils
(package (package
@ -67,10 +69,11 @@
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib")) "/lib"))
;; Disable tests on MIPS (without changing ;; Disable tests on MIPS and PowerPC (without changing
;; the arguments list on other systems). ;; the arguments list on other systems).
,@(if (string-prefix? "mips" (or (%current-target-system) ,@(if (any (cute string-prefix? <> (or (%current-target-system)
(%current-system))) (%current-system)))
'("mips" "powerpc"))
'(#:tests? #f) '(#:tests? #f)
'()) '())

153
gnu/packages/emacs-xyz.scm
View File

@ -19,7 +19,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@ -168,6 +168,7 @@
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages wordnet) #:use-module (gnu packages wordnet)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages uml)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -881,21 +882,21 @@ supports type hints, definition-jumping, completion, and more.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-flycheck (define-public emacs-flycheck
;; last release version was more than 300 commits ago ;; Last release version was more than 500 commits ago.
(let ((commit "0006a59259ebd02c9199ddc87f0e3ce22793a2ea") (let ((commit "9bcf6b665e15db94870bebc81dc8248c3eec20d3")
(revision "1")) (revision "2"))
(package (package
(name "emacs-flycheck") (name "emacs-flycheck")
(version (git-version "31" revision commit)) (version (git-version "31" revision commit))
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/flycheck/flycheck/") (uri (git-reference
(commit commit))) (url "https://github.com/flycheck/flycheck/")
(sha256 (commit commit)))
(base32 (sha256
"09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1")) (base32 "015ixss5bjr7gvhj8mkw5x2x1hy6fvvsjarr2xpv0gskkkngs7pg"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash))) `(("emacs-dash" ,emacs-dash)))
@ -3759,7 +3760,7 @@ for Flow files.")
(define-public emacs-flycheck-grammalecte (define-public emacs-flycheck-grammalecte
(package (package
(name "emacs-flycheck-grammalecte") (name "emacs-flycheck-grammalecte")
(version "1.0") (version "1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3767,30 +3768,31 @@ for Flow files.")
"flycheck-grammalecte/snapshot/" "flycheck-grammalecte/snapshot/"
"flycheck-grammalecte-" version ".tar.xz")) "flycheck-grammalecte-" version ".tar.xz"))
(sha256 (sha256
(base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b")))) (base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.(el|py)$") `(#:include '("\\.(el|py)$")
#:exclude '("^test-profile.el$")
#:emacs ,emacs ;need libxml support
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-external-executables (add-after 'unpack 'fix-python-executable
;; Hardcode python3 and curl executables in the Emacs library. ;; Hardcode python3 executable in the Emacs library.
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((python3 (string-append (assoc-ref inputs "python") (let ((python3 (string-append (assoc-ref inputs "python")
"/bin/python3")) "/bin/python3")))
(curl (string-append (assoc-ref inputs "curl")
"/bin/curl")))
(substitute* "flycheck-grammalecte.el" (substitute* "flycheck-grammalecte.el"
(("\"python3?") (string-append "\"" python3)) (("\"python3") (string-append "\"" python3)))
(("\"curl") (string-append "\"" curl)))
#t))) #t)))
(add-after 'install 'link-to-grammalecte (add-before 'build 'link-to-grammalecte
;; The package expects grammalecte to be in a sub-directory. ;; XXX: The Python part of the package requires grammalecte, but
;; Symlink it there from the store. ;; the library is not specified in PYTHONPATH, since we're not
;; using Python build system. As a workaround, we symlink
;; grammalecte libraries here.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((grammalecte (assoc-ref inputs "grammalecte")) (let* ((out (assoc-ref outputs "out"))
(out (assoc-ref outputs "out")) (grammalecte (assoc-ref inputs "grammalecte"))
(version ,(version-major+minor (package-version python)))) (version ,(version-major+minor (package-version python))))
(with-directory-excursion (with-directory-excursion
(string-append out "/share/emacs/site-lisp") (string-append out "/share/emacs/site-lisp")
(symlink (string-append grammalecte "/lib/" (symlink (string-append grammalecte "/lib/"
@ -3799,17 +3801,17 @@ for Flow files.")
"grammalecte")) "grammalecte"))
#t)))))) #t))))))
(inputs (inputs
`(("curl" ,curl) `(("grammalecte" ,grammalecte)
("grammalecte" ,grammalecte)
("python" ,python))) ("python" ,python)))
(propagated-inputs (propagated-inputs
`(("emacs-flycheck" ,emacs-flycheck))) `(("emacs-flycheck" ,emacs-flycheck)))
(home-page "https://git.deparis.io/flycheck-grammalecte/") (home-page "https://git.deparis.io/flycheck-grammalecte/")
(synopsis "Integrate Grammalecte with Flycheck") (synopsis "Integrate Grammalecte with Flycheck")
(description "Integrate the French grammar and typography checker (description
Grammalecte with Flycheck to automatically look for mistakes in your writings. "Integrate the French grammar and typography checker Grammalecte with
It also provides an easy way to find synonyms and antonyms for a given Flycheck to automatically look for mistakes in your writings. It also
word (to avoid repetitions for example).") provides an easy way to find synonyms and antonyms for a given word (to avoid
repetitions for example).")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-flycheck-rust (define-public emacs-flycheck-rust
@ -12690,7 +12692,7 @@ standard Unix password manager\").")
(define-public emacs-pass (define-public emacs-pass
(package (package
(name "emacs-pass") (name "emacs-pass")
(version "1.8") (version "2.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -12699,7 +12701,7 @@ standard Unix password manager\").")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx")))) (base32 "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-password-store" ,emacs-password-store) `(("emacs-password-store" ,emacs-password-store)
@ -14917,6 +14919,29 @@ repository, @code{magit-org-todos} will create a section in your Magit status
buffer with each of your todos.") buffer with each of your todos.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-vcsh
(package
(name "emacs-vcsh")
(version "0.4.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/stepnem/vcsh-el.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7"))))
(build-system emacs-build-system)
(home-page "https://gitlab.com/stepnem/vcsh-el")
(synopsis "Emacs VCSH integration")
(description
"This library provides basic ``enter'' functionality and a few
convenience commands to initialize a @acronym{VCSH, Version Control System for
$HOME} repository and add files to it. It can be used in conjunction with
Magit.")
(license license:public-domain)))
(define-public emacs-f3 (define-public emacs-f3
(package (package
(name "emacs-f3") (name "emacs-f3")
@ -20716,17 +20741,17 @@ it forcibly
(define-public emacs-elpher (define-public emacs-elpher
(package (package
(name "emacs-elpher") (name "emacs-elpher")
(version "1.4.6") (version "2.7.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/tgvaughan/elpher") (url "git://thelambdalab.xyz/elpher.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66")))) "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (native-inputs
`(("texinfo" ,texinfo))) `(("texinfo" ,texinfo)))
@ -20736,7 +20761,7 @@ it forcibly
(add-before 'install 'build-doc (add-before 'install 'build-doc
(lambda _ (lambda _
(invoke "makeinfo" "elpher.texi")))))) (invoke "makeinfo" "elpher.texi"))))))
(home-page "https://github.com/tgvaughan/elpher") (home-page "gopher://thelambdalab.xyz/1/projects/elpher/")
(synopsis "Gopher client for Emacs") (synopsis "Gopher client for Emacs")
(description "Elpher is a full-featured gopher client for Emacs. Its (description "Elpher is a full-featured gopher client for Emacs. Its
features include intuitive keyboard and mouse-driven browsing, out-of-the-box features include intuitive keyboard and mouse-driven browsing, out-of-the-box
@ -22941,3 +22966,51 @@ deleting them with @code{(setq delete-by-moving-to-trash t)}. This package
provides a simple but convenient user interface to manage those trashed provides a simple but convenient user interface to manage those trashed
files.") files.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-plantuml-mode
(package
(name "emacs-plantuml-mode")
(version "1.4.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/skuro/plantuml-mode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc"))))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'use-local-plantuml
(lambda* (#:key inputs #:allow-other-keys)
(let ((plantuml (assoc-ref inputs "plantuml"))
(file "plantuml-mode.el"))
(chmod file #o644)
(emacs-substitute-variables file
("plantuml-jar-path"
(string-append plantuml "/share/java/plantuml.jar"))
("plantuml-executable-path"
(string-append plantuml "/bin/plantuml"))
("plantuml-server-url" 'nil)
("plantuml-default-exec-mode" ''executable))
(emacs-batch-edit-file file
`(progn (progn
(goto-char (point-min))
(re-search-forward "(defun plantuml-download-jar")
(beginning-of-line)
(kill-sexp))
(basic-save-buffer)))
#t))))))
(inputs
`(("plantuml" ,plantuml)))
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
(build-system emacs-build-system)
(home-page "https://github.com/skuro/plantuml-mode")
(synopsis "Major mode for editing PlantUML sources")
(description "This package provides a major mode for editing PlantUML
sources. It features syntax highlighting, autocompletion, preview of buffer
or region and use of locally installed binaries.")
(license license:gpl3+)))

7
gnu/packages/embedded.scm
View File

@ -1040,7 +1040,7 @@ the Raspberry Pi chip."))))
(define-public python-libmpsse (define-public python-libmpsse
(package (package
(name "python-libmpsse") (name "python-libmpsse")
(version "1.4") (version "1.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1050,7 +1050,7 @@ the Raspberry Pi chip."))))
(file-name "libmpsse-checkout") (file-name "libmpsse-checkout")
(sha256 (sha256
(base32 (base32
"14f1kiiia4kfd9mzwx4h63aa8bpz9aknbrrr7mychnsp3arw0z25")))) "1rypfb96k2szqgygp3jnwg2zq9kwmfz0460dsahn3r2vkzml8wn7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libftdi" ,libftdi) `(("libftdi" ,libftdi)
@ -1073,8 +1073,7 @@ the Raspberry Pi chip."))))
(chdir "src") (chdir "src")
(setenv "PYDEV" (string-append python (setenv "PYDEV" (string-append python
"/include/python" "/include/python"
,(version-major+minor (package-version python)) ,(version-major+minor (package-version python))))
"m"))
#t))) #t)))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args) (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args)

4
gnu/packages/emulators.scm
View File

@ -1274,7 +1274,7 @@ play them on systems for which they were never designed!")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.220") (version "0.221")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1283,7 +1283,7 @@ play them on systems for which they were never designed!")
(commit (apply string-append "mame" (string-split version #\.))))) (commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0x3yr195zi7xjr21p1c2l8c0vhg0a0af0mpz4i1w7q7r9krvcvz4")) (base32 "07fl7alj9zlyb93i8lnn4706ndy3qiv0pjvwnwysk5rqa0r3463y"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.

135
gnu/packages/engineering.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,6 +39,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix svn-download)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix utils) #:use-module (guix utils)
@ -798,16 +800,16 @@ language.")
(define-public kicad (define-public kicad
(package (package
(name "kicad") (name "kicad")
(version "5.1.5") (version "5.1.6")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(file-name (string-append name "-" version ".tar.xz")) (uri (git-reference
(uri (string-append (url "https://gitlab.com/kicad/code/kicad.git")
"https://launchpad.net/kicad/" (version-major version) (commit version)))
".0/" version "/+download/kicad-" version ".tar.xz"))
(sha256 (sha256
(base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) (base32 "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"))
(file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
@ -821,7 +823,7 @@ language.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'install-translations (add-after 'install 'install-translations
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "kicad-i18l") (copy-recursively (assoc-ref inputs "kicad-i18n")
(assoc-ref outputs "out")) (assoc-ref outputs "out"))
#t)) #t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
@ -859,7 +861,7 @@ language.")
`(("boost" ,boost) `(("boost" ,boost)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("kicad-i18l" ,kicad-i18l) ("kicad-i18n" ,kicad-i18n)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("swig" ,swig) ("swig" ,swig)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -885,10 +887,10 @@ perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
electrical diagrams), gerbview (viewing Gerber files) and others.") electrical diagrams), gerbview (viewing Gerber files) and others.")
(license license:gpl3+))) (license license:gpl3+)))
(define kicad-i18l (define kicad-i18n
(package (package
(name "kicad-i18l") (name "kicad-i18n")
(version "5.1.5") (version (package-version kicad))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -897,7 +899,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3")))) "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -906,16 +908,19 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
(delete 'check)))) (delete 'check))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal))) `(("gettext" ,gettext-minimal)))
(home-page "https://kicad-pcb.org/") (home-page (package-home-page kicad))
(synopsis "KiCad GUI translations") (synopsis "KiCad GUI translations")
(description "This package contains the po files that are used for the GUI (description "This package contains the po files that are used for the GUI
translations for KiCad.") translations for KiCad.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public kicad-i18l
(deprecated-package "kicad-i18l" kicad-i18n))
(define-public kicad-symbols (define-public kicad-symbols
(package (package
(name "kicad-symbols") (name "kicad-symbols")
(version "5.1.5") (version (package-version kicad))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -924,11 +929,11 @@ translations for KiCad.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h")))) "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no tests exist `(#:tests? #f)) ; no tests exist
(home-page "https://kicad-pcb.org/") (home-page (package-home-page kicad))
(synopsis "Official KiCad schematic symbol libraries") (synopsis "Official KiCad schematic symbol libraries")
(description "This package contains the official KiCad schematic symbol (description "This package contains the official KiCad schematic symbol
libraries.") libraries.")
@ -944,7 +949,7 @@ libraries.")
(package (package
(inherit kicad-symbols) (inherit kicad-symbols)
(name "kicad-footprints") (name "kicad-footprints")
(version "5.1.5") (version (package-version kicad))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -953,7 +958,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j")))) "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"))))
(synopsis "Official KiCad footprint libraries") (synopsis "Official KiCad footprint libraries")
(description "This package contains the official KiCad footprint libraries."))) (description "This package contains the official KiCad footprint libraries.")))
@ -961,7 +966,7 @@ libraries.")
(package (package
(inherit kicad-symbols) (inherit kicad-symbols)
(name "kicad-packages3d") (name "kicad-packages3d")
(version "5.1.5") (version (package-version kicad))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -970,7 +975,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz")))) "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"))))
(synopsis "Official KiCad 3D model libraries") (synopsis "Official KiCad 3D model libraries")
(description "This package contains the official KiCad 3D model libraries."))) (description "This package contains the official KiCad 3D model libraries.")))
@ -978,7 +983,7 @@ libraries.")
(package (package
(inherit kicad-symbols) (inherit kicad-symbols)
(name "kicad-templates") (name "kicad-templates")
(version "5.1.5") (version (package-version kicad))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -987,7 +992,7 @@ libraries.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g")))) "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"))))
(synopsis "Official KiCad project and worksheet templates") (synopsis "Official KiCad project and worksheet templates")
(description "This package contains the official KiCad project and (description "This package contains the official KiCad project and
worksheet templates."))) worksheet templates.")))
@ -2042,17 +2047,18 @@ simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.")
(define-public librepcb (define-public librepcb
(package (package
(name "librepcb") (name "librepcb")
(version "0.1.3") (version "0.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.librepcb.org/releases/" (uri (string-append "https://download.librepcb.org/releases/"
version "/librepcb-" version "-source.zip")) version "/librepcb-" version "-source.zip"))
(sha256 (sha256
(base32 "1ich849dsx2hmcwlwbry4mkg374n940l3hy6srh4qms2rm7vd7x0")))) (base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("qttools" ,qttools) ; for lrelease `(("qttools" ,qttools) ; for lrelease
@ -2533,3 +2539,82 @@ without any changes. And programmers that are familiar with the magellan API
can continue using it with a free library without the restrictions of the can continue using it with a free library without the restrictions of the
official SDK.") official SDK.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public openctm
(let ((revision 603))
;; Previous versions don't compile, they need to link libGL and libGLU.
;; Fixed in this revision.
(package
(name "openctm")
(version (string-append "1.0.3." (number->string revision)))
(source
(origin
(method svn-fetch)
(uri (svn-reference
(url "https://svn.code.sf.net/p/openctm/code/trunk")
(revision revision)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("mesa" ,mesa)
("glu" ,glu)
("glut" ,freeglut)
("gtk" ,gtk+-2)))
(arguments
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(rename-file "Makefile.linux" "Makefile")
(let ((out (assoc-ref outputs "out")))
;; Create output directories.
(mkdir-p (string-append out "/lib"))
(mkdir-p (string-append out "/include"))
(mkdir-p (string-append out "/bin"))
;; Fix rpath.
(substitute* "tools/Makefile.linux"
(("-rpath,\\.")
(string-append "-rpath," out "/lib/"))
(("/usr/local")
out))
;; Set right output.
(substitute* "Makefile"
(("/usr/lib")
(string-append out "/lib"))
(("\\/usr\\/local")
out))
#t))))))
(synopsis "3D triangle mesh format and related tools and libraries")
(description "OpenCTM is a file format, a software library and a tool set
for compression of 3D triangle meshes. The geometry is compressed to a
fraction of comparable file formats (3DS, STL, COLLADA...), and the format is
accessible through a simple API")
(license license:zlib)
(home-page "http://openctm.sourceforge.net/"))))
(define-public lib3ds
(package
(name "lib3ds")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://storage.googleapis.com/google-code-archive-downloads"
"/v2/code.google.com/lib3ds/lib3ds-" version ".zip"))
(sha256
(base32 "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"))))
(build-system gnu-build-system)
(native-inputs
`(("unzip" ,unzip)))
(home-page "https://code.google.com/archive/p/lib3ds")
(synopsis "3DS format file toolkit")
(description "Lib3ds is a toolkit for handling the 3DS format for 3D
model files. Its main goal is to simplify the creation of 3DS import and
export filters.")
(license license:lgpl2.1+)))

68
gnu/packages/finance.scm
View File

@ -1227,9 +1227,8 @@ Trezor wallet.")
(define-public bitcoin-abc (define-public bitcoin-abc
(package (package
(inherit bitcoin-core)
(name "bitcoin-abc") (name "bitcoin-abc")
(version "0.20.7") (version "0.21.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.bitcoinabc.org/" (uri (string-append "https://download.bitcoinabc.org/"
@ -1237,12 +1236,10 @@ Trezor wallet.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0py5ilfi4r8qh5r9637vwch27sqrrn0dg9rz8bccnj3lp2xpzw27")))) "1w3c397h2mxsi9471fwyc3yjxw7s4jgvr4q3w2qfh49bhr4wygqj"))))
(build-system cmake-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("pkg-config" ,pkg-config)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("python" ,python) ; for the tests ("python" ,python) ; for the tests
("util-linux" ,util-linux) ; provides the hexdump command for tests ("util-linux" ,util-linux) ; provides the hexdump command for tests
("qttools" ,qttools))) ("qttools" ,qttools)))
@ -1255,7 +1252,28 @@ Trezor wallet.")
("protobuf" ,protobuf) ("protobuf" ,protobuf)
("qrencode" ,qrencode) ("qrencode" ,qrencode)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("zeromq" ,zeromq)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'make-qt-deterministic
(lambda _
;; Make Qt deterministic.
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
#t))
(add-before 'check 'set-home
(lambda _
(setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME
#t))
(add-after 'check 'check-functional
(lambda _
(invoke
"python3" "./test/functional/test_runner.py"
(string-append "--jobs=" (number->string (parallel-job-count)))
;; TODO: find why the abc-miner-fund test fails.
"--exclude=abc-miner-fund")
#t)))))
(home-page "https://www.bitcoinabc.org/") (home-page "https://www.bitcoinabc.org/")
(synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol")
(description (description
@ -1269,7 +1287,8 @@ As a fork it implemented changes lowering the time between blocks and now
offers confimations after less than 5 seconds and have significantly lower offers confimations after less than 5 seconds and have significantly lower
fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin
Cash protocol. This package provides the Bitcoin Cash command line client and Cash protocol. This package provides the Bitcoin Cash command line client and
a client based on Qt. This is a fork of Bitcoin Core."))) a client based on Qt. This is a fork of Bitcoin Core.")
(license license:expat)))
(define-public libofx (define-public libofx
(package (package
@ -1368,16 +1387,16 @@ entity management.")
(define-public bitcoin-unlimited (define-public bitcoin-unlimited
(package (package
(name "bitcoin-unlimited") (name "bitcoin-unlimited")
(version "1.7.0.0") (version "1.8.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git")
(commit (string-append "bucash" version)))) (commit (string-append "BCHunlimited" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05rcd73mg2fb2zb6b1imzspck6jhcy3xymrr7n24kwjrzmvihdpx")))) (base32 "1ivkig6q7i4n389dg1zv06cmfki20bjq0slmshx0p5a1aavkqj7k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -1415,12 +1434,23 @@ entity management.")
"/bin/lupdate")) "/bin/lupdate"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-build
(lambda _
;; The 'stack' header was not included in unlimited.cpp, which
;; caused the build to fail.
(substitute* "src/unlimited.cpp"
(("#include <queue>" all)
(string-append all "\n#include <stack>")))
#t))
(add-after 'unpack 'fix-tests (add-after 'unpack 'fix-tests
(lambda _ (lambda _
;; TODO: Find why utilprocess_tests never ends. Disable for now. ;; TODO: Find why txvalidationcache_tests fails and
(substitute* "src/test/utilprocess_tests.cpp" ;; utilprocess_tests never ends. Disable for now.
(("#if \\(BOOST_OS_LINUX && \\(BOOST_VERSION >= 106500\\)\\)") (substitute* "src/Makefile.test.include"
"#if 0")) (("test/txvalidationcache_tests.cpp")
"")
(("test/utilprocess_tests.cpp")
""))
#t)) #t))
(add-before 'configure 'make-qt-deterministic (add-before 'configure 'make-qt-deterministic
(lambda _ (lambda _
@ -1442,14 +1472,14 @@ a Qt GUI.")
(define-public fulcrum (define-public fulcrum
(package (package
(name "fulcrum") (name "fulcrum")
(version "1.1.0") (version "1.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v" (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v"
version "/fulcrum-v" version ".tar.gz")) version "/fulcrum-v" version ".tar.gz"))
(sha256 (sha256
(base32 "1xywwgsdhkiblv6la0pfhvn2s9q8vnz6pjg35647rlwzi6ybf0ak")))) (base32 "04w5gw02d39caa8a0l6wkn87kc43zzad2prqsyrcq97vlbkdx6x6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1480,14 +1510,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
(define-public flowee (define-public flowee
(package (package
(name "flowee") (name "flowee")
(version "2020.03.2") (version "2020.03.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/"
version "/thehub-" version ".tar.gz")) version "/thehub-" version ".tar.gz"))
(sha256 (sha256
(base32 "1m8wfwxljvd2gqpfj1w37xky4isa3h9a7g57cnf3l4r90r4bxj47")))) (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")

33
gnu/packages/fonts.scm
View File

@ -33,6 +33,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1737,3 +1738,35 @@ variation Arial. Tamil characters are inherently vertically-elliptical. The
orthography of Roman glyphs of Meera Inimai are also based on this orthography of Roman glyphs of Meera Inimai are also based on this
characteristic so that they sit smoothly with the Tamil glyphs.") characteristic so that they sit smoothly with the Tamil glyphs.")
(license license:silofl1.1))) (license license:silofl1.1)))
(define-public font-ipa-mj-mincho
(package
(name "font-ipa-mj-mincho")
(version "006.01")
(source (origin
(method url-fetch/zipbomb)
(uri (string-append "https://mojikiban.ipa.go.jp/OSCDL/IPAmjMincho"
"/ipamjm" (string-join (string-split version #\.) "")
".zip"))
(sha256
(base32
"0s2vs9p7vd7ajnn6c2icli069sjwi4d45a39fczqpwwn507lwj9m"))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((doc-dir (string-append (assoc-ref outputs "out")
"/share/doc/font-ipa-mj-mincho")))
(mkdir-p doc-dir)
(copy-file "Readme.txt" (string-append doc-dir "/README"))
(copy-file "IPA_Font_License_Agreement_v1.0.txt"
(string-append doc-dir "/LICENSE"))
#t))))))
(home-page "https://mojikiban.ipa.go.jp/1300.html")
(synopsis "Japanese font from the Information-technology Promotion Agency")
(description "MJM Mincho is a font that aims at, for example, allowing you
to write people's name, or for formal business situations where it is necessary
to have a detailed and proper character style.")
(license license:ipa)))

14
gnu/packages/fontutils.scm
View File

@ -37,6 +37,7 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages fonts)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -292,6 +293,12 @@ fonts to/from the WOFF2 format.")
(define-public fontconfig (define-public fontconfig
(package (package
(name "fontconfig") (name "fontconfig")
;; This replacement is not security-related, but works around the fact
;; that gs-fonts are not recognized by newer versions of Pango, causing
;; many applications to fail to find fonts otherwise.
(replacement fontconfig/font-dejavu)
(version "2.13.1") (version "2.13.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -348,6 +355,13 @@ high quality, anti-aliased and subpixel rendered text on a display.")
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))
(define fontconfig/font-dejavu
(package
(inherit fontconfig)
(inputs
;; XXX: Reuse the name to avoid having to override the configure flags.
`(("gs-fonts" ,font-dejavu)))))
(define-public t1lib (define-public t1lib
(package (package
(name "t1lib") (name "t1lib")

4
gnu/packages/fpga.scm
View File

@ -340,7 +340,7 @@ FOSS FPGA place and route tool.")
(define-public gtkwave (define-public gtkwave
(package (package
(name "gtkwave") (name "gtkwave")
(version "3.3.103") (version "3.3.104")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -350,7 +350,7 @@ FOSS FPGA place and route tool.")
(string-append "http://gtkwave.sourceforge.net/" (string-append "http://gtkwave.sourceforge.net/"
"gtkwave-" version ".tar.gz"))) "gtkwave-" version ".tar.gz")))
(sha256 (sha256
(base32 "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3")))) (base32 "0kw9a33gx60kn069yhx5pyk39x1z3pwaj8l1qqwq943v62lx23fj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("gperf" ,gperf) `(("gperf" ,gperf)

71
gnu/packages/game-development.scm
View File

@ -1585,11 +1585,7 @@ games.")
(build-system scons-build-system) (build-system scons-build-system)
(arguments (arguments
`(#:scons ,scons-python2 `(#:scons ,scons-python2
#:scons-flags (list "platform=x11" #:scons-flags (list "platform=x11" "target=release_debug"
,@(if (string-prefix? "aarch64" (or (%current-target-system)
(%current-system)))
`("CCFLAGS=-DNO_THREADS")
'())
;; Avoid using many of the bundled libs. ;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file. ;; Note: These options can be found in the SConstruct file.
"builtin_bullet=no" "builtin_bullet=no"
@ -1608,7 +1604,7 @@ games.")
"builtin_wslay=no" "builtin_wslay=no"
"builtin_zlib=no" "builtin_zlib=no"
"builtin_zstd=no") "builtin_zstd=no")
#:tests? #f ; There are no tests #:tests? #f ; There are no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'scons-use-env (add-after 'unpack 'scons-use-env
@ -1621,41 +1617,46 @@ games.")
"env_base = Environment(tools=custom_tools)\n" "env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)"))) "env_base = Environment(ENV=os.environ)")))
#t)) #t))
;; Build headless tools, used for packaging games without depending on X.
(add-after 'build 'build-headless
(lambda* (#:key scons-flags #:allow-other-keys)
(apply invoke "scons"
`(,(string-append "-j" (number->string (parallel-job-count)))
"platform=server" ,@(delete "platform=x11" scons-flags)))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (headless (assoc-ref outputs "headless"))
(zenity (assoc-ref inputs "zenity")))
;; Strip build info from filenames.
(with-directory-excursion "bin" (with-directory-excursion "bin"
(if (file-exists? "godot.x11.tools.64") (for-each
(rename-file "godot.x11.tools.64" "godot") (lambda (file)
(rename-file "godot.x11.tools.32" "godot")) (let ((dest (car (string-split (basename file) #\.))))
(install-file "godot" bin)) (rename-file file dest)))
;; Tell Godot where to find zenity for OS.alert(). (find-files "." "godot.*\\.x11\\.opt\\.tools.*"))
(wrap-program (string-append bin "/godot") (install-file "godot" (string-append out "/bin"))
`("PATH" ":" prefix (install-file "godot_server" (string-append headless "/bin")))
(,(string-append (assoc-ref %build-inputs "zenity") "/bin")))) ;; Tell the editor where to find zenity for OS.alert().
#t))) (wrap-program (string-append out "/bin/godot")
`("PATH" ":" prefix (,(string-append zenity "/bin")))))
#t))
(add-after 'install 'install-godot-desktop (add-after 'install 'install-godot-desktop
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(desktop (string-append out "/share/applications")) (applications (string-append out "/share/applications"))
(icon-dir (string-append out "/share/pixmaps"))) (icons (string-append out "/share/icons/hicolor")))
(rename-file "icon.png" "godot.png") (mkdir-p applications)
(install-file "godot.png" icon-dir) (copy-file "misc/dist/linux/org.godotengine.Godot.desktop"
(mkdir-p desktop) (string-append applications "/godot.desktop"))
(with-output-to-file (for-each (lambda (icon dest)
(string-append desktop "/godot.desktop") (mkdir-p (dirname dest))
(lambda _ (copy-file icon dest))
(format #t '("icon.png" "icon.svg")
"[Desktop Entry]~@ `(,(string-append icons "/256x256/apps/godot.png")
Name=godot~@ ,(string-append icons "/scalable/apps/godot.svg"))))
Comment=The godot game engine~@ #t)))))
Exec=~a/bin/godot~@ (outputs '("out" "headless"))
TryExec=~@*~a/bin/godot~@
Icon=godot~@
Type=Application~%"
out)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("alsa-lib" ,alsa-lib) (inputs `(("alsa-lib" ,alsa-lib)
("bullet" ,bullet) ("bullet" ,bullet)

104
gnu/packages/games.scm
View File

@ -978,7 +978,7 @@ automata. The following features are available:
(define-public julius (define-public julius
(package (package
(name "julius") (name "julius")
(version "1.3.0") (version "1.4.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -987,10 +987,18 @@ automata. The following features are available:
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy")))) (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v"))
;; Remove unused bundled libraries.
(modules '((guix build utils)))
(snippet
'(begin
(with-directory-excursion "ext"
(for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib")))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("sdl2" ,sdl2) `(("libpng" ,libpng)
("sdl2" ,sdl2)
("sdl2-mixer" ,sdl2-mixer))) ("sdl2-mixer" ,sdl2-mixer)))
(home-page "https://github.com/bvschaik/julius") (home-page "https://github.com/bvschaik/julius")
(synopsis "Re-implementation of Caesar III game engine") (synopsis "Re-implementation of Caesar III game engine")
@ -1000,7 +1008,6 @@ Julius includes some UI enhancements while preserving the logic (including
bugs) of the original game, so that saved games are compatible. This package bugs) of the original game, so that saved games are compatible. This package
does not include game data.") does not include game data.")
(license (list license:agpl3 (license (list license:agpl3
license:expat ; ext/dirent
license:zlib)))) ; ext/tinyfiledialogs license:zlib)))) ; ext/tinyfiledialogs
(define-public meandmyshadow (define-public meandmyshadow
@ -1726,6 +1733,83 @@ can be explored and changed freely.")
license:gpl3+ license:gpl3+
license:silofl1.1)))) license:silofl1.1))))
(define-public superstarfighter
(package
(name "superstarfighter")
(version "0.6.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/notapixelstudio/superstarfighter.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1fly63yf5ls1xwm15if4lxwy67wi84k4gvjllljpykrl18vw2y0y"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;there are no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _
(chdir "godot")
(setenv "HOME" (getcwd))
(with-output-to-file "export_presets.cfg"
(lambda ()
(display
"[preset.0]
name=\"Guix\"
platform=\"Linux/X11\"
runnable=true
[preset.0.options]")))
#t))
(replace 'build
(lambda _
(let ((godot (assoc-ref %build-inputs "godot-headless")))
(invoke (string-append godot "/bin/godot_server")
"--export-pack" "Guix"
"superstarfighter.pck" "project.godot"))
#t))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(share (string-append out "/share"))
(data (string-append share "/superstarfighter"))
(icons (string-append share "/icons/hicolor/256x256/apps")))
(install-file "superstarfighter.pck" data)
(mkdir-p bin)
(call-with-output-file (string-append bin "/superstarfighter")
(lambda (port)
(format port
"#!/bin/sh~@
exec ~a/bin/godot --main-pack ~a/superstarfighter.pck~%"
(assoc-ref inputs "godot")
data)
(chmod port #o755)))
(mkdir-p icons)
(copy-file "icon.png" (string-append icons "/" ,name ".png"))
(make-desktop-entry-file
(string-append share "/applications/" ,name ".desktop")
#:name "SuperStarfighter"
#:comment "Fast-paced arcade combat game"
#:exec ,name
#:icon ,name
#:categories '("Game" "ArcadeGame")))
#t)))))
(native-inputs
`(("godot-headless" ,godot "headless")))
(inputs
`(("godot" ,godot)))
(home-page "https://notapixel.itch.io/superstarfighter")
(synopsis "Fast-paced local multiplayer arcade game")
(description "In SuperStarfighter, up to four local players compete in a
2D arena with fast-moving ships and missiles. Different game types are
available, as well as a single-player mode with AI-controlled ships.")
(license (list license:expat ; game
license:silofl1.1)))) ; fonts
(define-public xshogi (define-public xshogi
(package (package
(name "xshogi") (name "xshogi")
@ -3328,7 +3412,7 @@ Transport Tycoon Deluxe.")
(define-public openrct2 (define-public openrct2
(package (package
(name "openrct2") (name "openrct2")
(version "0.2.4") (version "0.2.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3337,7 +3421,7 @@ Transport Tycoon Deluxe.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h")))) (base32 "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF"
@ -4132,7 +4216,7 @@ with the \"Stamp\" tool within Tux Paint.")
(define-public supertux (define-public supertux
(package (package
(name "supertux") (name "supertux")
(version "0.6.1.1") (version "0.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/SuperTux/supertux/" (uri (string-append "https://github.com/SuperTux/supertux/"
@ -4141,7 +4225,7 @@ with the \"Stamp\" tool within Tux Paint.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f")) "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"))
(patches (patches
(search-patches "supertux-unbundle-squirrel.patch")))) (search-patches "supertux-unbundle-squirrel.patch"))))
(arguments (arguments
@ -6752,7 +6836,7 @@ when packaged in Blorb container files or optionally from individual files.")
(define-public libmanette (define-public libmanette
(package (package
(name "libmanette") (name "libmanette")
(version "0.2.3") (version "0.2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libmanette/" (uri (string-append "mirror://gnome/sources/libmanette/"
@ -6760,7 +6844,7 @@ when packaged in Blorb container files or optionally from individual files.")
"libmanette-" version ".tar.xz")) "libmanette-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60")))) "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for glib-compile-resources `(("glib" ,glib "bin") ; for glib-compile-resources

3
gnu/packages/geo.scm
View File

@ -1151,7 +1151,8 @@ persisted.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((dir (string-append (assoc-ref outputs "out") "/share/java/"))) (let ((dir (string-append (assoc-ref outputs "out") "/share/java/")))
(mkdir-p dir) (mkdir-p dir)
(copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar"))
#t))))))
(home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer")
(synopsis "OSM map integration in Java") (synopsis "OSM map integration in Java")
(description "JMapViewer is a Java component which easily (description "JMapViewer is a Java component which easily

7
gnu/packages/gl.scm
View File

@ -775,7 +775,7 @@ and visualizations.")
(define-public gl2ps (define-public gl2ps
(package (package
(name "gl2ps") (name "gl2ps")
(version "1.4.0") (version "1.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -783,15 +783,14 @@ and visualizations.")
"http://geuz.org/gl2ps/src/gl2ps-" "http://geuz.org/gl2ps/src/gl2ps-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 (base32 "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"))))
"1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libpng" ,libpng) `(("libpng" ,libpng)
("mesa" ,mesa) ("mesa" ,mesa)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:tests? #f)) ;; no tests `(#:tests? #f)) ; no tests
(home-page "http://www.geuz.org/gl2ps/") (home-page "http://www.geuz.org/gl2ps/")
(synopsis "OpenGL to PostScript printing library") (synopsis "OpenGL to PostScript printing library")
(description "GL2PS is a C library providing high quality vector (description "GL2PS is a C library providing high quality vector

26
gnu/packages/gnome-xyz.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at> ;;; Copyright © 2019, 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
@ -46,18 +46,18 @@
(define-public matcha-theme (define-public matcha-theme
(package (package
(name "matcha-theme") (name "matcha-theme")
(version "2019-11-02") (version "2020-05-09")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://github.com/vinceliuice/matcha") (url "https://github.com/vinceliuice/Matcha-gtk-theme")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr")))) "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
'(#:modules ((guix build utils)) '(#:modules ((guix build utils))
@ -73,9 +73,9 @@
(string-append coreutils "/bin:" (string-append coreutils "/bin:"
(string-append bash "/bin:"))) (string-append bash "/bin:")))
(copy-recursively source (getcwd)) (copy-recursively source (getcwd))
(patch-shebang "Install") (patch-shebang "install.sh")
(mkdir-p themesdir) (mkdir-p themesdir)
(invoke "./Install" "-d" themesdir) (invoke "./install.sh" "-d" themesdir)
#t)))) #t))))
(inputs (inputs
`(("gtk-engines" ,gtk-engines))) `(("gtk-engines" ,gtk-engines)))
@ -92,7 +92,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
(define-public delft-icon-theme (define-public delft-icon-theme
(package (package
(name "delft-icon-theme") (name "delft-icon-theme")
(version "1.11") (version "1.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -101,7 +101,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) "1r6b6jf793jxz15ljniwbqy3vcvsl2712qiigfrfrm46fdxlshjd"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
@ -239,7 +239,7 @@ easier to keep track of apps running in the backround.")
(define-public gnome-shell-extension-dash-to-dock (define-public gnome-shell-extension-dash-to-dock
(package (package
(name "gnome-shell-extension-dash-to-dock") (name "gnome-shell-extension-dash-to-dock")
(version "66") (version "67")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -248,7 +248,7 @@ easier to keep track of apps running in the backround.")
version)))) version))))
(sha256 (sha256
(base32 (base32
"04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh")) "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -554,8 +554,8 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(define-public papirus-icon-theme (define-public papirus-icon-theme
(let ((version "0.0.0") ;; The package does not use semver (let ((version "0.0.0") ;; The package does not use semver
(revision "0") (revision "1")
(tag "20191201")) (tag "20200430"))
(package (package
(name "papirus-icon-theme") (name "papirus-icon-theme")
(version (git-version version revision tag)) (version (git-version version revision tag))
@ -567,7 +567,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(commit tag))) (commit tag)))
(sha256 (sha256
(base32 (base32
"0lnz1kmz28xh1f4slbsx7ycji5hgszyiyprbf5w5fbjhvi5gzw1h")) "19dfiifc7cjwy0nb1hgzryzaijszsyix303xsgk5xbmhpwrv92hq"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

52
gnu/packages/gnome.scm
View File

@ -50,6 +50,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net> ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3228,7 +3229,7 @@ libraries written in C.")
(define-public vte (define-public vte
(package (package
(name "vte") (name "vte")
(version "0.58.3") (version "0.60.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/vte/" (uri (string-append "mirror://gnome/sources/vte/"
@ -3236,11 +3237,15 @@ libraries written in C.")
"vte-" version ".tar.xz")) "vte-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12")))) "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments
`(#:configure-flags
'("-Dvapi=true"
"-D_systemd=false")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("gettext" ,gettext-minimal)
("vala" ,vala) ("vala" ,vala)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("glib" ,glib "bin") ; for glib-genmarshal, etc. ("glib" ,glib "bin") ; for glib-genmarshal, etc.
@ -4435,7 +4440,7 @@ throughout GNOME for API documentation).")
(define-public cogl (define-public cogl
(package (package
(name "cogl") (name "cogl")
(version "1.22.4") (version "1.22.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4443,14 +4448,14 @@ throughout GNOME for API documentation).")
(version-major+minor version) "/" (version-major+minor version) "/"
"cogl-" version ".tar.xz")) "cogl-" version ".tar.xz"))
(sha256 (sha256
(base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj")))) (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"))))
;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to
;; cogl, corresponding changes may be appropriate in mutter as well. ;; cogl, corresponding changes may be appropriate in mutter as well.
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums `(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
;;("xorg-server" ,xorg-server) ; for the test suite ("xorg-server" ,xorg-server-for-tests)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("glib" ,glib) `(("glib" ,glib)
@ -4469,7 +4474,8 @@ throughout GNOME for API documentation).")
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("wayland" ,wayland))) ("wayland" ,wayland)))
(arguments (arguments
`(#:configure-flags (list "--enable-cogl-gst" `(#:disallowed-references (,xorg-server-for-tests)
#:configure-flags (list "--enable-cogl-gst"
"--enable-wayland-egl-platform" "--enable-wayland-egl-platform"
"--enable-wayland-egl-server" "--enable-wayland-egl-server"
@ -4478,19 +4484,18 @@ throughout GNOME for API documentation).")
(string-append "--with-gl-libname=" (string-append "--with-gl-libname="
(assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "mesa")
"/lib/libGL.so")) "/lib/libGL.so"))
;; XXX FIXME: All tests fail, with many warnings printed like this: #:phases
;; _FontTransOpen: Unable to Parse address
;; ${prefix}/share/fonts/X11/misc/
#:tests? #f
#; #:phases
#;
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key tests? inputs #:allow-other-keys)
;; The test suite requires a running X server. (if tests?
(system (format #f "~a/bin/Xvfb :1 &" (begin
(assoc-ref inputs "xorg-server"))) ;; The test suite requires a running X server.
(setenv "DISPLAY" ":1") (system (format #f "~a/bin/Xvfb :1 +extension GLX &"
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")
#t)
(format #t "test suite not run~%"))
#t))))) #t)))))
(home-page "https://www.cogl3d.org") (home-page "https://www.cogl3d.org")
(synopsis "Object oriented GL/GLES Abstraction/Utility Layer") (synopsis "Object oriented GL/GLES Abstraction/Utility Layer")
@ -5691,7 +5696,7 @@ metadata in photo and video files of various formats.")
(define-public shotwell (define-public shotwell
(package (package
(name "shotwell") (name "shotwell")
(version "0.30.8") (version "0.30.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/shotwell/" (uri (string-append "mirror://gnome/sources/shotwell/"
@ -5699,7 +5704,7 @@ metadata in photo and video files of various formats.")
"shotwell-" version ".tar.xz")) "shotwell-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj")))) "1y556yyzfya0310v5wqjkf17hy5lhf028iminvvgi2pdfva344id"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
@ -9198,7 +9203,7 @@ mp3, Ogg Vorbis and FLAC")
(define-public soundconverter (define-public soundconverter
(package (package
(name "soundconverter") (name "soundconverter")
(version "3.0.1") (version "3.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -9207,10 +9212,7 @@ mp3, Ogg Vorbis and FLAC")
"soundconverter-" version ".tar.xz")) "soundconverter-" version ".tar.xz"))
(sha256 (sha256
(base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5")) (base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11"))))
(patches
(search-patches
"soundconverter-remove-gconf-dependency.patch"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)

8
gnu/packages/gnustep.scm
View File

@ -158,7 +158,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.")
(define-public wmbattery (define-public wmbattery
(package (package
(name "wmbattery") (name "wmbattery")
(version "2.51") (version "2.54")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -166,7 +166,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.")
version ".orig.tar.gz")) version ".orig.tar.gz"))
(sha256 (sha256
(base32 (base32
"084a3irxbmgms4bqaga80mlx9wgvlkx6d2w0ns939yrpfzg87laj")))) "1r4n58mwkm69y1pjs7l64hg8r1lpndrzyrfl2rdgd4zi6v0jhyyw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no "check" target (arguments '(#:tests? #f)) ; no "check" target
(inputs (inputs
@ -176,9 +176,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.")
("libxpm" ,libxpm) ("libxpm" ,libxpm)
("upower" ,upower))) ("upower" ,upower)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("pkg-config" ,pkg-config)))
("automake" ,automake)
("pkg-config" ,pkg-config)))
(home-page "https://www.dockapps.net/wmbattery") (home-page "https://www.dockapps.net/wmbattery")
(synopsis "Display laptop battery info") (synopsis "Display laptop battery info")
(description (description

4
gnu/packages/graphviz.scm
View File

@ -316,8 +316,8 @@ structure and layout algorithms.")
(synopsis "Interactive viewer for graphviz dot files") (synopsis "Interactive viewer for graphviz dot files")
(description "Xdot is an interactive viewer for graphs written in (description "Xdot is an interactive viewer for graphs written in
@code{graphviz}’s dot language. Internally, it uses the xdot output format as @code{graphviz}’s dot language. Internally, it uses the xdot output format as
an intermediate format,and @code{gtk} and @code{cairo} for rendering. Xdot can an intermediate format, and @code{gtk} and @code{cairo} for rendering. Xdot
be used either as a standalone application, or as a python library.") can be used either as a standalone application, or as a Python library.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public python-pydot (define-public python-pydot

5
gnu/packages/gtk.scm
View File

@ -318,14 +318,14 @@ functions which were removed.")
(define-public ganv (define-public ganv
(package (package
(name "ganv") (name "ganv")
(version "1.4.2") (version "1.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.drobilla.net/ganv-" (uri (string-append "https://download.drobilla.net/ganv-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -337,7 +337,6 @@ functions which were removed.")
(string-append "-Wl,-rpath=" (string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib")) (assoc-ref outputs "out") "/lib"))
#t))) #t)))
#:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0.
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(inputs (inputs
`(("gtk" ,gtk+-2) `(("gtk" ,gtk+-2)

134
gnu/packages/guile-xyz.scm
View File

@ -1353,16 +1353,16 @@ PostgreSQL.")
(define-public guile-config (define-public guile-config
(package (package
(name "guile-config") (name "guile-config")
(version "0.3.1") (version "0.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-config") (url "https://gitlab.com/a-sassmannshausen/guile-config")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 (sha256 (base32
"0gglsqwpw77gvrqcny8irpqfl7qdf2v8n9ggwrswanxalj4vcbvf")))) "1c59ch96d5p4c7si8qp55fdc15375klf2hyh29y3ap8ahqx9pxqj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -1397,16 +1397,16 @@ above command-line parameters.")
(define-public guile-hall (define-public guile-hall
(package (package
(name "guile-hall") (name "guile-hall")
(version "0.2.1") (version "0.3.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-hall") (url "https://gitlab.com/a-sassmannshausen/guile-hall")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name "guile-hall-0.3.1-checkout")
(sha256 (base32 (sha256
"0dwx5iyg0dmdf64wq0b4w306bapr86jwnw35npgbjq4cqm8qbzqn")))) (base32 "1s24nigdra6rvclvy15l2aw00c3aq9vv8qwxylzs60darbl36206"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules `(#:modules
@ -2375,67 +2375,69 @@ The picture values can directly be displayed in Geiser.")
guile-picture-language)) guile-picture-language))
(define-public guile-studio (define-public guile-studio
(package (let ((commit "d24d59a68e3f1fa9477e3430fc48a2efe97b805d")
(name "guile-studio") (revision "1"))
(version "0.0.2") (package
(source (origin (name "guile-studio")
(method git-fetch) (version (git-version "0.0.2" revision commit))
(uri (git-reference (source (origin
(url "https://git.elephly.net/software/guile-studio.git") (method git-fetch)
(commit version))) (uri (git-reference
(file-name (git-file-name name version)) (url "https://git.elephly.net/software/guile-studio.git")
(sha256 (commit commit)))
(base32 (file-name (git-file-name name version))
"10ls4ra148hd9ra7sin4kh9vv0am5pwk48p7dsjhrlg2l1hsh4hi")))) (sha256
(build-system gnu-build-system) (base32
(arguments "0kqi0q8a7si65n21b7gn8vbninwcg0fqy5hmvy3l1bi6iync20zr"))))
`(#:modules (build-system gnu-build-system)
((ice-9 match) (arguments
(srfi srfi-1) `(#:modules
,@%gnu-build-system-modules) ((ice-9 match)
#:tests? #f ; there are none (srfi srfi-1)
#:make-flags ,@%gnu-build-system-modules)
(list (string-append "ICONS_DIR=" #:tests? #f ; there are none
(assoc-ref %build-inputs "adwaita-icon-theme") #:make-flags
"/share/icons/Adwaita/") (list (string-append "ICONS_DIR="
(string-append "PICT_DIR=" (assoc-ref %build-inputs "adwaita-icon-theme")
(assoc-ref %build-inputs "guile-picture-language")) "/share/icons/Adwaita/")
(string-append "EMACS_DIR=" (string-append "PICT_DIR="
(assoc-ref %build-inputs "emacs")) (assoc-ref %build-inputs "guile-picture-language"))
(string-append "GUILE_DIR=" (string-append "EMACS_DIR="
(assoc-ref %build-inputs "guile")) (assoc-ref %build-inputs "emacs"))
(string-join (cons "INPUTS=" (string-append "GUILE_DIR="
(filter-map (assoc-ref %build-inputs "guile"))
(lambda (input) (string-join (cons "INPUTS="
(match input (filter-map
((label . pkg) (lambda (input)
(and (string-prefix? "emacs" label) pkg)))) (match input
%build-inputs))) ((label . pkg)
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (and (string-prefix? "emacs" label) pkg))))
#:phases %build-inputs)))
(modify-phases %standard-phases (string-append "PREFIX=" (assoc-ref %outputs "out")))
(delete 'configure) #:phases
(delete 'install)))) (modify-phases %standard-phases
(inputs (delete 'configure)
`(("guile" ,guile-2.2) (delete 'install))))
("guile-picture-language" ,guile-picture-language) (inputs
("emacs" ,emacs) `(("guile" ,guile-3.0)
("emacs-geiser" ,emacs-geiser) ("guile-picture-language" ,guile-picture-language)
("emacs-company" ,emacs-company) ("emacs" ,emacs)
("emacs-flycheck" ,emacs-flycheck) ("emacs-geiser" ,emacs-geiser)
("emacs-smart-mode-line" ,emacs-smart-mode-line) ("emacs-company" ,emacs-company)
("emacs-paren-face" ,emacs-paren-face) ("emacs-flycheck" ,emacs-flycheck)
("adwaita-icon-theme" ,adwaita-icon-theme))) ("emacs-smart-mode-line" ,emacs-smart-mode-line)
(native-inputs ("emacs-paren-face" ,emacs-paren-face)
`(("texinfo" ,texinfo))) ("adwaita-icon-theme" ,adwaita-icon-theme)))
(home-page "https://gnu.org/software/guile") (native-inputs
(synopsis "IDE for Guile") `(("texinfo" ,texinfo)))
(description (home-page "https://gnu.org/software/guile")
"This is Emacs with a few settings that make working with Guile easier (synopsis "IDE for Guile")
(description
"This is Emacs with a few settings that make working with Guile easier
for people new to Emacs. Features include: CUA mode, Geiser, tool bar icons for people new to Emacs. Features include: CUA mode, Geiser, tool bar icons
to evaluate Guile buffers, support for Guile's very own picture language, code to evaluate Guile buffers, support for Guile's very own picture language, code
completion, a simple mode line, etc.") completion, a simple mode line, etc.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public guile-stis-parser (define-public guile-stis-parser
(let ((commit "6e85d37ffc333b722f4413a6c648263701eb75bd") (let ((commit "6e85d37ffc333b722f4413a6c648263701eb75bd")

256
gnu/packages/jami.scm
View File

@ -59,7 +59,8 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils)
#:use-module (srfi srfi-1))
(define %jami-version "20200401.1.6f090de") (define %jami-version "20200401.1.6f090de")
@ -186,6 +187,257 @@
"selftest: pjlib-test pjlib-util-test pjmedia-test")) "selftest: pjlib-test pjlib-util-test pjmedia-test"))
#t))))))) #t)))))))
;; The following variables are configure flags used by ffmpeg-jami. They're
;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to
;; keep it as close to the official Jami package as possible, to provide all
;; the codecs and extra features that are expected.
;;
;; See:
;; https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak
(define %ffmpeg-default-configure-flags
'("--disable-everything"
"--enable-zlib"
"--enable-gpl"
"--enable-swscale"
"--enable-bsfs"
"--disable-filters"
"--disable-programs"
"--disable-postproc"
"--disable-protocols"
"--enable-protocol=crypto"
"--enable-protocol=file"
"--enable-protocol=rtp"
"--enable-protocol=srtp"
"--enable-protocol=tcp"
"--enable-protocol=udp"
"--enable-protocol=unix"
"--enable-protocol=pipe"
;; enable muxers/demuxers
"--disable-demuxers"
"--disable-muxers"
"--enable-muxer=rtp"
"--enable-muxer=g722"
"--enable-muxer=h263"
"--enable-muxer=h264"
"--enable-muxer=hevc"
"--enable-muxer=webm"
"--enable-muxer=ogg"
"--enable-muxer=pcm_s16be"
"--enable-muxer=pcm_s16le"
"--enable-demuxer=rtp"
"--enable-demuxer=mjpeg"
"--enable-demuxer=mjpeg_2000"
"--enable-demuxer=mpegvideo"
"--enable-demuxer=gif"
"--enable-demuxer=image_jpeg_pipe"
"--enable-demuxer=image_png_pipe"
"--enable-demuxer=image_webp_pipe"
"--enable-demuxer=matroska"
"--enable-demuxer=m4v"
"--enable-demuxer=mp3"
"--enable-demuxer=ogg"
"--enable-demuxer=flac"
"--enable-demuxer=wav"
"--enable-demuxer=ac3"
"--enable-demuxer=g722"
"--enable-demuxer=pcm_mulaw"
"--enable-demuxer=pcm_alaw"
"--enable-demuxer=pcm_s16be"
"--enable-demuxer=pcm_s16le"
"--enable-demuxer=h263"
"--enable-demuxer=h264"
"--enable-demuxer=hevc"
;; enable parsers
"--enable-parser=h263"
"--enable-parser=h264"
"--enable-parser=hevc"
"--enable-parser=mpeg4video"
"--enable-parser=vp8"
"--enable-parser=vp9"
"--enable-parser=opus"
;; encoders/decoders
"--enable-encoder=adpcm_g722"
"--enable-decoder=adpcm_g722"
"--enable-encoder=rawvideo"
"--enable-decoder=rawvideo"
"--enable-encoder=libx264"
"--enable-decoder=h264"
"--enable-encoder=pcm_alaw"
"--enable-decoder=pcm_alaw"
"--enable-encoder=pcm_mulaw"
"--enable-decoder=pcm_mulaw"
"--enable-encoder=mpeg4"
"--enable-decoder=mpeg4"
"--enable-encoder=libvpx_vp8"
"--enable-decoder=vp8"
"--enable-decoder=vp9"
"--enable-encoder=h263"
"--enable-encoder=h263p"
"--enable-decoder=h263"
"--enable-encoder=mjpeg"
"--enable-decoder=mjpeg"
"--enable-decoder=mjpegb"
"--enable-libspeex"
"--enable-libopus"
"--enable-libvpx"
"--enable-libx264"
"--enable-encoder=libspeex"
"--enable-decoder=libspeex"
"--enable-encoder=libopus"
"--enable-decoder=libopus"
;; decoders for ringtones and audio streaming
"--enable-decoder=flac"
"--enable-decoder=vorbis"
"--enable-decoder=aac"
"--enable-decoder=ac3"
"--enable-decoder=eac3"
"--enable-decoder=mp3"
"--enable-decoder=pcm_u24be"
"--enable-decoder=pcm_u24le"
"--enable-decoder=pcm_u32be"
"--enable-decoder=pcm_u32le"
"--enable-decoder=pcm_u8"
"--enable-decoder=pcm_f16le"
"--enable-decoder=pcm_f24le"
"--enable-decoder=pcm_f32be"
"--enable-decoder=pcm_f32le"
"--enable-decoder=pcm_f64be"
"--enable-decoder=pcm_f64le"
"--enable-decoder=pcm_s16be"
"--enable-decoder=pcm_s16be_planar"
"--enable-decoder=pcm_s16le"
"--enable-decoder=pcm_s16le_planar"
"--enable-decoder=pcm_s24be"
"--enable-decoder=pcm_s24le"
"--enable-decoder=pcm_s24le_planar"
"--enable-decoder=pcm_s32be"
"--enable-decoder=pcm_s32le"
"--enable-decoder=pcm_s32le_planar"
"--enable-decoder=pcm_s64be"
"--enable-decoder=pcm_s64le"
"--enable-decoder=pcm_s8"
"--enable-decoder=pcm_s8_planar"
"--enable-decoder=pcm_u16be"
"--enable-decoder=pcm_u16le"
;; encoders/decoders for images
"--enable-encoder=gif"
"--enable-decoder=gif"
"--enable-encoder=jpegls"
"--enable-decoder=jpegls"
"--enable-encoder=ljpeg"
"--enable-decoder=jpeg2000"
"--enable-encoder=png"
"--enable-decoder=png"
"--enable-encoder=bmp"
"--enable-decoder=bmp"
"--enable-encoder=tiff"
"--enable-decoder=tiff"
;; filters
"--enable-filter=scale"
"--enable-filter=overlay"
"--enable-filter=amix"
"--enable-filter=amerge"
"--enable-filter=aresample"
"--enable-filter=format"
"--enable-filter=aformat"
"--enable-filter=fps"
"--enable-filter=transpose"
"--enable-filter=pad"))
(define %ffmpeg-linux-configure-flags
'("--enable-pic"
"--extra-cxxflags=-fPIC"
"--extra-cflags=-fPIC"
"--target-os=linux"
"--enable-indev=v4l2"
"--enable-indev=xcbgrab"
"--enable-vdpau"
"--enable-hwaccel=h264_vdpau"
"--enable-hwaccel=mpeg4_vdpau"
"--enable-vaapi"
"--enable-hwaccel=h264_vaapi"
"--enable-hwaccel=mpeg4_vaapi"
"--enable-hwaccel=h263_vaapi"
"--enable-hwaccel=vp8_vaapi"
"--enable-hwaccel=mjpeg_vaapi"
"--enable-hwaccel=hevc_vaapi"
"--enable-encoder=h264_vaapi"
"--enable-encoder=vp8_vaapi"
"--enable-encoder=mjpeg_vaapi"
"--enable-encoder=hevc_vaapi"))
;; ffnvcodec is not supported on ARM then we enable it here for i386 and
;; x86_64 architectures.
(define %ffmpeg-linux-x86-configure-flags
'("--arch=x86"
"--enable-cuvid"
"--enable-ffnvcodec"
"--enable-nvdec"
"--enable-nvenc"
"--enable-hwaccel=h264_nvdec"
"--enable-hwaccel=hevc_nvdec"
"--enable-hwaccel=vp8_nvdec"
"--enable-hwaccel=mjpeg_nvdec"
"--enable-encoder=h264_nvenc"
"--enable-encoder=hevc_nvenc"))
;; This procedure composes the configure flags list for ffmpeg-jami.
(define (ffmpeg-compose-configure-flags)
(define (system=? s)
(string-prefix? s (%current-system)))
`(,@%ffmpeg-default-configure-flags
,@(if (string-contains (%current-system) "linux")
(if (or (system=? "i686")
(system=? "x86_64"))
(append %ffmpeg-linux-configure-flags
%ffmpeg-linux-x86-configure-flags)
%ffmpeg-linux-configure-flags)
'())))
(define-public ffmpeg-jami
(package
(inherit ffmpeg)
(name "ffmpeg-jami")
(native-inputs
`(("sfl-patches" ,(jami-source))
("libiconv" ,libiconv)
,@(package-native-inputs ffmpeg)))
(supported-systems '("x86_64-linux" "i686-linux"
"aarch64-linux" "armhf-linux"))
(arguments
(append
'(#:tests? #f)
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags '())
(ffmpeg-compose-configure-flags))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'make-git-checkout-writable
(lambda _
(for-each make-file-writable (find-files "."))
#t))
(add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
(let ((jami-apply-dependency-patches
,jami-apply-dependency-patches))
;; These patches come from:
;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak".
(jami-apply-dependency-patches #:inputs inputs
#:dep-name "ffmpeg"
#:patches
'("remove-mjpeg-log"
"change-RTCP-ratio"
"rtp_ext_abs_send_time"))
#t))))))))))
(define-public libring (define-public libring
(package (package
(name "libring") (name "libring")
@ -197,7 +449,7 @@
("boost" ,boost) ("boost" ,boost)
("dbus-c++" ,dbus-c++) ("dbus-c++" ,dbus-c++)
("eudev" ,eudev) ("eudev" ,eudev)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-jami)
("flac" ,flac) ("flac" ,flac)
("gmp" ,gmp) ("gmp" ,gmp)
("gsm" ,gsm) ("gsm" ,gsm)

4
gnu/packages/java-compression.scm
View File

@ -282,9 +282,9 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} /
@code{CBZip2OutputStream} classes.") @code{CBZip2OutputStream} classes.")
(license license:expat))) (license license:expat)))
(define-public java-tukaani-xz (define-public java-xz
(package (package
(name "java-tukaani-xz") (name "java-xz")
(version "1.6") (version "1.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)

206
gnu/packages/java.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2019 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2017, 2019 Carlo Zancanaro <carlo@zancanaro.id.au>
@ -1808,14 +1808,14 @@ new Date();"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.bin$")) (for-each delete-file
(for-each delete-file (find-files "." ".*.exe$")) (find-files "." ".*.(bin|exe|jar)$"))
(for-each delete-file (find-files "." ".*.jar$"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
`(#:tests? #f; require jtreg `(#:tests? #f; require jtreg
#:make-flags '("all")
#:imported-modules #:imported-modules
((guix build syscalls) ((guix build syscalls)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
@ -1840,14 +1840,20 @@ new Date();"))
"--with-libjpeg=system" "--with-libjpeg=system"
(string-append "--prefix=" (assoc-ref outputs "out"))) (string-append "--prefix=" (assoc-ref outputs "out")))
#t)) #t))
(replace 'build (add-before 'build 'write-source-revision-file
(lambda _ (lambda _
(with-output-to-file ".src-rev" (with-output-to-file ".src-rev"
(lambda _ (lambda _
(display ,version))) (display ,version)))
(setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes")
(invoke "make" "all")
#t)) #t))
(replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make"
`(,@(if parallel-build?
(list (string-append "JOBS="
(number->string (parallel-job-count))))
'())
,@make-flags))))
;; Some of the libraries in the lib/ folder link to libjvm.so. ;; Some of the libraries in the lib/ folder link to libjvm.so.
;; But that shared object is located in the server/ folder, so it ;; But that shared object is located in the server/ folder, so it
;; cannot be found. This phase creates a symbolic link in the ;; cannot be found. This phase creates a symbolic link in the
@ -1920,8 +1926,7 @@ new Date();"))
(native-inputs (native-inputs
`(("icedtea-8" ,icedtea-8) `(("icedtea-8" ,icedtea-8)
("icedtea-8:jdk" ,icedtea-8 "jdk") ("icedtea-8:jdk" ,icedtea-8 "jdk")
;; XXX: The build system is not particularly parallel safe and ;; XXX: The build system fails with newer versions of GNU Make.
;; fails with newer versions of GNU Make.
("make@4.2" ,gnu-make-4.2) ("make@4.2" ,gnu-make-4.2)
("unzip" ,unzip) ("unzip" ,unzip)
("which" ,which) ("which" ,which)
@ -1949,9 +1954,7 @@ new Date();"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.bin$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
(for-each delete-file (find-files "." ".*.exe$"))
(for-each delete-file (find-files "." ".*.jar$"))
#t)))) #t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk9) (substitute-keyword-arguments (package-arguments openjdk9)
@ -1998,9 +2001,7 @@ new Date();"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.bin$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
(for-each delete-file (find-files "." ".*.exe$"))
(for-each delete-file (find-files "." ".*.jar$"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
@ -2012,11 +2013,6 @@ new Date();"))
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:tests? #f; requires jtreg #:tests? #f; requires jtreg
;; TODO package jtreg ;; TODO package jtreg
;; disable parallel builds, as the openjdk build system does not like -j
#:parallel-build? #f
#:parallel-tests? #f
;; reenable parallel builds and tests by adding the flags manually
#:make-flags (list (string-append "JOBS=" (number->string (parallel-job-count))))
#:configure-flags #:configure-flags
`("--disable-option-checking" ; --enable-fast-install default flag errors otherwise `("--disable-option-checking" ; --enable-fast-install default flag errors otherwise
"--disable-warnings-as-errors" "--disable-warnings-as-errors"
@ -2033,7 +2029,6 @@ new Date();"))
(assoc-ref %build-inputs "freetype") "/include") (assoc-ref %build-inputs "freetype") "/include")
,(string-append "--with-freetype-lib=" ,(string-append "--with-freetype-lib="
(assoc-ref %build-inputs "freetype") "/lib")) (assoc-ref %build-inputs "freetype") "/lib"))
;; TODO
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'fix-java-shebangs (add-after 'patch-source-shebangs 'fix-java-shebangs
@ -2043,22 +2038,32 @@ new Date();"))
(substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem"
(("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))
#t)) #t))
(replace 'build (add-before 'build 'write-source-revision-file
(lambda _ (lambda _
(with-output-to-file ".src-rev" (with-output-to-file ".src-rev"
(lambda _ (lambda _
(display ,version))) (display ,version)))
(setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes")
(invoke "make" "all")
#t)) #t))
(replace 'build
(lambda* (#:key parallel-build? make-flags #:allow-other-keys)
(apply invoke "make" "all"
`(,@(if parallel-build?
(list (string-append "JOBS="
(number->string (parallel-job-count))))
'())
,@make-flags))))
;; jdk 11 does not build jre by default any more ;; jdk 11 does not build jre by default any more
;; building it anyways ;; building it anyways
;; for further information see: ;; for further information see:
;; https://github.com/AdoptOpenJDK/openjdk-build/issues/356 ;; https://github.com/AdoptOpenJDK/openjdk-build/issues/356
(add-after 'build 'build-jre (add-after 'build 'build-jre
(lambda _ (lambda* (#:key parallel-build? make-flags #:allow-other-keys)
(invoke "make" "legacy-jre-image") (apply invoke "make" "legacy-jre-image"
#t)) `(,@(if parallel-build?
(list (string-append "JOBS="
(number->string (parallel-job-count))))
'())
,@make-flags))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -2226,9 +2231,7 @@ new Date();"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.bin$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
(for-each delete-file (find-files "." ".*.exe$"))
(for-each delete-file (find-files "." ".*.jar$"))
#t)))) #t))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -2256,6 +2259,94 @@ new Date();"))
("zip" ,zip))) ("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/12"))) (home-page "https://openjdk.java.net/projects/jdk/12")))
(define-public openjdk13
(package
(inherit openjdk12)
(name "openjdk")
(version "13.0")
(source (origin
(method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
"0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq"))
(modules '((guix build utils)))
(snippet
`(begin
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t))))
(inputs
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("giflib" ,giflib)
("lcms" ,lcms)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxext" ,libxext)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
("libxt" ,libxt)
("libxtst" ,libxtst)))
(native-inputs
`(("autoconf" ,autoconf)
("openjdk12:jdk" ,openjdk12 "jdk")
("make@4.2" ,gnu-make-4.2)
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/13")))
(define-public openjdk14
(package
(inherit openjdk13)
(name "openjdk")
(version "14.0")
(source (origin
(method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
"0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch"))
(modules '((guix build utils)))
(snippet
`(begin
;; The m4 macro uses 'help' to search for builtins, which is
;; not available in bash-minimal
(substitute* "make/autoconf/basics.m4"
(("if help") "if command -v"))
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t))))
(inputs
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("giflib" ,giflib)
("lcms" ,lcms)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxext" ,libxext)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
("libxt" ,libxt)
("libxtst" ,libxtst)))
(native-inputs
`(("autoconf" ,autoconf)
("make@4.2" ,gnu-make-4.2)
("openjdk13:jdk" ,openjdk13 "jdk")
("pkg-config" ,pkg-config)
("unzip" ,unzip)
("which" ,which)
("zip" ,zip)))
(home-page "https://openjdk.java.net/projects/jdk/14")))
(define-public icedtea icedtea-8) (define-public icedtea icedtea-8)
@ -3312,34 +3403,6 @@ is implemented.")
license:mpl2.0 license:mpl2.0
license:lgpl2.1+)))) license:lgpl2.1+))))
(define-public java-xz
(package
(name "java-xz")
(version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "http://tukaani.org/xz/xz-java-" version ".zip"))
(sha256
(base32
"1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x"))))
(build-system ant-build-system)
(arguments
`(#:tests? #f ; There are no tests to run.
#:jar-name ,(string-append "xz-" version ".jar")
#:phases
(modify-phases %standard-phases
;; The unpack phase enters the "maven" directory by accident.
(add-after 'unpack 'chdir
(lambda _ (chdir "..") #t)))))
(native-inputs
`(("unzip" ,unzip)))
(home-page "https://tukaani.org/xz/java.html")
(synopsis "Implementation of XZ data compression in pure Java")
(description "This library aims to be a complete implementation of XZ data
compression in pure Java. Single-threaded streamed compression and
decompression and random access decompression have been fully implemented.")
(license license:public-domain)))
;; java-hamcrest-core uses qdox version 1.12. We package this version instead ;; java-hamcrest-core uses qdox version 1.12. We package this version instead
;; of the latest release. ;; of the latest release.
(define-public java-qdox-1.12 (define-public java-qdox-1.12
@ -3866,7 +3929,7 @@ reusing it in maven.")
("junit" ,java-junit) ("junit" ,java-junit)
("classworld" ,java-plexus-classworlds) ("classworld" ,java-plexus-classworlds)
("xbean" ,java-geronimo-xbean-reflect) ("xbean" ,java-geronimo-xbean-reflect)
("xz" ,java-tukaani-xz) ("xz" ,java-xz)
("guava" ,java-guava))) ("guava" ,java-guava)))
(home-page "https://github.com/codehaus-plexus/plexus-archiver") (home-page "https://github.com/codehaus-plexus/plexus-archiver")
(synopsis "Archiver component of the Plexus project") (synopsis "Archiver component of the Plexus project")
@ -11852,3 +11915,28 @@ involving one or more shared resources having ACID (Atomicity, Consistency,
Isolation and Durability) properties.") Isolation and Durability) properties.")
;; either gpl2 only with classpath exception or cddl. ;; either gpl2 only with classpath exception or cddl.
(license (list license:gpl2 license:cddl1.0)))) (license (list license:gpl2 license:cddl1.0))))
(define-public java-picocli
(package
(name "java-picocli")
(version "4.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/remkop/picocli")
(commit (string-append "v" version))))
(sha256
(base32
"1sxp6rxjfgjd98ly14b3d15dvxkm5wg4g46w12jyhmr0kmkaca3c"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "picocli.jar"
#:source-dir "src/main/java"
;; Tests require missing dependencies (junitparams, system-rules)
#:tests? #f))
(home-page "https://picocli.info")
(synopsis "REPL for the JVM")
(description "Picocli is a framework for building command line applications
for the JVM. It supports colors, autocompletion, subcommands, and more. Written
in Java, usable from Groovy, Kotlin, Scala, etc.")
(license license:asl2.0)))

2
gnu/packages/julia.scm
View File

@ -416,7 +416,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(assoc-ref %build-inputs "utf8proc") (assoc-ref %build-inputs "utf8proc")
"/include") "/include")
"USE_SYSTEM_LLVM=1" "USE_SYSTEM_LLVM=1"
"LLVM_VER=6.0.1" "LLVM_VER=8.0.0"
"USE_LLVM_SHLIB=1" "USE_LLVM_SHLIB=1"
"USE_SYSTEM_LIBUNWIND=1" "USE_SYSTEM_LIBUNWIND=1"

35
gnu/packages/kde.scm
View File

@ -329,14 +329,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
(define-public kdiagram (define-public kdiagram
(package (package
(name "kdiagram") (name "kdiagram")
(version "2.6.1") (version "2.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/kdiagram/" version (uri (string-append "mirror://kde/stable/kdiagram/" version
"/kdiagram-" version ".tar.xz")) "/kdiagram-" version ".tar.xz"))
(sha256 (sha256
(base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx")) (base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3"))
(patches (search-patches (patches (search-patches
"kdiagram-Fix-missing-link-libraries.patch")))) "kdiagram-Fix-missing-link-libraries.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
@ -360,7 +360,7 @@ illustrate project schedules.")
(define-public krita (define-public krita
(package (package
(name "krita") (name "krita")
(version "4.2.7.1") (version "4.2.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -368,14 +368,14 @@ illustrate project schedules.")
"/krita-" version ".tar.gz")) "/krita-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy")))) "1a3djmjhnvlp8dpiz68s0lwg71nv3ypq592jfgsnm5zlxa0vp1cz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:configure-flags #:configure-flags
(list "-DBUILD_TESTING=OFF" (list "-DBUILD_TESTING=OFF"
(string-append "-DCMAKE_CXX_FLAGS=-I" (string-append "-DCMAKE_CXX_FLAGS=-I"
(assoc-ref %build-inputs "ilmbase") (assoc-ref %build-inputs "openexr")
"/include/OpenEXR")) "/include/OpenEXR"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -449,14 +449,14 @@ features include brush stabilizers, brush engines and wrap-around mode.")
(define-public libkomparediff2 (define-public libkomparediff2
(package (package
(name "libkomparediff2") (name "libkomparediff2")
(version "19.08.2") (version "19.08.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/applications/" version (uri (string-append "mirror://kde/stable/applications/" version
"/src/libkomparediff2-" version ".tar.xz")) "/src/libkomparediff2-" version ".tar.xz"))
(sha256 (sha256
(base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5")))) (base32 "0p8j24d0lzylv5crdzak87016ppgph5hiyxkvapda1m8zlb5dfm1"))))
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -481,7 +481,7 @@ used in KDE development tools Kompare and KDevelop.")
(define-public qca (define-public qca
(package (package
(name "qca") (name "qca")
(version "2.2.1") (version "2.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -489,7 +489,7 @@ used in KDE development tools Kompare and KDevelop.")
"/qca-" version ".tar.xz")) "/qca-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np")))) "1mrj748yz1grgzmfbmffgjkpcqiaj1l3m4pbddwcj7dnl50yys0x"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -507,7 +507,7 @@ cards.")
(define-public kpmcore (define-public kpmcore
(package (package
(name "kpmcore") (name "kpmcore")
(version "4.0.1") (version "4.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -516,9 +516,7 @@ cards.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3")) "0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm"))))
(patches (search-patches "kpmcore-fix-tests.patch"
"kpmcore-remove-broken-test.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
@ -578,7 +576,8 @@ different notification systems.")
"02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_TESTING=ON") `(#:configure-flags '("-DBUILD_TESTING=ON"
"-DLIBEXEC_INSTALL_DIR=libexec")
#:tests? #f)) ; tests fail hard in our build environment #:tests? #f)) ; tests fail hard in our build environment
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
@ -621,7 +620,7 @@ communicate with each other. Here's a few things KDE Connect can do:
(define-public kqtquickcharts (define-public kqtquickcharts
(package (package
(name "kqtquickcharts") (name "kqtquickcharts")
(version "19.08.2") (version "19.08.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -629,7 +628,7 @@ communicate with each other. Here's a few things KDE Connect can do:
version "/src/kqtquickcharts-" version ".tar.xz")) version "/src/kqtquickcharts-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k")))) "0kwrqm7aa74plqkkyigi6b2hic6dzrygkgb6hsgj35ycrfn4rigi"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules))) `(("extra-cmake-modules" ,extra-cmake-modules)))
@ -646,14 +645,14 @@ charts.")
(define-public kcachegrind (define-public kcachegrind
(package (package
(name "kcachegrind") (name "kcachegrind")
(version "19.04.1") (version "19.08.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kde/stable/applications/" version (uri (string-append "mirror://kde/stable/applications/" version
"/src/kcachegrind-" version ".tar.xz")) "/src/kcachegrind-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hhsk64yp6q2xh8j269j4wp9y24ggmii861r6gf02mj1mbn2p1jb")))) "0sm3085vd79svfql6nqjyrwlknnmdyyvi0yjnmyb09mq7djf1icg"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)

6
gnu/packages/kerberos.scm
View File

@ -170,7 +170,7 @@ After installation, the system administrator should generate keys using
(define-public heimdal (define-public heimdal
(package (package
(name "heimdal") (name "heimdal")
(version "7.5.0") (version "7.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -178,14 +178,14 @@ After installation, the system administrator should generate keys using
"heimdal-" version "/" "heimdal-" version ".tar.gz")) "heimdal-" version "/" "heimdal-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bdc682in55ygrxmhncs7cf4s239apcblci3z8i80wnc1w1s18n5")) "06vx3cb01s4lv3lpv0qzbbj97cln1np1wjphkkmmbk1lsqa36bgh"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(substitute* "configure" (substitute* "configure"
(("User=.*$") "User=Guix\n") (("User=.*$") "User=Guix\n")
(("Host=.*$") "Host=GNU") (("Host=.*$") "Host=GNU")
(("Date=.*$") "Date=2017\n")) (("Date=.*$") "Date=2019\n"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

69
gnu/packages/linux.scm
View File

@ -370,50 +370,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(sha256 hash))) (sha256 hash)))
(define-public linux-libre-5.6-version "5.6.13") (define-public linux-libre-5.6-version "5.6.14")
(define-public linux-libre-5.6-pristine-source (define-public linux-libre-5.6-pristine-source
(let ((version linux-libre-5.6-version) (let ((version linux-libre-5.6-version)
(hash (base32 "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"))) (hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.6))) deblob-scripts-5.6)))
(define-public linux-libre-5.4-version "5.4.41") (define-public linux-libre-5.4-version "5.4.42")
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"))) (hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.123") (define-public linux-libre-4.19-version "4.19.124")
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"))) (hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.180") (define-public linux-libre-4.14-version "4.14.181")
(define-public linux-libre-4.14-pristine-source (define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version) (let ((version linux-libre-4.14-version)
(hash (base32 "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4"))) (hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.14))) deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.223") (define-public linux-libre-4.9-version "4.9.224")
(define-public linux-libre-4.9-pristine-source (define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version) (let ((version linux-libre-4.9-version)
(hash (base32 "1r9ag1fhy0g429q44qlqh0qkf42qkhzxa04gxlmnrinqypk00lyg"))) (hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.9))) deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.223") (define-public linux-libre-4.4-version "4.4.224")
(define-public linux-libre-4.4-pristine-source (define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version) (let ((version linux-libre-4.4-version)
(hash (base32 "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd"))) (hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.4))) deblob-scripts-4.4)))
@ -3550,9 +3550,9 @@ country-specific regulations for the wireless spectrum.")
(("cat ") (("cat ")
(string-append (assoc-ref inputs "coreutils") (string-append (assoc-ref inputs "coreutils")
"/bin/cat ")) "/bin/cat "))
(("grep ") (("e?grep " match)
(string-append (assoc-ref inputs "grep") (string-append (assoc-ref inputs "grep")
"/bin/grep ")) "/bin/" match))
(("sed -e") (("sed -e")
(string-append (assoc-ref inputs "sed") (string-append (assoc-ref inputs "sed")
"/bin/sed -e")) "/bin/sed -e"))
@ -4191,15 +4191,17 @@ arrays when needed.")
(define-public multipath-tools (define-public multipath-tools
(package (package
(name "multipath-tools") (name "multipath-tools")
(version "0.8.3") (version "0.8.4")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://git.opensvc.com/?p=multipath-tools/" (uri (git-reference
".git;a=snapshot;h=" version ";sf=tgz")) (url "https://git.opensvc.com/multipath-tools/.git")
(file-name (string-append name "-" version ".tar.gz")) (commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1c6ay97wlfv1fl0y8hcfpxhkps14hlnw9gzmj7884micsp7pa9yv")) "14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn"))
(patches (search-patches "multipath-tools-sans-systemd.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -4212,10 +4214,13 @@ arrays when needed.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:test-target "test"
#:parallel-build? #f ;XXX: broken in 0.8.4
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "DESTDIR=" (string-append "DESTDIR="
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
;; Install Udev rules below this directory, relative
;; to the prefix.
"SYSTEMDPATH=lib" "SYSTEMDPATH=lib"
(string-append "LDFLAGS=-Wl,-rpath=" (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
@ -4237,11 +4242,31 @@ arrays when needed.")
(("/usr/include/libudev.h") (("/usr/include/libudev.h")
(string-append udev "/include/libudev.h"))) (string-append udev "/include/libudev.h")))
#t))) #t)))
(add-after 'unpack 'fix-maybe-uninitialized-variable
(lambda _
;; This variable gets initialized later if needed, but GCC 7
;; fails to notice. Should be fixed for > 0.8.4.
;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html
(substitute* "libmultipath/structs_vec.c"
(("bool is_queueing;")
"bool is_queueing = false;"))
#t))
(add-after 'unpack 'fix-linking-tests
(lambda _
;; Add missing linker flag for -lmpathcmd. This should be fixed
;; for versions > 0.8.4.
(substitute* "tests/Makefile"
(("-lmultipath -lcmocka")
"-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))
#t))
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("valgrind" ,valgrind))) ("valgrind" ,valgrind)
;; For tests.
("cmocka" ,cmocka)))
(inputs (inputs
`(("json-c" ,json-c-0.13) `(("json-c" ,json-c-0.13)
("libaio" ,libaio) ("libaio" ,libaio)

353
gnu/packages/lisp-xyz.scm
View File

@ -2876,7 +2876,41 @@ Lisp implementations.")
(inputs (inputs
`(("iterate" ,sbcl-iterate) `(("iterate" ,sbcl-iterate)
("cffi" ,sbcl-cffi) ("cffi" ,sbcl-cffi)
("trivial-features" ,sbcl-trivial-features))) ("trivial-features" ,sbcl-trivial-features)
("glib" ,glib)
("cairo" ,cairo)
("pango" ,pango)
("gdk-pixbuf" ,gdk-pixbuf)
("gtk" ,gtk+)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "glib/glib.init.lisp"
(("libglib|libgthread" all)
(string-append (assoc-ref inputs "glib") "/lib/" all)))
(substitute* "gobject/gobject.init.lisp"
(("libgobject" all)
(string-append (assoc-ref inputs "glib") "/lib/" all)))
(substitute* "gio/gio.init.lisp"
(("libgio" all)
(string-append (assoc-ref inputs "glib") "/lib/" all)))
(substitute* "cairo/cairo.init.lisp"
(("libcairo" all)
(string-append (assoc-ref inputs "cairo") "/lib/" all)))
(substitute* "pango/pango.init.lisp"
(("libpango" all)
(string-append (assoc-ref inputs "pango") "/lib/" all)))
(substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp"
(("libgdk_pixbuf" all)
(string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" all)))
(substitute* "gdk/gdk.init.lisp"
(("libgdk" all)
(string-append (assoc-ref inputs "gtk") "/lib/" all)))
(substitute* "gdk/gdk.package.lisp"
(("libgtk" all)
(string-append (assoc-ref inputs "gtk") "/lib/" all))))))))
(home-page "https://github.com/Ferada/cl-cffi-gtk/") (home-page "https://github.com/Ferada/cl-cffi-gtk/")
(synopsis "Common Lisp binding for GTK+3") (synopsis "Common Lisp binding for GTK+3")
(description (description
@ -2889,192 +2923,155 @@ is a library for creating graphical user interfaces.")
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-glib") (name "sbcl-cl-cffi-gtk-glib")
(inputs (inputs
`(("glib" ,glib) `(("bordeaux-threads" ,sbcl-bordeaux-threads)
("bordeaux-threads" ,sbcl-bordeaux-threads)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "glib/cl-cffi-gtk-glib.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "glib/cl-cffi-gtk-glib.asd")))))
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "glib/glib.init.lisp"
(("libglib|libgthread" all)
(string-append (assoc-ref inputs "glib") "/lib/" all))))))))))
(define-public sbcl-cl-cffi-gtk-gobject (define-public sbcl-cl-cffi-gtk-gobject
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-gobject") (name "sbcl-cl-cffi-gtk-gobject")
(inputs (inputs
`(("glib" ,glib) `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("trivial-garbage" ,sbcl-trivial-garbage) ("trivial-garbage" ,sbcl-trivial-garbage)
("bordeaux-threads" ,sbcl-bordeaux-threads) ("bordeaux-threads" ,sbcl-bordeaux-threads)
("closer-mop" ,sbcl-closer-mop) ("closer-mop" ,sbcl-closer-mop)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "gobject/cl-cffi-gtk-gobject.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "gobject/gobject.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libgobject" all) (string-append ;; across the different components of cl-ffi-gtk.
(assoc-ref inputs "glib") "/lib/" all))))) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-after 'install 'link-source (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
;; Since source is particularly heavy (16MiB+), let's reuse it "/share/common-lisp/sbcl-source/"
;; across the different components of cl-ffi-gtk. "cl-cffi-gtk-glib"))
(lambda* (#:key inputs outputs #:allow-other-keys) (out-source (string-append (assoc-ref outputs "out")
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") "/share/common-lisp/sbcl-source/"
"/share/common-lisp/sbcl-source/" "cl-cffi-gtk-gobject")))
"cl-cffi-gtk-glib")) (delete-file-recursively out-source)
(out-source (string-append (assoc-ref outputs "out") (symlink glib-source out-source)
"/share/common-lisp/sbcl-source/" #t)))))))))
"cl-cffi-gtk-gobject")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk-gio (define-public sbcl-cl-cffi-gtk-gio
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-gio") (name "sbcl-cl-cffi-gtk-gio")
(inputs (inputs
`(("glib" ,glib) `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "gio/cl-cffi-gtk-gio.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "gio/cl-cffi-gtk-gio.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "gio/gio.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libgio" all) ;; across the different components of cl-ffi-gtk.
(string-append (lambda* (#:key inputs outputs #:allow-other-keys)
(assoc-ref inputs "glib") "/lib/" all))))) (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
(add-after 'install 'link-source "/share/common-lisp/sbcl-source/"
;; Since source is particularly heavy (16MiB+), let's reuse it "cl-cffi-gtk-glib"))
;; across the different components of cl-ffi-gtk. (out-source (string-append (assoc-ref outputs "out")
(lambda* (#:key inputs outputs #:allow-other-keys) "/share/common-lisp/sbcl-source/"
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") "cl-cffi-gtk-gio")))
"/share/common-lisp/sbcl-source/" (delete-file-recursively out-source)
"cl-cffi-gtk-glib")) (symlink glib-source out-source)
(out-source (string-append (assoc-ref outputs "out") #t)))))))))
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-gio")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk-cairo (define-public sbcl-cl-cffi-gtk-cairo
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-cairo") (name "sbcl-cl-cffi-gtk-cairo")
(inputs (inputs
`(("cairo" ,cairo) `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "cairo/cl-cffi-gtk-cairo.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "cairo/cairo.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libcairo" all) ;; across the different components of cl-ffi-gtk.
(string-append (lambda* (#:key inputs outputs #:allow-other-keys)
(assoc-ref inputs "cairo") "/lib/" all))))) (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
(add-after 'install 'link-source "/share/common-lisp/sbcl-source/"
;; Since source is particularly heavy (16MiB+), let's reuse it "cl-cffi-gtk-glib"))
;; across the different components of cl-ffi-gtk. (out-source (string-append (assoc-ref outputs "out")
(lambda* (#:key inputs outputs #:allow-other-keys) "/share/common-lisp/sbcl-source/"
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") "cl-cffi-gtk-cairo")))
"/share/common-lisp/sbcl-source/" (delete-file-recursively out-source)
"cl-cffi-gtk-glib")) (symlink glib-source out-source)
(out-source (string-append (assoc-ref outputs "out") #t)))))))))
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-cairo")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk-pango (define-public sbcl-cl-cffi-gtk-pango
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-pango") (name "sbcl-cl-cffi-gtk-pango")
(inputs (inputs
`(("pango" ,pango) `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject)
("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "pango/cl-cffi-gtk-pango.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "pango/cl-cffi-gtk-pango.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "pango/pango.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libpango" all) ;; across the different components of cl-ffi-gtk.
(string-append (lambda* (#:key inputs outputs #:allow-other-keys)
(assoc-ref inputs "pango") "/lib/" all))))) (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
(add-after 'install 'link-source "/share/common-lisp/sbcl-source/"
;; Since source is particularly heavy (16MiB+), let's reuse it "cl-cffi-gtk-glib"))
;; across the different components of cl-ffi-gtk. (out-source (string-append (assoc-ref outputs "out")
(lambda* (#:key inputs outputs #:allow-other-keys) "/share/common-lisp/sbcl-source/"
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") "cl-cffi-gtk-pango")))
"/share/common-lisp/sbcl-source/" (delete-file-recursively out-source)
"cl-cffi-gtk-glib")) (symlink glib-source out-source)
(out-source (string-append (assoc-ref outputs "out") #t)))))))))
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-pango")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk-gdk-pixbuf (define-public sbcl-cl-cffi-gtk-gdk-pixbuf
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-gdk-pixbuf") (name "sbcl-cl-cffi-gtk-gdk-pixbuf")
(inputs (inputs
`(("gdk-pixbuf" ,gdk-pixbuf) `(("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject)
("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libgdk_pixbuf" all) ;; across the different components of cl-ffi-gtk.
(string-append (lambda* (#:key inputs outputs #:allow-other-keys)
(assoc-ref inputs "gdk-pixbuf") "/lib/" all))))) (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
(add-after 'install 'link-source "/share/common-lisp/sbcl-source/"
;; Since source is particularly heavy (16MiB+), let's reuse it "cl-cffi-gtk-glib"))
;; across the different components of cl-ffi-gtk. (out-source (string-append (assoc-ref outputs "out")
(lambda* (#:key inputs outputs #:allow-other-keys) "/share/common-lisp/sbcl-source/"
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") "cl-cffi-gtk-gdk-pixbuf")))
"/share/common-lisp/sbcl-source/" (delete-file-recursively out-source)
"cl-cffi-gtk-glib")) (symlink glib-source out-source)
(out-source (string-append (assoc-ref outputs "out") #t)))))))))
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-gdk-pixbuf")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk-gdk (define-public sbcl-cl-cffi-gtk-gdk
(package (package
(inherit sbcl-cl-cffi-gtk-boot0) (inherit sbcl-cl-cffi-gtk-boot0)
(name "sbcl-cl-cffi-gtk-gdk") (name "sbcl-cl-cffi-gtk-gdk")
(inputs (inputs
`(("gtk" ,gtk+) `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib)
("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject)
("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio)
("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf)
@ -3082,32 +3079,23 @@ is a library for creating graphical user interfaces.")
("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango)
,@(package-inputs sbcl-cl-cffi-gtk-boot0))) ,@(package-inputs sbcl-cl-cffi-gtk-boot0)))
(arguments (arguments
`(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:phases ((#:asd-file _ "") "gdk/cl-cffi-gtk-gdk.asd")
(modify-phases %standard-phases ((#:phases phases)
(add-after 'unpack 'fix-paths `(modify-phases ,phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'install 'link-source
(substitute* "gdk/gdk.init.lisp" ;; Since source is particularly heavy (16MiB+), let's reuse it
(("libgdk" all) ;; across the different components of cl-ffi-gtk.
(string-append (lambda* (#:key inputs outputs #:allow-other-keys)
(assoc-ref inputs "gtk") "/lib/" all))) (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
(substitute* "gdk/gdk.package.lisp" "/share/common-lisp/sbcl-source/"
(("libgtk" all) "cl-cffi-gtk-glib"))
(string-append (out-source (string-append (assoc-ref outputs "out")
(assoc-ref inputs "gtk") "/lib/" all))))) "/share/common-lisp/sbcl-source/"
(add-after 'install 'link-source "cl-cffi-gtk-gdk")))
;; Since source is particularly heavy (16MiB+), let's reuse it (delete-file-recursively out-source)
;; across the different components of cl-ffi-gtk. (symlink glib-source out-source)
(lambda* (#:key inputs outputs #:allow-other-keys) #t)))))))))
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-glib"))
(out-source (string-append (assoc-ref outputs "out")
"/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-gdk")))
(delete-file-recursively out-source)
(symlink glib-source out-source)
#t))))))))
(define-public sbcl-cl-cffi-gtk (define-public sbcl-cl-cffi-gtk
(package (package
@ -3122,26 +3110,27 @@ is a library for creating graphical user interfaces.")
(native-inputs (native-inputs
`(("fiveam" ,sbcl-fiveam))) `(("fiveam" ,sbcl-fiveam)))
(arguments (arguments
`(#:asd-file "gtk/cl-cffi-gtk.asd" (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0)
#:test-asd-file "test/cl-cffi-gtk-test.asd" ((#:asd-file _ "") "gtk/cl-cffi-gtk.asd")
((#:test-asd-file _ "") "test/cl-cffi-gtk-test.asd")
;; TODO: Tests fail with memory fault. ;; TODO: Tests fail with memory fault.
;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24.
#:tests? #f ((#:tests? _ #f) #f)
#:phases ((#:phases phases)
(modify-phases %standard-phases `(modify-phases ,phases
(add-after 'install 'link-source (add-after 'install 'link-source
;; Since source is particularly heavy (16MiB+), let's reuse it ;; Since source is particularly heavy (16MiB+), let's reuse it
;; across the different components of cl-ffi-gtk. ;; across the different components of cl-ffi-gtk.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib")
"/share/common-lisp/sbcl-source/" "/share/common-lisp/sbcl-source/"
"cl-cffi-gtk-glib")) "cl-cffi-gtk-glib"))
(out-source (string-append (assoc-ref outputs "out") (out-source (string-append (assoc-ref outputs "out")
"/share/common-lisp/sbcl-source/" "/share/common-lisp/sbcl-source/"
"cl-cffi-gtk"))) "cl-cffi-gtk")))
(delete-file-recursively out-source) (delete-file-recursively out-source)
(symlink glib-source out-source) (symlink glib-source out-source)
#t)))))))) #t)))))))))
(define-public cl-cffi-gtk (define-public cl-cffi-gtk
(sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) (sbcl-package->cl-source-package sbcl-cl-cffi-gtk))
@ -5568,7 +5557,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
((#:asd-system-name _) "iolib"))))) ((#:asd-system-name _) "iolib")))))
(define-public cl-iolib (define-public cl-iolib
(sbcl-package->cl-source-package sbcl-iolib)) (let ((parent (sbcl-package->cl-source-package sbcl-iolib)))
(package
(inherit parent)
(propagated-inputs
;; Need header to compile.
`(("libfixposix" ,libfixposix)
,@(package-propagated-inputs parent))))))
(define-public sbcl-ieee-floats (define-public sbcl-ieee-floats
(let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d")
@ -5867,8 +5862,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.")
;; asdf-build-system/source has its own phases and does not inherit ;; asdf-build-system/source has its own phases and does not inherit
;; from asdf-build-system/sbcl phases. ;; from asdf-build-system/sbcl phases.
(modify-phases %standard-phases/source (modify-phases %standard-phases/source
(add-after 'unpack 'fix-permissions ;; Already done in SBCL package.
(lambda _ (make-file-writable "t/data/test.gz") #t))))))) (delete 'reset-gzip-timestamps))))))
(define-public ecl-dexador (define-public ecl-dexador
(sbcl-package->ecl-package sbcl-dexador)) (sbcl-package->ecl-package sbcl-dexador))

35
gnu/packages/mail.scm
View File

@ -718,7 +718,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu (define-public mu
(package (package
(name "mu") (name "mu")
(version "1.4.4") (version "1.4.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/" (uri (string-append "https://github.com/djcb/mu/releases/"
@ -726,7 +726,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
"mu-" version ".tar.xz")) "mu-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0pmx8zh5fsfhkdl0cr7ydcv6cywhxbgavnjrfr5p2ibz9gx3q3vf")))) "15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -1372,7 +1372,7 @@ facilities for checking incoming mail.")
(define-public dovecot (define-public dovecot
(package (package
(name "dovecot") (name "dovecot")
(version "2.3.10") (version "2.3.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1380,7 +1380,7 @@ facilities for checking incoming mail.")
(version-major+minor version) "/" (version-major+minor version) "/"
"dovecot-" version ".tar.gz")) "dovecot-" version ".tar.gz"))
(sha256 (sha256
(base32 "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7")))) (base32 "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -2166,14 +2166,14 @@ converts them to maildir format directories.")
(define-public mpop (define-public mpop
(package (package
(name "mpop") (name "mpop")
(version "1.4.7") (version "1.4.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://marlam.de/mpop/releases/" (uri (string-append "https://marlam.de/mpop/releases/"
"mpop-" version ".tar.xz")) "mpop-" version ".tar.xz"))
(sha256 (sha256
(base32 "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk")))) (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gnutls" ,gnutls))) `(("gnutls" ,gnutls)))
@ -2298,14 +2298,14 @@ transfer protocols.")
(define-public opensmtpd (define-public opensmtpd
(package (package
(name "opensmtpd") (name "opensmtpd")
(version "6.6.4p1") (version "6.7.0p1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/" (uri (string-append "https://www.opensmtpd.org/archives/"
"opensmtpd-" version ".tar.gz")) "opensmtpd-" version ".tar.gz"))
(sha256 (sha256
(base32 "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2")))) (base32 "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("bdb" ,bdb) `(("bdb" ,bdb)
@ -2681,7 +2681,7 @@ operators and scripters.")
;; Upstream doesn't use git tags, but does ‘tag’ their releases in the ;; Upstream doesn't use git tags, but does ‘tag’ their releases in the
;; commit message. Hence the lack of GIT-VERSIONing despite using a commit ;; commit message. Hence the lack of GIT-VERSIONing despite using a commit
;; ID below. Don't forget to update it… ;; ID below. Don't forget to update it…
(version "2.21.99999") (version "2.22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2691,10 +2691,10 @@ operators and scripters.")
;; http://alpine.freeiz.com/alpine/readme/README.patches ;; http://alpine.freeiz.com/alpine/readme/README.patches
(uri (git-reference (uri (git-reference
(url "http://repo.or.cz/alpine.git") (url "http://repo.or.cz/alpine.git")
(commit "abeb2c25935ef8c75f1e5deef0f81276754dc975"))) (commit "b50297779a4becb9ceca9c6b5b375d526fe3df78")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")) (base32 "06js44fvdl7l33hfd4lsxpcd1cz3c0h796cswyzz0lkrzx89yl48"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2703,7 +2703,11 @@ operators and scripters.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list "CC=gcc") `(#:make-flags
(let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))))
#:configure-flags (list (string-append "--with-ssl-include-dir=" #:configure-flags (list (string-append "--with-ssl-include-dir="
(assoc-ref %build-inputs "openssl") (assoc-ref %build-inputs "openssl")
"/include/openssl") "/include/openssl")
@ -2720,6 +2724,13 @@ operators and scripters.")
"--with-date-stamp=Thu 1 Jan 01:00:01 CET 1970") "--with-date-stamp=Thu 1 Jan 01:00:01 CET 1970")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'assume-shadow-passwords
;; Alpine's configure script confuses ‘shadow password support’ with
;; ‘/etc/shadow exists in the build environment’. It does not.
(lambda _
(substitute* "configure"
(("test -f /etc/shadow") "true"))
#t))
(add-after 'unpack 'make-reproducible (add-after 'unpack 'make-reproducible
(lambda _ (lambda _
;; This removes time-dependent code to make alpine reproducible. ;; This removes time-dependent code to make alpine reproducible.

13
gnu/packages/maths.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2018, 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2018, 2020 Kei Kebreau <kkebreau@posteo.net>
@ -20,7 +20,7 @@
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Dave Love <me@fx@gnu.org> ;;; Copyright © 2017 Dave Love <me@fx@gnu.org>
;;; Copyright © 2018, 2019 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@ -472,8 +472,9 @@ precision floating point numbers.")
(arguments (arguments
(let ((system (%current-system))) (let ((system (%current-system)))
(cond (cond
((string-prefix? "aarch64" system) ((or (string-prefix? "aarch64" system)
;; Some sparse matrix tests are failing on AArch64: (string-prefix? "powerpc" system))
;; Some sparse matrix tests are failing on AArch64 and PowerPC:
;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-before 'check 'disable-failing-tests (add-before 'check 'disable-failing-tests
@ -4366,7 +4367,7 @@ as equations, scalars, vectors, and matrices.")
(define-public z3 (define-public z3
(package (package
(name "z3") (name "z3")
(version "4.8.7") (version "4.8.8")
(home-page "https://github.com/Z3Prover/z3") (home-page "https://github.com/Z3Prover/z3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -4375,7 +4376,7 @@ as equations, scalars, vectors, and matrices.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q")))) "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)

14
gnu/packages/messaging.scm
View File

@ -704,7 +704,7 @@ else [])"))
;; FIXME: Cannot use this expression as it would ;; FIXME: Cannot use this expression as it would
;; introduce a circular dependency at the top level. ;; introduce a circular dependency at the top level.
;; (version-major+minor (package-version python)) ;; (version-major+minor (package-version python))
"3.7" "3.8"
"/site-packages")))))) "/site-packages"))))))
(native-inputs (native-inputs
@ -1803,16 +1803,16 @@ notifications, and Python scripting support.")
(define-public libqmatrixclient (define-public libqmatrixclient
(package (package
(name "libqmatrixclient") (name "libqmatrixclient")
(version "0.5.2") (version "0.5.3.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QMatrixClient/libqmatrixclient") (url "https://github.com/quotient-im/libQuotient")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr")))) (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1955,16 +1955,16 @@ There is support for:
(define-public quaternion (define-public quaternion
(package (package
(name "quaternion") (name "quaternion")
(version "0.0.9.4c") (version "0.0.9.4e")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QMatrixClient/Quaternion") (url "https://github.com/quotient-im/Quaternion")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4")))) (base32 "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"))))
(build-system qt-build-system) (build-system qt-build-system)
(inputs (inputs
`(("libqmatrixclient" ,libqmatrixclient) `(("libqmatrixclient" ,libqmatrixclient)

6
gnu/packages/mpd.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com> ;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -183,7 +183,7 @@ player daemon.")
(define-public ncmpc (define-public ncmpc
(package (package
(name "ncmpc") (name "ncmpc")
(version "0.37") (version "0.38")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -192,7 +192,7 @@ player daemon.")
"/ncmpc-" version ".tar.xz")) "/ncmpc-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0p31jpv1vj01bqf1589mnfpv9618cfsv259rlnbqybg1yqkvg3kw")))) "18i73q33xq89abrxjd3hhl05gjniv6ms76ndjlc168ydm8wamh9b"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

20
gnu/packages/music.scm
View File

@ -1436,7 +1436,7 @@ users to select LV2 plugins and run them with jalv.")
(define-public synthv1 (define-public synthv1
(package (package
(name "synthv1") (name "synthv1")
(version "0.9.13") (version "0.9.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1444,7 +1444,7 @@ users to select LV2 plugins and run them with jalv.")
"/synthv1-" version ".tar.gz")) "/synthv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l")))) "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1468,7 +1468,7 @@ oscillators and stereo effects.")
(define-public drumkv1 (define-public drumkv1
(package (package
(name "drumkv1") (name "drumkv1")
(version "0.9.13") (version "0.9.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1476,7 +1476,7 @@ oscillators and stereo effects.")
"/drumkv1-" version ".tar.gz")) "/drumkv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia")))) "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1501,7 +1501,7 @@ effects.")
(define-public samplv1 (define-public samplv1
(package (package
(name "samplv1") (name "samplv1")
(version "0.9.13") (version "0.9.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1509,7 +1509,7 @@ effects.")
"/samplv1-" version ".tar.gz")) "/samplv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m")))) "0p3f9wsn1nz93szcl60yxhxdr554zm2z2jlbniwwify765lvasxc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1534,7 +1534,7 @@ effects.")
(define-public padthv1 (define-public padthv1
(package (package
(name "padthv1") (name "padthv1")
(version "0.9.13") (version "0.9.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1542,7 +1542,7 @@ effects.")
"/padthv1-" version ".tar.gz")) "/padthv1-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz")))) "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; there are no tests `(#:tests? #f)) ; there are no tests
@ -1755,7 +1755,7 @@ is subjective.")
(define-public tuxguitar (define-public tuxguitar
(package (package
(name "tuxguitar") (name "tuxguitar")
(version "1.5.3") (version "1.5.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1763,7 +1763,7 @@ is subjective.")
version "/tuxguitar-" version "-src.tar.gz")) version "/tuxguitar-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"1qy5kjcsl3c86kdlyvsf6dsfmfl1mv8zg0ln6g3qg3i8f35vlpp6")))) "0fjhf56lhlhm84v08917xp4yw8y6d0qajm4qiy1gfp8dm74whwwg"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:build-target "build" `(#:build-target "build"

65
gnu/packages/networking.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com> ;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
@ -87,12 +87,14 @@
#:use-module (gnu packages dejagnu) #:use-module (gnu packages dejagnu)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
@ -140,7 +142,6 @@
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags (list "--enable-polkit" `(#:configure-flags (list "--enable-polkit"
"--disable-appindicator" ; Not available
"--without-systemdsystemunitdir" ; Not required "--without-systemdsystemunitdir" ; Not required
"--without-systemduserunitdir") ; Not required "--without-systemduserunitdir") ; Not required
#:phases #:phases
@ -232,6 +233,7 @@
("pycairo" ,python-pycairo) ("pycairo" ,python-pycairo)
("pygobject" ,python-pygobject) ("pygobject" ,python-pygobject)
("python" ,python-wrapper) ("python" ,python-wrapper)
("libappindicator" ,libappindicator)
("libnm" ,network-manager))) ("libnm" ,network-manager)))
(synopsis "GTK+ Bluetooth manager") (synopsis "GTK+ Bluetooth manager")
(description "Blueman is a Bluetooth management utility using the Bluez (description "Blueman is a Bluetooth management utility using the Bluez
@ -587,15 +589,19 @@ receiving NDP messages.")
(define-public ethtool (define-public ethtool
(package (package
(name "ethtool") (name "ethtool")
(version "5.4") (version "5.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/software/network/" (uri (string-append "mirror://kernel.org/software/network/"
"ethtool/ethtool-" version ".tar.xz")) "ethtool/ethtool-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12")))) "159r0hwax0qs5diayw2glxshqxrigk0v67hgmbq56ldddm91n3ya"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libmnl" ,libmnl)))
(home-page "https://www.kernel.org/pub/software/network/ethtool/") (home-page "https://www.kernel.org/pub/software/network/ethtool/")
(synopsis "Display or change Ethernet device settings") (synopsis "Display or change Ethernet device settings")
(description (description
@ -1949,14 +1955,14 @@ returns the user name and other information about the connection.")
(define-public spiped (define-public spiped
(package (package
(name "spiped") (name "spiped")
(version "1.6.0") (version "1.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.tarsnap.com/spiped/spiped-" (uri (string-append "https://www.tarsnap.com/spiped/spiped-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 (base32
"1r51rdcl7nib1yv3yvgd5alwlkkwmr387brqavaklb0p2bwzixz6")))) "04rpnc53whfky7pp2m9h35gwzwn6788pnl6c1qd576mpknbqjw4d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"
@ -3132,3 +3138,50 @@ thousands of connections is clearly realistic with today's hardware.")
(license (list license:gpl2+ (license (list license:gpl2+
license:lgpl2.1 license:lgpl2.1
license:lgpl2.1+)))) license:lgpl2.1+))))
(define-public lldpd
(package
(name "lldpd")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-"
version ".tar.gz"))
(sha256
(base32
"16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd"))
(modules '((guix build utils)))
(snippet
'(begin
;; Drop bundled library.
(delete-file-recursively "libevent")
#t))))
(arguments
`(#:configure-flags
(list
"--with-privsep-user=nobody"
"--with-privsep-group=nogroup"
"--localstatedir=/var"
"--enable-pie"
"--without-embedded-libevent"
(string-append "--with-systemdsystemunitdir="
(assoc-ref %outputs "out")
"/lib/systemd/system"))))
(build-system gnu-build-system)
(inputs
`(("libevent" ,libevent)
("libxml2" ,libxml2)
("openssl" ,openssl)
("readline" ,readline)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://vincentbernat.github.io/lldpd/")
(synopsis "Locate neighbors of your network equipment")
(description
"The @dfn{Link Layer Discovery Protocol} (LLDP) is an industry standard
protocol designed to supplant proprietary Link-Layer protocols such as EDP or
CDP. The goal of LLDP is to provide an inter-vendor compatible mechanism to
deliver Link-Layer notifications to adjacent network devices. @code{lldpd} is
an implementation of LLDP. It also supports some proprietary protocols.")
(license license:isc)))

61
gnu/packages/ocaml.scm
View File

@ -582,14 +582,14 @@ concrete syntax of the language (Quotations, Syntax Extensions).")
(define-public hevea (define-public hevea
(package (package
(name "hevea") (name "hevea")
(version "2.33") (version "2.34")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://hevea.inria.fr/old/" (uri (string-append "http://hevea.inria.fr/old/"
"hevea-" version ".tar.gz")) "hevea-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb")))) "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("ocaml" ,ocaml))) `(("ocaml" ,ocaml)))
@ -2192,14 +2192,14 @@ without a complete in-memory representation of the data.")
(define-public ocaml-ocurl (define-public ocaml-ocurl
(package (package
(name "ocaml-ocurl") (name "ocaml-ocurl")
(version "0.8.2") (version "0.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://ygrek.org.ua/p/release/ocurl/ocurl-" (uri (string-append "http://ygrek.org.ua/p/release/ocurl/ocurl-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9")))) "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2453,7 +2453,7 @@ compatibility with older compiler to use these new features in their code.")
(define-public ocaml-fileutils (define-public ocaml-fileutils
(package (package
(name "ocaml-fileutils") (name "ocaml-fileutils")
(version "0.6.0") (version "0.6.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2462,29 +2462,12 @@ compatibility with older compiler to use these new features in their code.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06gxbqfssl16xc8y4d34wpm0mwfr0jgph4lmlwfmgazyggnmvc7m")))) "01qf51b8pb7vyfba7y0kb7ajwj1950im25d7f59821zwsibns3d9"))))
(build-system ocaml-build-system) (build-system dune-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-topfind
(lambda* (#:key inputs #:allow-other-keys)
;; add the line #directory ".." at the top of each file
;; using #use "topfind";; to be able to find topfind
(let* ((findlib-path (assoc-ref inputs "findlib"))
(findlib-libdir
(string-append findlib-path "/lib/ocaml/site-lib")))
(substitute* "setup.ml"
(("#use \"topfind\";;" all)
(string-append "#directory \"" findlib-libdir "\"\n"
all))))
#t)))))
(propagated-inputs (propagated-inputs
`(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims)))
(native-inputs (native-inputs
`(("ocamlbuild" ,ocamlbuild) `(("ocaml-ounit" ,ocaml-ounit)))
("ocaml-oasis" ,ocaml-oasis)
("ocaml-ounit" ,ocaml-ounit)))
(home-page "http://ocaml-fileutils.forge.ocamlcore.org") (home-page "http://ocaml-fileutils.forge.ocamlcore.org")
(synopsis "Pure OCaml functions to manipulate real file and filename") (synopsis "Pure OCaml functions to manipulate real file and filename")
(description "Library to provide pure OCaml functions to manipulate real (description "Library to provide pure OCaml functions to manipulate real
@ -2992,7 +2975,7 @@ XML and Protocol Buffers formats.")
(define-public bap (define-public bap
(package (package
(name "bap") (name "bap")
(version "1.6.0") (version "2.0.0")
(home-page "https://github.com/BinaryAnalysisPlatform/bap") (home-page "https://github.com/BinaryAnalysisPlatform/bap")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -3002,7 +2985,7 @@ XML and Protocol Buffers formats.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6")))) "0lb9xkfp67wjjqr75p6krivmjra7l5673236v9ny4gp0xi0755bk"))))
(build-system ocaml-build-system) (build-system ocaml-build-system)
(native-inputs (native-inputs
`(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis)) `(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis))
@ -3020,16 +3003,23 @@ XML and Protocol Buffers formats.")
("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl)) ("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl))
("ocaml-piqi" ,ocaml4.07-piqi) ("ocaml-piqi" ,ocaml4.07-piqi)
("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane)
("ocaml-utop" ,ocaml4.07-utop)
("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm)) ("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm))
("ocaml-uri" ,ocaml4.07-uri) ("ocaml-uri" ,ocaml4.07-uri)
("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith)))) ("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith))))
(inputs (inputs
`(("llvm" ,llvm-3.8) `(("gmp" ,gmp)
("gmp" ,gmp))) ("llvm" ,llvm-3.8)
("ncurses" ,ncurses)))
(arguments (arguments
`(#:use-make? #t `(#:use-make? #t
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-ncurses
(lambda _
(substitute* "oasis/llvm"
(("-lcurses") "-lncurses"))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
;; add write for user, to prevent a failure in the install phase ;; add write for user, to prevent a failure in the install phase
@ -4429,7 +4419,7 @@ storage of large amounts of data.")
(define-public ocaml-octavius (define-public ocaml-octavius
(package (package
(name "ocaml-octavius") (name "ocaml-octavius")
(version "1.2.1") (version "1.2.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4438,8 +4428,17 @@ storage of large amounts of data.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ck6yj6z5rvqyl39rz87ca1bnk0f1dpgvlk115631hjh8bwpfvfq")))) "1c5m51xcn2jv42kjjpklr6g63sgx1k885wfdp1yr4wrmiaj9cbpx"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'make-writable
(lambda _
(for-each (lambda (file)
(chmod file #o644))
(find-files "." "."))
#t)))))
(properties `((upstream-name . "octavius"))) (properties `((upstream-name . "octavius")))
(home-page "https://github.com/ocaml-doc/octavius") (home-page "https://github.com/ocaml-doc/octavius")
(synopsis "Ocamldoc comment syntax parser") (synopsis "Ocamldoc comment syntax parser")

141
gnu/packages/openkinect.scm 100644
View File

@ -0,0 +1,141 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
;;; 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 openkinect)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages libusb)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages gl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages image-processing))
(define-public libfreenect
(let ((version "0.6.1"))
(package
(name "libfreenect")
(version version)
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenKinect/libfreenect")
(commit (string-append "v" version))))
(sha256
(base32
"0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; package has no tests
#:configure-flags
'("-DBUILD_FAKENECT=ON"
"-DBUILD_CPP=ON"
"-DBUILD_EXAMPLES=OFF" ; available in libfreenect-examples
"-DBUILD_CV=OFF" ; available in libfreenect-cv
"-DBUILD_PYTHON=OFF" ; available in python-libfreenect
"-DBUILD_C_SYNC=ON")
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-udev-rules
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(rules-out (string-append out "/lib/udev/rules.d")))
(install-file "../source/platform/linux/udev/51-kinect.rules"
(string-append rules-out "51-kinect.rules"))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libusb" ,libusb)))
(synopsis "Drivers and libraries for the Xbox Kinect device")
(description "libfreenect is a userspace driver for the Microsoft Kinect.
It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.")
(home-page "https://openkinect.org/")
(license license:gpl2+))))
;; Library are already compiled in libfreenect, avoid build it again.
(define libfreenect-derived-phases
'(modify-phases %standard-phases
(add-after 'unpack 'patch-CMakeLists.txt
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
((".*libusb.*") "")
(("add_subdirectory \\(src\\)") "")
((".*libfreenectConfig.cmake.*") ""))
#t))))
(define-public libfreenect-examples
(package
(inherit libfreenect)
(name "libfreenect-examples")
(inputs
`(("libfreenect" ,libfreenect)
("glut" ,freeglut)))
(arguments
`(#:tests? #f ; package has no tests
#:configure-flags '("-DBUILD_EXAMPLES=ON"
"-DBUILD_FAKENECT=OFF"
"-DBUILD_CPP=OFF"
"-DBUILD_C_SYNC=OFF"
"-DBUILD_CV=OFF")
#:phases ,libfreenect-derived-phases))
(synopsis "Examples for libfreenect, the Xbox Kinect device library")))
(define-public libfreenect-opencv
(package
(inherit libfreenect)
(name "libfreenect-opencv")
(inputs
`(("libfreenect" ,libfreenect)
("opencv" ,opencv)))
(arguments
`(#:tests? #f ; package has no tests
#:configure-flags '("-DBUILD_EXAMPLES=OFF"
"-DBUILD_FAKENECT=OFF"
"-DBUILD_CPP=OFF"
"-DBUILD_C_SYNC=OFF"
"-DBUILD_CV=ON")
#:phases ,libfreenect-derived-phases))
(synopsis "OpenCV wrapper for libfreenect, the Xbox Kinect device
library")))
(define-public python-libfreenect
(package
(inherit libfreenect)
(name "python-libfreenect")
(native-inputs
`(("python-cython" ,python-cython)))
(inputs
`(("libfreenect" ,libfreenect)))
(propagated-inputs
`(("python" ,python)
("python-numpy" ,python-numpy)))
(arguments
`(#:tests? #f ; package has no tests
#:configure-flags '("-DBUILD_EXAMPLES=OFF"
"-DBUILD_FAKENECT=OFF"
"-DBUILD_CPP=OFF"
"-DBUILD_C_SYNC=OFF"
"-DBUILD_CV=OFF"
"-DBUILD_PYTHON3=ON")
#:phases ,libfreenect-derived-phases))
(synopsis "Python wrapper for libfreenect, the Xbox Kinect device
library")))

109
gnu/packages/pantheon.scm 100644
View File

@ -0,0 +1,109 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;;
;;; 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 pantheon)
#:use-module (gnu packages cmake)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages)
#:use-module (guix build-system meson)
#:use-module (guix git-download)
#:use-module ((guix licenses) :prefix license:)
#:use-module (guix packages)
#:use-module (guix utils))
(define-public granite
(package
(name "granite")
(version "5.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/elementary/granite.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-icon-cache
(lambda _
(setenv "DESTDIR" "/")
#t)))))
(inputs
`(("glib" ,glib)
("gtk" ,gtk+)
("libgee" ,libgee)))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(home-page "https://github.com/elementary/granite")
(synopsis "Library that extends GTK with common widgets and utilities")
(description "Granite is a companion library for GTK+ and GLib. Among other
things, it provides complex widgets and convenience functions designed for use
in apps built for the Pantheon desktop.")
(license license:lgpl3+)))
(define-public pantheon-calculator
(package
(name "pantheon-calculator")
(version "1.5.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/elementary/calculator.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-schema-cache-generation
(lambda _
(setenv "DESTDIR" "/")
#t)))))
(inputs
`(("granite" ,granite)
("glib" ,glib)
("gtk" ,gtk+)
("libgee" ,libgee)))
(native-inputs
`(("cmake" ,cmake)
("glib:bin" ,glib "bin") ; for glib-compile-schemas
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(home-page "https://github.com/elementary/calculator")
(synopsis "Desktop calculator")
(description "Calculator is an application for performing simple
arithmetic. It is the default calculator application in the Pantheon
desktop.")
(license license:gpl3)))

39
gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch 100644
View File

@ -0,0 +1,39 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 20 May 2020 19:17:13 +0200
Subject: [PATCH] gnu: http-client: Fix assertion on armhf-linux.
Copied verbatim from [0] to fix guix pull[1] on ARM systems.
[0]: https://github.com/nodejs/http-parser/pull/510
[1]: https://issues.guix.gnu.org/40604
From 0e5868aebb9eb92b078d27bb2774c2154dc167e2 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 30 Apr 2020 11:22:50 +0200
Subject: [PATCH] Fix sizeof(http_parser) assert
The result should be 32 on both 32 bits and 64 bits architectures
because of struct padding.
Fixes: https://github.com/nodejs/http-parser/issues/507
---
test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/test.c b/test.c
index 7983424..f60a84f 100644
--- a/test.c
+++ b/test.c
@@ -4220,8 +4220,11 @@ main (void)
patch = version & 255;
printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version);
+ /* Should be 32 on both 32 bits and 64 bits architectures because of
+ * struct padding, see https://github.com/nodejs/http-parser/issues/507.
+ */
printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser));
- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *));
+ assert(sizeof(http_parser) == 32);
//// API
test_preserve_data();

30
gnu/packages/patches/kpmcore-fix-tests.patch
View File

@ -1,30 +0,0 @@
Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel.
Committed on 07/11/2019 at 22:16.
Pushed by stikonas into branch '4.0'.
Fix test for kpmcore: stop helper only if formerly started.
See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161
diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
--- a/src/util/externalcommand.cpp
+++ b/src/util/externalcommand.cpp
@@ -433,14 +433,17 @@
void ExternalCommand::stopHelper()
{
+ if (!helperStarted)
+ return;
auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
QStringLiteral("/Helper"), QDBusConnection::systemBus());
QByteArray request;
const quint64 nonce = interface->getNonce();
request.setNum(nonce);
QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512);
interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce);
+ helperStarted = false;
delete privateKey;
delete init;
}

139
gnu/packages/patches/kpmcore-remove-broken-test.patch
View File

@ -1,139 +0,0 @@
From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Thu, 7 Nov 2019 22:12:00 +0000
Subject: [PATCH] Remove broken smart unit test.
BUG: 413853
---
test/CMakeLists.txt | 9 ----
test/testsmart.cpp | 102 --------------------------------------------
2 files changed, 111 deletions(-)
delete mode 100644 test/testsmart.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 67f63a2..6a300d3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -53,12 +53,3 @@ find_package (Threads)
# Execute external commands as root
kpm_test(testexternalcommand testexternalcommand.cpp)
add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND})
-
-# Including SMART files reference
-set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp
- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp
- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp)
-
-# Test SMART support
-kpm_test(testsmart testsmart.cpp ${SMARTPARSER})
-add_test(NAME testsmart COMMAND testsmart ${BACKEND})
diff --git a/test/testsmart.cpp b/test/testsmart.cpp
deleted file mode 100644
index 2236af7..0000000
--- a/test/testsmart.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "helpers.h"
-
-#include "util/externalcommand.h"
-#include "backend/corebackend.h"
-#include "backend/corebackendmanager.h"
-#include "core/smartstatus.h"
-#include "core/smartparser.h"
-
-#include <QCoreApplication>
-#include <QDebug>
-
-static QString getDefaultDevicePath();
-static bool testSmartStatus();
-static bool testSmartParser();
-
-int main(int argc, char **argv)
-{
- QCoreApplication app(argc, argv);
-
- KPMCoreInitializer i;
-
- if (argc == 2)
- i = KPMCoreInitializer(argv[1]);
-
- if (!i.isValid())
- return 1;
-
- CoreBackend *backend = CoreBackendManager::self()->backend();
-
- if (!backend)
- {
- qWarning() << "Couldn't get backend.";
- return 1;
- }
-
- if (!testSmartStatus() || !testSmartParser())
- return 1;
-
- return app.exec();
-}
-
-static QString getDefaultDevicePath()
-{
- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command
- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"),
- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") });
-
- if (command.run() && command.exitCode() == 0) {
- QString output = command.output();
- return output;
- }
-
- return QString();
-}
-
-static bool testSmartStatus()
-{
- QString devicePath = getDefaultDevicePath();
-
- SmartStatus smart(devicePath);
-
- if (smart.devicePath() != devicePath)
- return false;
-
- if (!smart.status())
- return false;
-
- if (smart.modelName() == QString())
- return false;
-
- if (smart.firmware() == QString())
- return false;
-
- if (smart.serial() == QString())
- return false;
-
- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success)
- return false;
-
- if (!smart.isValid())
- return false;
-
- return true;
-}
-
-static bool testSmartParser()
-{
- QString devicePath = getDefaultDevicePath();
-
- SmartParser parser(devicePath);
-
- if (!parser.init())
- return false;
-
- if (parser.devicePath() != devicePath)
- return false;
-
- if (!parser.diskInformation())
- return false;
-
- return true;
-}
--
2.17.1

83
gnu/packages/patches/multipath-tools-sans-systemd.patch 100644
View File

@ -0,0 +1,83 @@
Fix various compiler warnings when built without systemd.
Submitted upstream at <https://www.redhat.com/archives/dm-devel/2020-May/thread.html>.
diff --git a/libmultipath/config.c b/libmultipath/config.c
--- a/libmultipath/config.c
+++ b/libmultipath/config.c
@@ -696,7 +696,7 @@ process_config_dir(struct config *conf, char *dir)
pthread_cleanup_pop(1);
}
-static void set_max_checkint_from_watchdog(struct config *conf)
+static void set_max_checkint_from_watchdog(__attribute__((unused)) struct config *conf)
{
#ifdef USE_SYSTEMD
char *envp = getenv("WATCHDOG_USEC");
diff --git a/multipathd/main.c b/multipathd/main.c
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -176,6 +176,7 @@ daemon_status(void)
/*
* I love you too, systemd ...
*/
+#ifdef USE_SYSTEMD
static const char *
sd_notify_status(enum daemon_status state)
{
@@ -195,7 +196,6 @@ sd_notify_status(enum daemon_status state)
return NULL;
}
-#ifdef USE_SYSTEMD
static void do_sd_notify(enum daemon_status old_state,
enum daemon_status new_state)
{
@@ -247,7 +247,9 @@ enum daemon_status wait_for_state_change_if(enum daemon_status oldstate,
static void __post_config_state(enum daemon_status state)
{
if (state != running_state && running_state != DAEMON_SHUTDOWN) {
- enum daemon_status old_state = running_state;
+ /* save state for sd_notify */
+ enum daemon_status
+ __attribute__((unused)) old_state = running_state;
running_state = state;
pthread_cond_broadcast(&config_cond);
@@ -272,7 +274,9 @@ int set_config_state(enum daemon_status state)
pthread_cleanup_push(config_cleanup, NULL);
pthread_mutex_lock(&config_lock);
if (running_state != state) {
- enum daemon_status old_state = running_state;
+ /* save state for sd_notify */
+ enum daemon_status
+ __attribute__((unused)) old_state = running_state;
if (running_state == DAEMON_SHUTDOWN)
rc = EINVAL;
@@ -2280,7 +2284,6 @@ checkerloop (void *ap)
struct timespec last_time;
struct config *conf;
int foreign_tick = 0;
- bool use_watchdog;
pthread_cleanup_push(rcu_unregister, NULL);
rcu_register_thread();
@@ -2292,11 +2295,15 @@ checkerloop (void *ap)
get_monotonic_time(&last_time);
last_time.tv_sec -= 1;
- /* use_watchdog is set from process environment and never changes */
conf = get_multipath_config();
- use_watchdog = conf->use_watchdog;
put_multipath_config(conf);
+#ifdef USE_SYSTEMD
+ /* use_watchdog is set from process environment and never changes */
+ bool use_watchdog;
+ use_watchdog = conf->use_watchdog;
+#endif
+
while (1) {
struct timespec diff_time, start_time, end_time;
int num_paths = 0, strict_timing, rc = 0;

11
gnu/packages/patches/openjdk-14-builtins.patch 100644
View File

@ -0,0 +1,11 @@
--- jdk14-bc54620a3848/make/autoconf/basics.m4 2020-02-07 04:40:54.000000000 +1030
+++ jdk14-bc54620a3848-new/make/autoconf/basics.m4 2020-04-24 10:59:33.056098506 +0930
@@ -583,7 +583,7 @@
BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
if test "x[$]$1" = x; then
AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in])
- if help $2 > /dev/null 2>&1; then
+ if command -v $2 > /dev/null 2>&1; then
AC_MSG_NOTICE([Found $2 as shell built-in. Using it])
$1="$2"
else

82
gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch 100644
View File

@ -0,0 +1,82 @@
Fix compatibility with Python 3.8.
Upstream issue: https://github.com/DirectXMan12/should_be/pull/5
diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py
--- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100
+++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200
@@ -103,7 +103,7 @@
return resf
-def buildCode(baseCode, argcount=None, kwonlyargcount=None,
+def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None,
nlocals=None, stacksize=None, flags=None,
code=None, consts=None, names=None,
varnames=None, filename=None, name=None,
@@ -121,6 +121,24 @@
nlocals or baseCode.co_nlocals,
stacksize or baseCode.co_stacksize,
flags or baseCode.co_flags,
+ code or baseCode.co_code,
+ consts or baseCode.co_consts,
+ names or baseCode.co_names,
+ varnames or baseCode.co_varnames,
+ filename or baseCode.co_filename,
+ name or baseCode.co_name,
+ firstlineno or baseCode.co_firstlineno,
+ lnotab or baseCode.co_lnotab,
+ freevars or baseCode.co_freevars,
+ cellvars or baseCode.co_cellvars)
+ elif hasattr(baseCode, 'co_posonlyargcount'):
+ # Python 3.8
+ resc = CodeType(argcount or baseCode.co_argcount,
+ posonlyargcount or baseCode.co_posonlyargcount,
+ kwonlyargcount or baseCode.co_kwonlyargcount,
+ nlocals or baseCode.co_nlocals,
+ stacksize or baseCode.co_stacksize,
+ flags or baseCode.co_flags,
code or baseCode.co_code,
consts or baseCode.co_consts,
names or baseCode.co_names,
diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py
--- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100
+++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200
@@ -7,31 +7,31 @@
self.lst = [1, 2, 3]
def test_should_include_iter(self):
- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]'
+ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]'
r', but did not have items .+')
- self.assertRaisesRegexp(AssertionError, err_msg,
+ self.assertRaisesRegex(AssertionError, err_msg,
self.lst.should_include, [4])
self.lst.should_include([1, 2, 3])
def test_should_include_item(self):
- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?'
+ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?'
r', but did not')
- self.assertRaisesRegexp(AssertionError, err_msg,
+ self.assertRaisesRegex(AssertionError, err_msg,
self.lst.should_include, 4)
self.lst.should_include(3)
def test_shouldnt_include_iter(self):
err_msg = 'should not have included'
- self.assertRaisesRegexp(AssertionError, err_msg,
+ self.assertRaisesRegex(AssertionError, err_msg,
self.lst.shouldnt_include, [2, 3])
self.lst.shouldnt_include([4, 5])
def test_shouldnt_include_item(self):
err_msg = 'should not have included'
- self.assertRaisesRegexp(AssertionError, err_msg,
+ self.assertRaisesRegex(AssertionError, err_msg,
self.lst.shouldnt_include, 3)
self.lst.shouldnt_include(4)

29
gnu/packages/patches/soundconverter-remove-gconf-dependency.patch
View File

@ -1,29 +0,0 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 19 Feb 2019 07:46:28 +0100
Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error.
Without this patch and GConf:
Traceback (most recent call last):
File "/gnu/…/bin/...soundconverter-real-real-real", line 164, in <module>
from soundconverter.batch import cli_convert_main
File "/gnu/…/lib/soundconverter/python/soundconverter/batch.py", line 31, in <module>
from soundconverter.gstreamer import TagReader
File "/gnu/…/lib/soundconverter/python/soundconverter/gstreamer.py", line 70, in <module>
gi.require_version('GConf', '2.0')
File "/gnu/…/lib/python3.7/site-packages/gi/__init__.py", line 130, in require_version
raise ValueError('Namespace %s not available' % namespace)
ValueError: Namespace GConf not available
---
diff -Naur soundconverter-3.0.1/soundconverter/gstreamer.py soundconverter-3.0.1/soundconverter/gstreamer.py
--- soundconverter-3.0.1/soundconverter/gstreamer.py 2018-11-23 20:38:46.000000000 +0100
+++ soundconverter-3.0.1/soundconverter/gstreamer.py 2019-02-19 07:42:15.767684388 +0100
@@ -88,7 +88,7 @@
profile = description, extension, pipeline
audio_profiles_list.append(profile)
audio_profiles_dict[description] = profile
-except ImportError:
+except ValueError:
pass
required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate')

35
gnu/packages/perl-check.scm
View File

@ -14,6 +14,7 @@
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -457,6 +458,40 @@ files, as well as to verify that there are no missing or unknown files.")
@file{MANIFEST} file matches its distribution.") @file{MANIFEST} file matches its distribution.")
(license perl-license))) (license perl-license)))
(define-public perl-test-distribution
(package
(name "perl-test-distribution")
(version "2.00")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-"
version ".tar.gz"))
(sha256
(base32
"0s1bj459qaw2x1fckklv9irpf3mr8gp2cm9vlyrb5dyanrzx1v2h"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
(propagated-inputs
`(("perl-file-find-rule" ,perl-file-find-rule)
("perl-pod-coverage" ,perl-pod-coverage)
("perl-test-pod" ,perl-test-pod)
("perl-test-pod-coverage" ,perl-test-pod-coverage)))
(home-page "https://metacpan.org/release/Test-Distribution")
(synopsis "Perform tests on all modules of a distribution")
(description "When used in a test script @code{Test::Distribution}
goes through all the modules in your distribution, checks their POD,
checks that they compile successfully and checks that they all define
a $VERSION. In addition, this module performs a number of tests on
the distribution itself. It checks that the distributed files match
the SIGNATURE file, if that file exists. It checks that the
distribution is not missing any core description files. It also
checks that the complete set of pre-requisite packages are listed in
the Makefile.PL file.")
(license perl-license)))
(define-public perl-test-eol (define-public perl-test-eol
(package (package
(name "perl-test-eol") (name "perl-test-eol")

28
gnu/packages/perl.scm
View File

@ -3079,6 +3079,34 @@ formats, as defined in RFC 2445. It can be used to parse these formats in
order to create the appropriate objects.") order to create the appropriate objects.")
(license (package-license perl)))) (license (package-license perl))))
(define-public perl-datetime-format-iso8601
(package
(name "perl-datetime-format-iso8601")
(version "0.08")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-"
version ".tar.gz"))
(sha256
(base32
"1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
(propagated-inputs
`(("perl-datetime" ,perl-datetime)
("perl-datetime-format-builder" ,perl-datetime-format-builder)
("perl-file-find-rule" ,perl-file-find-rule)
("perl-test-distribution" ,perl-test-distribution)
("perl-test-pod" ,perl-test-pod)))
(home-page "https://metacpan.org/release/DateTime-Format-ISO8601")
(synopsis "Parse ISO8601 date and time formats")
(description "@code{DateTime::Format::ISO8601} is a DateTime
extension that parses almost all ISO8601 date and time formats.")
(license perl-license)))
(define-public perl-datetime-format-natural (define-public perl-datetime-format-natural
(package (package
(name "perl-datetime-format-natural") (name "perl-datetime-format-natural")

302
gnu/packages/python-web.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
@ -222,32 +222,50 @@ comes with a SOCKS proxy client.")
(define-public python-falcon (define-public python-falcon
(package (package
(name "python-falcon") (name "python-falcon")
(version "1.4.1") (version "2.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "falcon" version)) (uri (pypi-uri "falcon" version))
(sha256 (sha256
(base32 (base32
"1i0vmqsk24z4biirqhpvas9h28wy7nmpy3jvnb6rz2imq04zd09r")))) "1z6mqfv574x6jiawf67ib52g4kk20c2x7xk7wrn1573b8v7r79gf"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "falcon/vendor")
(substitute* "setup.py"
((".*falcon\\.vendor\\.mimeparse.*") ""))
(substitute* '("falcon/media/handlers.py"
"falcon/request.py")
(("from falcon\\.vendor ") ""))
(substitute* "falcon.egg-info/SOURCES.txt"
(("falcon/vendor.*") ""))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "pytest")))))) ;; Skip orjson, which requires rust to build.
(substitute* "tests/test_media_handlers.py"
(("== 'CPython") "!= 'CPython"))
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "--ignore" "falcon"))))))
(propagated-inputs (propagated-inputs
`(("python-mimeparse" ,python-mimeparse) `(("python-mimeparse" ,python-mimeparse)))
("python-six" ,python-six)))
(native-inputs (native-inputs
`(("python-cython" ,python-cython) ;for faster binaries `(("python-cython" ,python-cython) ;for faster binaries
("python-mujson" ,python-mujson)
("python-msgpack" ,python-msgpack)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-rapidjson" ,python-rapidjson)
("python-requests" ,python-requests) ("python-requests" ,python-requests)
("python-testtools" ,python-testtools) ("python-testtools" ,python-testtools)
("python-jsonschema" ,python-jsonschema) ("python-ujson" ,python-ujson)))
("python-msgpack" ,python-msgpack)))
(home-page "https://falconframework.org") (home-page "https://falconframework.org")
(synopsis (synopsis
"Web framework for building APIs and application backends") "Web framework for building APIs and application backends")
@ -267,10 +285,15 @@ classes
@item Compatible with both CPython and PyPy @item Compatible with both CPython and PyPy
@item Cython support for better performance when used with CPython @item Cython support for better performance when used with CPython
@end itemize") @end itemize")
(properties `((python2-variant . ,(delay python2-falcon))))
(license license:asl2.0))) (license license:asl2.0)))
(define-public python2-falcon (define-public python2-falcon
(package-with-python2 python-falcon)) (let ((falcon (package-with-python2 (strip-python2-variant python-falcon))))
(package
(inherit falcon)
(native-inputs
(alist-delete "python-rapidjson" (package-native-inputs falcon))))))
(define-public python-falcon-cors (define-public python-falcon-cors
(package (package
@ -1012,14 +1035,14 @@ your Web app.")
(define-public python-webob (define-public python-webob
(package (package
(name "python-webob") (name "python-webob")
(version "1.8.3") (version "1.8.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "WebOb" version)) (uri (pypi-uri "WebOb" version))
(sha256 (sha256
(base32 (base32
"1cpqskanmvwia8wqlpcr3ykyxysynjdnbl5namvpg8vw6jnkv1dh")))) "026i3z99nr3px75isa9mbnky5i7rffiv4d124h5kxfjjsxz92fma"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-nose" ,python-nose))) `(("python-nose" ,python-nose)))
@ -3746,3 +3769,258 @@ in Python with a focus on correctness and simplicity.
Built on top of @code{asyncio}, Python's standard asynchronous I/O framework, Built on top of @code{asyncio}, Python's standard asynchronous I/O framework,
it provides an elegant coroutine-based API.") it provides an elegant coroutine-based API.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-selenium
(package
(name "python-selenium")
(version "3.141.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "selenium" version))
(sha256
(base32
"039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy"))))
(build-system python-build-system)
(propagated-inputs
`(("python-urllib3" ,python-urllib3)))
(home-page
"https://github.com/SeleniumHQ/selenium/")
(synopsis "Python bindings for Selenium")
(description "Selenium enables web browser automation.
Selenium specifically provides infrastructure for the W3C WebDriver specification
— a platform and language-neutral coding interface compatible with all
major web browsers.")
(license license:asl2.0)))
(define-public python-rapidjson
(package
(name "python-rapidjson")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-rapidjson" version))
(sha256
(base32
"18cl2dhx3gds5vg52jxmh9wjlbiy8dx06c3n482rfpdi9dzbv05d"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "rapidjson") #t))))
(build-system python-build-system)
(arguments
`(#:configure-flags
(list (string-append "--rj-include-dir="
(assoc-ref %build-inputs "rapidjson")
"/include/rapidjson"))
#:phases
(modify-phases %standard-phases
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(invoke "python" "setup.py" "build"
(string-append "--rj-include-dir="
(assoc-ref %build-inputs "rapidjson")
"/include/rapidjson"))))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
;; Some tests are broken.
(delete-file "tests/test_base_types.py")
(delete-file "tests/test_validator.py")
(invoke "python" "-m" "pytest" "tests"))))))
(native-inputs
`(("rapidjson" ,rapidjson)
("python-pytest" ,python-pytest)
("python-pytz" ,python-pytz)))
(home-page "https://github.com/python-rapidjson/python-rapidjson")
(synopsis "Python wrapper around rapidjson")
(description "This package provides a python wrapper around rapidjson.")
(license license:expat)))
(define-public python-venusian
(package
(name "python-venusian")
(version "3.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "venusian" version))
(sha256
(base32 "0f7f67dkgxxcjfhpdd5frb9pszkf04lyzzpn5069q0xi89r2p17n"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)
("python-runner" ,python-pytest-runner)
("python-pytest-cov" ,python-pytest-cov)))
(arguments '(#:test-target "pytest"))
(home-page "https://docs.pylonsproject.org/projects/venusian")
(synopsis "Library for defering decorator actions")
(description
"Venusian is a library which allows framework authors to defer decorator
actions. Instead of taking actions when a function (or class) decorator is
executed at import time, you can defer the action usually taken by the
decorator until a separate scan phase.")
(license license:repoze)))
(define-public python-zope-deprecation
(package
(name "python-zope-deprecation")
(version "4.4.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "zope.deprecation" version))
(sha256
(base32
"1pz2cv7gv9y1r3m0bdv7ks1alagmrn5msm5spwdzkb2by0w36i8d"))))
(build-system python-build-system)
(native-inputs `())
(propagated-inputs `())
(home-page "https://zopedeprecation.readthedocs.io/")
(synopsis "Function for marking deprecations")
(description "The @code{zope.deprecation} module provides a function for
marking modules, classes, functions, methods and properties as deprecated,
displaying warnings when usaged in application code.")
(license license:zpl2.1)))
(define-public python-translationstring
(package
(name "python-translationstring")
(version "1.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "translationstring" version))
(sha256
(base32
"0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f"))))
(build-system python-build-system)
(home-page "http://docs.pylonsproject.org/projects/translationstring")
(synopsis "Internationalization tooling for the Pylons project")
(description "This package provides a library used by various Pylons
project packages for internationalization (i18n) duties related to
translation.")
(license license:repoze)))
(define-public python-plaster
(package
(name "python-plaster")
(version "1.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "plaster" version))
(sha256
(base32
"1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://docs.pylonsproject.org/projects/plaster/en/latest/")
(synopsis "Configuration loader for multiple config file formats")
(description
"Plaster is a loader interface around multiple config file formats. It
exists to define a common API for applications to use when they wish to load
configuration. The library itself does not aim to handle anything except a
basic API that applications may use to find and load configuration settings.
Any specific constraints should be implemented in a pluggable loader which can
be registered via an entrypoint.")
(license license:repoze)))
(define-public python-plaster-pastedeploy
(package
(name "python-plaster-pastedeploy")
(version "0.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "plaster_pastedeploy" version))
(sha256
(base32
"1zg7gcsvc1kzay1ry5p699rg2qavfsxqwl17mqxzr0gzw6j9679r"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-plaster" ,python-plaster)
("python-pastedeploy" ,python-pastedeploy)))
(home-page "https://github.com/Pylons/plaster_pastedeploy")
(synopsis "Plugin for python-plaster adding PasteDeploy syntax")
(description
"This plugin for @code{python-plaster} adds support for PasteDeploy
syntax, it provides a plaster @code{Loader} object that can parse ini files
according to the standard set by PasteDeploy ")
(license license:expat)))
(define-public python-hupper
(package
(name "python-hupper")
(version "1.10.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "hupper" version))
(sha256
(base32
"0am0p6g5cz6xmcaf04xq8q6dzdd9qz0phj6gcmpsckf2mcyza61q"))))
(build-system python-build-system)
(arguments '(#:test-target "pytest"))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)
("python-watchdog" ,python-watchdog)
("python-mock" ,python-mock)
("python-pytest-cov" ,python-pytest-cov)))
(propagated-inputs
`(("python-pytz" ,python-pytz)))
(home-page "https://readthedocs.org/projects/hupper")
(synopsis "Integrated process monitor tracking changes to imported Python files")
(description
"Hupper is an integrated process monitor that will track changes to any
imported Python files in sys.modules as well as custom paths. When files are
changed the process is restarted.")
(license license:expat)))
(define-public python-pyramid
(package
(name "python-pyramid")
(version "1.10.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "pyramid" version))
(sha256
(base32
"0rkxs1ajycg2zh1c94xlmls56mx5m161sn8112skj0amza6cn36q"))))
(build-system python-build-system)
(propagated-inputs
`(("python-hupper" ,python-hupper)
("python-plaster-pastedeploy" ,python-plaster-pastedeploy)
("python-translationstring" ,python-translationstring)
("python-venusian" ,python-venusian)
("python-webob" ,python-webob)
("python-zope-deprecation" ,python-zope-deprecation)
("python-zope-interface" ,python-zope-interface)
("python-webtest" ,python-webtest)
("python-zope-component" ,python-zope-component)
("python-plaster" ,python-plaster)))
(home-page "https://trypyramid.com/")
(synopsis "Python web-framework suitable for small and large sites")
(description
"Pyramid makes it easy to write web applications. From minimal
request/response web apps to larger, grown applications.")
(license license:repoze)))
(define-public python-random-user-agent
(package
(name "python-random-user-agent")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "random_user_agent" version))
(sha256
(base32
"04nhzdh2ki7ybhjrmghxci6hcm6i03vvin2q2ynj87fbr1pa534g"))))
(build-system python-build-system)
(home-page "https://github.com/Luqman-Ud-Din/random_user_agent")
(synopsis "List of user agents")
(description
"This package provides a list of user agents, from a collection of more
than 326,000 known user-agents. Users can pick a random one, or select one
based on filters.")
(license license:expat)))

137
gnu/packages/python-xyz.scm
View File

@ -3720,20 +3720,19 @@ Language (TOML) configuration files.")
(define-public python-jsonrpc-server (define-public python-jsonrpc-server
(package (package
(name "python-jsonrpc-server") (name "python-jsonrpc-server")
(version "0.3.2") (version "0.3.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "python-jsonrpc-server" version)) (uri (pypi-uri "python-jsonrpc-server" version))
(sha256 (sha256
(base32 (base32
"0ddgdp26dfxaz6isjbb12974b3rxavgsqrn2zrmck62cmipg5g05")))) "0dzya99nbi4mw7q85vmyw1wfgbx5dpmysnvm0bwx5m4xbi4zafy7"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-future" ,python-future) `(("python-mock" ,python-mock)
("python-mock" ,python-mock)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-ujson" ,python-ujson))) ("python-ujson" ,python-ujson-1)))
(home-page (home-page
"https://github.com/palantir/python-jsonrpc-server") "https://github.com/palantir/python-jsonrpc-server")
(synopsis "JSON RPC 2.0 server library") (synopsis "JSON RPC 2.0 server library")
@ -9479,16 +9478,17 @@ applications.")
(define-public python-apipkg (define-public python-apipkg
(package (package
(name "python-apipkg") (name "python-apipkg")
(version "1.4") (version "1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "apipkg" version)) (uri (pypi-uri "apipkg" version))
(sha256 (sha256
(base32 (base32
"1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f")))) "1xhak74yj3lqflvpijg15rnkklrigvsp5q7s4as4h6a157d8q8ip"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)
("python-setuptools-scm" ,python-setuptools-scm)))
(synopsis "Namespace control and lazy-import mechanism") (synopsis "Namespace control and lazy-import mechanism")
(description "With apipkg you can control the exported namespace of a Python (description "With apipkg you can control the exported namespace of a Python
package and greatly reduce the number of imports for your users. It is a small package and greatly reduce the number of imports for your users. It is a small
@ -9496,9 +9496,6 @@ pure Python module that works on virtually all Python versions.")
(home-page "https://github.com/pytest-dev/apipkg") (home-page "https://github.com/pytest-dev/apipkg")
(license license:expat))) (license license:expat)))
(define-public python2-apipkg
(package-with-python2 python-apipkg))
(define-public python-execnet (define-public python-execnet
(package (package
(name "python-execnet") (name "python-execnet")
@ -11396,14 +11393,14 @@ network support library.")
(define-public python-ply (define-public python-ply
(package (package
(name "python-ply") (name "python-ply")
(version "3.10") (version "3.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ply" version)) (uri (pypi-uri "ply" version))
(sha256 (sha256
(base32 (base32
"1jxsr1d2f732r6ljhvm827113dckwl6qwakfvpbdhcbhvpvlmscn")))) "18qx113g9bi1ac4indd5phma82zcdq601lxncp3vjn43m2mc3iq0"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "http://www.dabeaz.com/ply/") (home-page "http://www.dabeaz.com/ply/")
(synopsis "Python Lex & Yacc") (synopsis "Python Lex & Yacc")
@ -11411,9 +11408,6 @@ network support library.")
It uses LR parsing and does extensive error checking.") It uses LR parsing and does extensive error checking.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python2-ply
(package-with-python2 python-ply))
(define-public python-tabulate (define-public python-tabulate
(package (package
(name "python-tabulate") (name "python-tabulate")
@ -18324,6 +18318,50 @@ services to what you expect in your tests.")
(define-public python-ujson (define-public python-ujson
(package (package
(name "python-ujson") (name "python-ujson")
(version "2.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ujson" version))
(sha256
(base32
"18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "deps") #t))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'link-to-system-double-conversion
(lambda* (#:key inputs #:allow-other-keys)
(let ((d-c (assoc-ref inputs "double-conversion")))
(substitute* "setup.py"
(("./deps/double-conversion/double-conversion\"")
(string-append d-c "/include/double-conversion\""))
(("-lstdc++" stdc)
(string-append "-L" d-c "/lib\","
" \"-ldouble-conversion\","
" \"" stdc)))
#t)))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest"))))))
(native-inputs
`(("double-conversion" ,double-conversion)
("python-setuptools-scm" ,python-setuptools-scm)
("python-pytest" ,python-pytest)))
(home-page "https://github.com/ultrajson/ultrajson")
(synopsis "Ultra fast JSON encoder and decoder for Python")
(description
"UltraJSON is an ultra fast JSON encoder and decoder written in pure C with
bindings for Python 3.")
(license license:bsd-3)))
(define-public python-ujson-1
(package
(inherit python-ujson)
(version "1.35") (version "1.35")
(source (source
(origin (origin
@ -18332,17 +18370,16 @@ services to what you expect in your tests.")
(sha256 (sha256
(base32 (base32
"11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n")))) "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n"))))
(build-system python-build-system) (arguments
'(#:phases %standard-phases))
(native-inputs '())
(home-page "http://www.esn.me") (home-page "http://www.esn.me")
(synopsis
"Ultra fast JSON encoder and decoder for Python")
(description (description
"UltraJSON is an ultra fast JSON encoder and decoder written in pure C with "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with
bindings for Python 2.5+ and 3.") bindings for Python 2.5+ and 3.")))
(license license:bsd-3)))
(define-public python2-ujson (define-public python2-ujson-1
(package-with-python2 python-ujson)) (package-with-python2 python-ujson-1))
(define-public python-iocapture (define-public python-iocapture
;; The latest release is more than a year older than this commit. ;; The latest release is more than a year older than this commit.
@ -18749,7 +18786,8 @@ and cuts down boilerplate code when testing libraries for asyncio.")
(uri (pypi-uri "shouldbe" version)) (uri (pypi-uri "shouldbe" version))
(sha256 (sha256
(base32 (base32
"16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")))) "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj"))
(patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-forbiddenfruit" ,python-forbiddenfruit))) `(("python-forbiddenfruit" ,python-forbiddenfruit)))
@ -19862,3 +19900,54 @@ module. @code{cmd2} provides a wealth of features on top of @code{cmd} to
make your life easier and eliminates much of the boilerplate code which would make your life easier and eliminates much of the boilerplate code which would
be necessary when using @code{cmd}.") be necessary when using @code{cmd}.")
(license license:expat))) (license license:expat)))
(define-public python-pytidylib
(package
(name "python-pytidylib")
(version "0.3.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytidylib" version))
(sha256
(base32
"1wqa9dv5d7swka14rnky862hc7dgk2g3dhlrz57hdn3hb7bwic92"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'build 'qualify-libtidy
(lambda* (#:key inputs #:allow-other-keys)
(let ((libtidy (string-append (assoc-ref inputs "tidy")
"/lib/libtidy.so")))
(substitute* "tidylib/tidy.py"
(("ctypes\\.util\\.find_library\\('tidy'\\)")
(format #f "'~a'" libtidy)))
#t))))))
(inputs `(("tidy" ,tidy)))
(home-page "https://github.com/countergram/pytidylib")
(synopsis "Python wrapper for HTML Tidy library")
(description
"PyTidyLib is a Python package that wraps the HTML Tidy library. This
allows you, from Python code, to “fix” invalid (X)HTML markup.")
(license license:expat)))
(define-public python2-pytidylib
(package-with-python2 python-pytidylib))
(define-public python-mujson
(package
(name "python-mujson")
(version "1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mujson" version))
(sha256
(base32
"0wbj6r8yzsdx2b0kbldlkznr1a9nn33za2q9x3g0hbg420dwzn97"))))
(build-system python-build-system)
(home-page "https://github.com/mattgiles/mujson")
(synopsis "Use the fastest JSON functions available at import time")
(description "This packages selects the fastest JSON functions available
at import time.")
(license license:expat)))

4
gnu/packages/radio.scm
View File

@ -159,7 +159,7 @@ this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}")
(define-public chirp (define-public chirp
(package (package
(name "chirp") (name "chirp")
(version "20181205") (version "20200430")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -167,7 +167,7 @@ this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}")
version "/chirp-daily-" version ".tar.gz")) version "/chirp-daily-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("python2-libxml2" ,python2-libxml2) `(("python2-libxml2" ,python2-libxml2)

6
gnu/packages/rails.scm
View File

@ -555,12 +555,6 @@ application bootup, plugins, generators, and Rake tasks.")
;; tzinfo-data is propagated by ruby-activesupport, but it ;; tzinfo-data is propagated by ruby-activesupport, but it
;; needs to be in the Gemfile to become available. ;; needs to be in the Gemfile to become available.
(("group :test do") "group :test do\n gem 'tzinfo-data'")) (("group :test do") "group :test do\n gem 'tzinfo-data'"))
#t))
(add-after 'unpack 'fix-mocha-minitest-require
(lambda _
(substitute* "test/test_helper.rb"
;; This chanegd in recent versions of Mocha
(("mocha/minitest") "mocha/mini_test"))
#t))))) #t)))))
(propagated-inputs (propagated-inputs
`(("ruby-actionview" ,ruby-actionview) `(("ruby-actionview" ,ruby-actionview)

559
gnu/packages/ruby.scm
View File

@ -1542,6 +1542,49 @@ a Ruby object.")
(home-page "https://github.com/rails/execjs") (home-page "https://github.com/rails/execjs")
(license license:expat))) (license license:expat)))
(define-public ruby-fakefs
(package
(name "ruby-fakefs")
(version "1.2.2")
(home-page "https://github.com/fakefs/fakefs")
(source (origin
;; The Rubygems release does not contain tests.
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"008dq9knyip2bfbl0mrk8b8r7bv0k3bf128wcfqsgy1rqal4mgwk"))))
(build-system ruby-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "fakefs.gemspec"
(("`git ls-files lib README.md LICENSE`")
"`find lib README.md LICENSE -type f | sort`"))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
;; Drop hard version requirements for test dependencies.
(substitute* "fakefs.gemspec"
(("(.*add_development_dependency .*), .*" _ dep)
(string-append dep "\n")))
#t)))))
(native-inputs
`(("ruby-bump" ,ruby-bump)
("ruby-maxitest" ,ruby-maxitest)
("ruby-rubocop" ,ruby-rubocop)
("ruby-rspec" ,ruby-rspec)))
(synopsis "Fake file system for Ruby")
(description
"This package provides a fake file system for use in test suites. It
avoids the need for manually creating temporary directories, or dealing
with platform intricacies in @code{File} and @code{FileUtils}.")
(license license:expat)))
(define-public ruby-orderedhash (define-public ruby-orderedhash
(package (package
(name "ruby-orderedhash") (name "ruby-orderedhash")
@ -1840,6 +1883,57 @@ libraries such as Libnotify.")
(home-page "https://github.com/guard/notiffany") (home-page "https://github.com/guard/notiffany")
(license license:expat))) (license license:expat)))
(define-public ruby-forking-test-runner
(package
(name "ruby-forking-test-runner")
(version "1.6.0")
(home-page "https://github.com/grosser/forking_test_runner")
(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
"1mrglzkj2nrgisccf2f30zbfmcs0awv1g3lw994b2az90fl39x8m"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "spec"
;; FIXME: ActiveRecord depends on sqlite3 1.3.6, but Guix has
;; 1.4.1, which in turn breaks the tests that use ActiveRecord.
#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "forking_test_runner.gemspec"
(("`git ls-files lib/ bin/ MIT-LICENSE`")
"`find lib/ bin/ MIT-LICENSE -type f | sort`"))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
;; Ignore hard coded version constraints for the tests.
(delete-file "Gemfile.lock")
#t))
(add-before 'check 'set-HOME
(lambda _
;; Many tests invoke Bundler, and fails when Bundler
;; warns that /homeless-shelter does not exist.
(setenv "HOME" "/tmp")
#t)))))
(native-inputs
`(("ruby-activerecord" ,ruby-activerecord)
("ruby-bump" ,ruby-bump)
("ruby-rspec" ,ruby-rspec)
("ruby-sqlite3" ,ruby-sqlite3)
("ruby-wwtd" ,ruby-wwtd)))
(propagated-inputs
`(("ruby-parallel-tests" ,ruby-parallel-tests)))
(synopsis "Run every test in a fork")
(description
"This package is a wrapper around @code{parallel_tests} that runs every
test in a fork to avoid pollution and get clean output per test.")
(license license:expat)))
(define-public ruby-formatador (define-public ruby-formatador
(package (package
(name "ruby-formatador") (name "ruby-formatador")
@ -2311,6 +2405,65 @@ interface for Ruby programs.")
(home-page "https://github.com/mperham/connection_pool") (home-page "https://github.com/mperham/connection_pool")
(license license:expat))) (license license:expat)))
(define-public ruby-fast-gettext
(package
(name "ruby-fast-gettext")
(version "2.0.2")
(home-page "https://github.com/grosser/fast_gettext")
(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
"1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "spec"
#:phases (modify-phases %standard-phases
(add-before 'check 'remove-version-constraints
(lambda _
(delete-file "Gemfile.lock")
#t))
(add-before 'check 'remove-activerecord-test
(lambda _
;; FIXME: This test fails because ActiveRecord depends on
;; a different version of ruby-sqlite than the currently
;; available one.
(delete-file
"spec/fast_gettext/translation_repository/db_spec.rb")
#t))
(add-before 'check 'disable-i18n-test
(lambda _
;; XXX: This test checks i18n intricasies with Rails 3 and
;; automatically disables itself for Rails 4.0, but does
;; not know about newer versions as it has not been updated
;; since 2014. Disable for later versions of Rails too.
(substitute* "spec/fast_gettext/vendor/string_spec.rb"
(((string-append "ActiveRecord::VERSION::MAJOR == 4 and "
"ActiveRecord::VERSION::MINOR == 0"))
"ActiveRecord::VERSION::MAJOR >= 4"))
#t)))))
(native-inputs
`(;; For tests.
("ruby-activerecord" ,ruby-activerecord)
("ruby-activesupport" ,ruby-activesupport)
("ruby-bump" ,ruby-bump)
("ruby-forking-test-runner" ,ruby-forking-test-runner)
("ruby-i18n" ,ruby-i18n)
("ruby-rubocop" ,ruby-rubocop)
("ruby-rspec" ,ruby-rspec)
("ruby-single-cov" ,ruby-single-cov)
("ruby-sqlite3" ,ruby-sqlite3)
("ruby-wwtd" ,ruby-wwtd)))
(synopsis "Fast implementation of @code{GetText}")
(description
"This package provides an alternative implementation of the Ruby
@code{GetText} library that is approximately 12x faster yet thread safe.")
;; Some parts are covered by the Ruby license, see file headers.
(license (list license:expat license:ruby))))
(define-public ruby-net-http-persistent (define-public ruby-net-http-persistent
(package (package
(name "ruby-net-http-persistent") (name "ruby-net-http-persistent")
@ -2987,62 +3140,90 @@ Ruby, but can be used for all programs.")
(home-page "https://github.com/alexch/rerun/") (home-page "https://github.com/alexch/rerun/")
(license license:expat))) (license license:expat)))
(define-public ruby-maxitest
(package
(name "ruby-maxitest")
(version "3.6.0")
(home-page "https://github.com/grosser/maxitest")
(source (origin
;; Pull from git because the gem does not contain tests.
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07b3j0bv3dx5j42jlvpvl07aaxplyi6wq688y3jl8y528ww2hjz8"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "default"
#:phases (modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "maxitest.gemspec"
(("`git ls-files lib/ bin/ MIT-LICENSE Readme.md`")
"`find lib/ bin/ MIT-LICENSE Readme.md -type f | sort`"))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
;; Don't use specific versions of dependencies, instead
;; take whatever is available in Guix.
(delete-file "Gemfile.lock")
#t))
(add-before 'check 'add-mtest-on-PATH
(lambda _
;; Tests use 'mtest' which is not automatically added on
;; PATH.
(setenv "PATH" (string-append (getcwd) "/bin:"
(getenv "PATH")))
#t)))))
(native-inputs
`(("ps" ,procps)
("ruby-bump" ,ruby-bump)
("ruby-byebug" ,ruby-byebug)
("ruby-rspec" ,ruby-rspec)
("ruby-wwtd" ,ruby-wwtd)))
(propagated-inputs
`(("ruby-minitest" ,ruby-minitest)))
(synopsis "Minitest with extra features")
(description
"Maxitest is a wrapper around Minitest with extra functionality such
as timeouts, an @command{mtest} executable that can run tests by line
number, support for interrupted tests, better backtraces, and more.")
(license license:expat)))
(define-public ruby-mocha (define-public ruby-mocha
(package (package
(name "ruby-mocha") (name "ruby-mocha")
(version "1.1.0") (version "1.11.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "mocha" version)) (uri (rubygems-uri "mocha" version))
(sha256 (sha256
(base32 (base32
"107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi")))) "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'add-test-unit-to-search-path (add-before 'check 'remove-rubocop-dependency
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let* ((test-unit (assoc-ref inputs "ruby-test-unit"))) ;; Disable dependency on Rubocop, which is just a linter,
(substitute* "Rakefile" ;; and would introduce a circular dependency.
(("t\\.libs << 'test'" line) (substitute* "mocha.gemspec"
(string-append line "; t.libs << \"" ((".*rubocop.*")
test-unit "/lib/ruby/vendor_ruby" "true\n"))
"/gems/test-unit-" #t)))))
,(package-version ruby-test-unit)
"/lib\""))))
#t))
(add-before 'check 'use-latest-redcarpet
(lambda _
(substitute* "mocha.gemspec"
(("<redcarpet>.freeze, \\[\"~> 1\"\\]")
"<redcarpet>.freeze, [\">= 3\"]"))
#t))
(add-before 'check 'hardcode-version
(lambda _
;; Mocha is undefined at build time
(substitute* "Rakefile"
(("#\\{Mocha::VERSION\\}") ,version))
#t))
(add-before 'check 'remove-failing-test
;; FIXME: This test fails for reasons unrelated to Guix packaging.
(lambda _
(delete-file "test/acceptance/stubbing_nil_test.rb")
#t)))))
(propagated-inputs
`(("ruby-metaclass" ,ruby-metaclass)))
(native-inputs (native-inputs
`(("bundler" ,bundler) `(("ruby-introspection" ,ruby-introspection)))
("ruby-yard" ,ruby-yard)
("ruby-introspection" ,ruby-introspection)
("ruby-test-unit" ,ruby-test-unit)
("ruby-redcarpet" ,ruby-redcarpet)))
(synopsis "Mocking and stubbing library for Ruby") (synopsis "Mocking and stubbing library for Ruby")
(description (description
"Mocha is a mocking and stubbing library with JMock/SchMock syntax, which "Mocha is a mocking and stubbing library with JMock/SchMock syntax, which
allows mocking and stubbing of methods on real (non-mock) classes.") allows mocking and stubbing of methods on real (non-mock) classes.")
(home-page "http://gofreerange.com/mocha/docs") (home-page "http://gofreerange.com/mocha/docs")
(license license:expat))) ;; Mocha can be used with either license at the users choice.
(license (list license:expat license:ruby))))
(define-public ruby-mocha-on-bacon (define-public ruby-mocha-on-bacon
(package (package
@ -3502,6 +3683,28 @@ URIs using the normal URI.parse method.")
(home-page "https://github.com/dball/data_uri") (home-page "https://github.com/dball/data_uri")
(license license:expat))) (license license:expat)))
(define-public ruby-deep-merge
(package
(name "ruby-deep-merge")
(version "1.2.1")
(home-page "https://github.com/danielsdeleo/deep_merge")
;; The Rubygem source does not contain the gemspec required for tests.
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0c9rk23ilhc0n4489y6lda2wzphpzh6ish6fahlbpjhxn82wb931"))))
(build-system ruby-build-system)
(native-inputs
`(("ruby-minitest" ,ruby-minitest)))
(synopsis "Recursively merge hashes")
(description
"Deep Merge is a set of utility functions for @code{Hash}. It permits
you to merge elements inside a hash together recursively.")
(license license:expat)))
(define-public ruby-git (define-public ruby-git
(package (package
(name "ruby-git") (name "ruby-git")
@ -3538,6 +3741,38 @@ and manipulate Git repositories by wrapping system calls to the git binary.")
(home-page "https://github.com/schacon/ruby-git") (home-page "https://github.com/schacon/ruby-git")
(license license:expat))) (license license:expat)))
(define-public ruby-hocon
(package
(name "ruby-hocon")
(version "1.3.0")
(home-page "https://github.com/puppetlabs/ruby-hocon")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416"))))
(build-system ruby-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "rspec")
(format #t "test suite not run~%"))
#t)))))
(native-inputs
`(("bundler" ,bundler)
("ruby-rspec" ,ruby-rspec)))
(synopsis "HOCON config library")
(description
"This package provides Ruby support for the @acronym{HOCON,
Human-Optimized Config Object Notation} configuration file format. It
supports parsing and modifying HOCON and JSON files, and rendering parsed
objects back to a @code{String}.")
(license license:asl2.0)))
(define-public ruby-slop (define-public ruby-slop
(package (package
(name "ruby-slop") (name "ruby-slop")
@ -3867,6 +4102,70 @@ for select languages.")
(home-page "http://coderay.rubychan.de") (home-page "http://coderay.rubychan.de")
(license license:expat))) (license license:expat)))
(define-public ruby-parallel-tests
(package
(name "ruby-parallel-tests")
(version "2.32.0")
(home-page "https://github.com/grosser/parallel_tests")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (string-append name version))
(sha256
(base32
"0l2rjz9fnxv7hvz679v7a75mghsh9x9qpvbyapiavqsx21v42l7m"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "default"
#:phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-shell-invokations
(lambda _
(substitute* '("lib/parallel_tests/tasks.rb"
"spec/parallel_tests/tasks_spec.rb")
(("/bin/sh") (which "sh"))
(("/bin/bash") (which "bash")))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
;; Remove hard coded version constraints, instead just
;; use whatever versions are available in Guix.
(delete-file "Gemfile.lock")
(substitute* "Gemfile"
(("'minitest',.*")
"'minitest'\n")
(("'cucumber',.*")
"'cucumber'\n"))
#t))
(add-before 'check 'disable-rails-test
(lambda _
;; XXX: This test attempts to download and run the test
;; suites of multiple Rails versions(!) directly.
(delete-file "spec/rails_spec.rb")
#t))
(add-before 'check 'set-HOME
(lambda _
;; Some tests check the output of Bundler, and fail when
;; Bundler warns that /homeless-shelter does not exist.
(setenv "HOME" "/tmp")
#t)))))
(native-inputs
`(("ruby-bump" ,ruby-bump)
("ruby-cucumber" ,ruby-cucumber)
("ruby-minitest" ,ruby-minitest)
("ruby-rake" ,ruby-rake)
("ruby-rspec" ,ruby-rspec)
("ruby-spinach" ,ruby-spinach)))
(propagated-inputs
`(("ruby-parallel" ,ruby-parallel)))
(synopsis "Run tests in parallel")
(description
"This package can speed up @code{Test::Unit}, @code{RSpec},
@code{Cucumber}, and @code{Spinach} tests by running them concurrently
across multiple CPU cores.")
(license license:expat)))
(define-public ruby-parser (define-public ruby-parser
(package (package
(name "ruby-parser") (name "ruby-parser")
@ -4023,6 +4322,61 @@ invocation, and source and documentation browsing.")
(home-page "https://pryrepl.org") (home-page "https://pryrepl.org")
(license license:expat))) (license license:expat)))
(define-public ruby-single-cov
(package
(name "ruby-single-cov")
(version "1.3.2")
(home-page "https://github.com/grosser/single_cov")
(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
"05qdzpcai1p23a120gb9bxkfl4y73k9hicx34ch2lsk31lgi9bl7"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "default"
#:phases (modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "single_cov.gemspec"
(("`git ls-files lib/ bin/ MIT-LICENSE`")
"`find lib/ bin/ MIT-LICENSE -type f | sort`"))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
(delete-file "Gemfile.lock")
#t))
(add-before 'check 'make-files-writable
(lambda _
;; Tests need to create local directories and open files
;; with write permissions.
(for-each make-file-writable
(find-files "specs" #:directories? #t))
#t))
(add-before 'check 'disable-failing-test
(lambda _
;; XXX: This test copies assets from minitest, but can
;; not cope with the files being read-only. Just skip
;; it for now.
(substitute* "specs/single_cov_spec.rb"
(("it \"complains when coverage is bad\"")
"xit \"complains when coverage is bad\""))
#t)))))
(native-inputs
`(("ruby-bump" ,ruby-bump)
("ruby-minitest" ,ruby-minitest)
("ruby-rspec" ,ruby-rspec)
("ruby-simplecov" ,ruby-simplecov)))
(synopsis "Code coverage reporting tool")
(description
"This package provides actionable code coverage reports for Ruby
projects. It has very little overhead and can be easily integrated with
development tools to catch coverage problems early.")
(license license:expat)))
(define-public ruby-guard (define-public ruby-guard
(package (package
(name "ruby-guard") (name "ruby-guard")
@ -4072,6 +4426,34 @@ file or directories are modified.")
(home-page "https://guardgem.org/") (home-page "https://guardgem.org/")
(license license:expat))) (license license:expat)))
(define-public ruby-spinach
(package
(name "ruby-spinach")
(version "0.11.0")
(home-page "http://github.com/codegram/spinach")
(source (origin
(method url-fetch)
(uri (rubygems-uri "spinach" version))
(sha256
(base32
"1mv053mqz9c8ngqa6wp1ymk2fax6j0yqzax6918akrdr7c3fx3c6"))))
(build-system ruby-build-system)
(arguments
;; FIXME: Disable tests altogether because they depend on 'capybara'
;; which in turn depends on many other unpackaged gems. Enable once
;; capybara is available.
'(#:tests? #f))
(propagated-inputs
`(("ruby-colorize" ,ruby-colorize)
("ruby-gherkin-ruby" ,ruby-gherkin-ruby)
("ruby-json" ,ruby-json)))
(synopsis "Gherkin-based BDD framework")
(description
"Spinach is a high-level @acronym{BDD, Behavior-driven development}
framework that leverages the expressive @code{Gherkin} language to help you
define executable specifications of your code.")
(license license:expat)))
(define-public ruby-tilt (define-public ruby-tilt
(package (package
(name "ruby-tilt") (name "ruby-tilt")
@ -5517,6 +5899,25 @@ It is intended be used by all Cucumber implementations to parse
(home-page "https://github.com/cucumber-attic/gherkin") (home-page "https://github.com/cucumber-attic/gherkin")
(license license:expat))) (license license:expat)))
(define-public ruby-gherkin-ruby
(package
(name "ruby-gherkin-ruby")
(version "0.3.2")
(home-page "http://github.com/codegram/gherkin-ruby")
(source (origin
(method url-fetch)
(uri (rubygems-uri "gherkin-ruby" version))
(sha256
(base32
"18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1"))))
(build-system ruby-build-system)
(synopsis "Pure Ruby Gherkin parser")
(description
"Gherkin-ruby is a Gherkin parser written in pure Ruby and less than
200 lines of code.")
;; XXX: No license information anywhere but Readme.md.
(license license:expat)))
(define-public ruby-aruba (define-public ruby-aruba
(package (package
(name "ruby-aruba") (name "ruby-aruba")
@ -7642,6 +8043,36 @@ is part of Ruby's standard library. It more closely conforms to RFC 3986,
RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public ruby-colorize
(package
(name "ruby-colorize")
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (rubygems-uri "colorize" version))
(sha256
(base32
"133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"))))
(build-system ruby-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'check 'remove-codeclimate-dependency
(lambda _
(substitute* "test/test_colorize.rb"
;; Do not hook the tests into the online CodeClimate
;; service which is unnecessary for these tests.
(("require 'codeclimate-test-reporter'")
"")
(("CodeClimate.*") ""))
#t)))))
(synopsis "Add color effects to the @code{String} class")
(description
"This package extends the @code{String} class and adds a
@code{ColorizedString} with methods to set text color, background color,
and text effects.")
(home-page "http://github.com/fazibear/colorize")
(license license:gpl2+)))
(define-public ruby-colorator (define-public ruby-colorator
(package (package
(name "ruby-colorator") (name "ruby-colorator")
@ -9096,3 +9527,55 @@ which snapshots to consider and what files to include.")
(home-page (home-page
"https://github.com/hartator/wayback-machine-downloader") "https://github.com/hartator/wayback-machine-downloader")
(license license:expat))) (license license:expat)))
(define-public ruby-wwtd
(package
(name "ruby-wwtd")
(version "1.4.1")
(home-page "http://github.com/grosser/wwtd")
(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
"0gw7vfnbb41cy67yw82zji3jkhfsgmzcgzaszm99ax77y18wclf2"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove bundled library.
(delete-file "spec/rake-12.3.0.gem")
#t))))
(build-system ruby-build-system)
(arguments
'(;; XXX: Tests need multiple versions of ruby, wants to run
;; `bundle install`, etc.
#:tests? #f
#:phases (modify-phases %standard-phases
(replace 'replace-git-ls-files
(lambda _
(substitute* "wwtd.gemspec"
(("git ls-files lib/ bin/`")
"find lib/ bin/ -type f |sort`"))
#t))
(add-before 'check 'remove-version-constraints
(lambda _
(delete-file "Gemfile.lock")
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "rspec" "spec/")
(format #t "test suite not run~%"))
#t)))))
(native-inputs
`(("ruby-bump" ,ruby-bump)
("ruby-rspec" ,ruby-rspec)))
(synopsis "Run @file{.travis.yml} files locally")
(description
"WWTD is a @dfn{Travis Simulator} that lets you run test matrices
defined in @file{.travis.yml} on your local machine, using @code{rvm},
@code{rbenv}, or @code{chruby} to test different versions of Ruby.")
(license license:expat)))

8
gnu/packages/scanner.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -39,16 +39,16 @@
(define-public sane-backends-minimal (define-public sane-backends-minimal
(package (package
(name "sane-backends-minimal") (name "sane-backends-minimal")
(version "1.0.29") (version "1.0.30")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://gitlab.com/sane-project/backends/uploads/" "https://gitlab.com/sane-project/backends/uploads/"
"54f858b20a364fc35d820df935a86478/" "c3dd60c9e054b5dee1e7b01a7edc98b0/"
"sane-backends-" version ".tar.gz")) "sane-backends-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vd83vhl0hddwsdh2jb0k3yzycfghi2xa9lc3ga9r12rbx77n0ma")) "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Generated HTML files and udev rules normally embed a ;; Generated HTML files and udev rules normally embed a

6
gnu/packages/scheme.scm
View File

@ -395,7 +395,7 @@ implementation techniques and as an expository tool.")
(define-public racket (define-public racket
(package (package
(name "racket") (name "racket")
(version "7.6") (version "7.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "http://mirror.racket-lang.org/installers/" (uri (list (string-append "http://mirror.racket-lang.org/installers/"
@ -405,7 +405,7 @@ implementation techniques and as an expository tool.")
version "/racket-" version "-src.tgz"))) version "/racket-" version "-src.tgz")))
(sha256 (sha256
(base32 (base32
"0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8")) "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2"))
(patches (search-patches (patches (search-patches
"racket-store-checksum-override.patch")))) "racket-store-checksum-override.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -537,7 +537,7 @@ of libraries.")
version "/racket-minimal-" version "-src.tgz"))) version "/racket-minimal-" version "-src.tgz")))
(sha256 (sha256
(base32 (base32
"0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y")) "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln"))
(patches (search-patches (patches (search-patches
"racket-store-checksum-override.patch")))) "racket-store-checksum-override.patch"))))
(synopsis "Racket without bundled packages such as Dr. Racket") (synopsis "Racket without bundled packages such as Dr. Racket")

27
gnu/packages/shells.scm
View File

@ -493,21 +493,31 @@ ksh, and tcsh.")
(define-public xonsh (define-public xonsh
(package (package
(name "xonsh") (name "xonsh")
(version "0.6.2") (version "0.9.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "xonsh" version)) (uri (pypi-uri "xonsh" version))
(sha256 (sha256
(base32 (base32
"0c2bbmdg0n10q54vq9k1z5n53l0mh1hb1q5xprfhilvrbr6hlcwr")) "1h4rrwzwiwkyi9p49sjn97rl39fqq2r23hchzsw0s3fcwa7m8fkj"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; Delete bundled ply. ;; Delete bundled PLY.
(delete-file-recursively "xonsh/ply") (delete-file-recursively "xonsh/ply")
(substitute* '("setup.py") (substitute* "setup.py"
(("'xonsh\\.ply\\.ply',") "")) (("\"xonsh\\.ply\\.ply\",") ""))
;; Use our properly packaged PLY instead.
(substitute* (list "setup.py"
"tests/test_lexer.py"
"xonsh/__amalgam__.py"
"xonsh/lexer.py"
"xonsh/parsers/base.py"
"xonsh/xonfig.py")
(("from xonsh\\.ply\\.(.*) import" _ module)
(format #f "from ~a import" module))
(("from xonsh\\.ply import") "import"))
#t)))) #t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
@ -780,9 +790,9 @@ Shell (pdksh).")
(license (list miros (license (list miros
isc)))) ; strlcpy.c isc)))) ; strlcpy.c
(define-public oil-shell (define-public oil
(package (package
(name "oil-shell") (name "oil")
(version "0.7.0") (version "0.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -826,6 +836,9 @@ is commonly written.")
(license (list psfl ; The Oil sources include a patched Python 2 source tree (license (list psfl ; The Oil sources include a patched Python 2 source tree
asl2.0)))) asl2.0))))
(define-public oil-shell
(deprecated-package "oil-shell" oil))
(define-public gash (define-public gash
(package (package
(name "gash") (name "gash")

6
gnu/packages/shellutils.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca> ;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -46,7 +46,7 @@
(define-public zsh-autosuggestions (define-public zsh-autosuggestions
(package (package
(name "zsh-autosuggestions") (name "zsh-autosuggestions")
(version "0.6.3") (version "0.6.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -55,7 +55,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c")))) "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("ruby" ,ruby) `(("ruby" ,ruby)

280
gnu/packages/suckless.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,28 +25,28 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages suckless) (define-module (gnu packages suckless)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gnome) #:use-module (gnu packages base)
#:use-module (gnu packages image)
#:use-module (gnu packages xorg)
#:use-module (gnu packages fonts)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages webkit)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages mpd)
#:use-module (gnu packages linux)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages ncurses) #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages base) #:use-module (gnu packages gnome)
#:use-module (gnu packages libbsd)) #:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages linux)
#:use-module (gnu packages mpd)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xorg)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
(define-public blind (define-public blind
(package (package
@ -61,10 +61,13 @@
"0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94")))) "0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags (list #:make-flags
"CC=gcc" (let ((target ,(%current-target-system)))
(string-append "PREFIX=" %output)) (list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -147,12 +150,16 @@ optimising the environment for the application in use and the task performed.")
"0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk")))) "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output) (let ((target ,(%current-target-system)))
(string-append "FREETYPEINC=" (list (string-append "CC=" (if target
(assoc-ref %build-inputs "freetype") (string-append target "-gcc")
"/include/freetype2")) "gcc"))
(string-append "PREFIX=" %output)
(string-append "FREETYPEINC="
(assoc-ref %build-inputs "freetype")
"/include/freetype2")))
#:phases #:phases
(modify-phases %standard-phases (delete 'configure)))) (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
@ -175,15 +182,19 @@ numbers of user-defined menu items efficiently.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "spoon-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jpmg9k9f4f3lpz0k3cphqjswlyf8lz2sm8ccifiip93kd4rrdj0")))) "1jpmg9k9f4f3lpz0k3cphqjswlyf8lz2sm8ccifiip93kd4rrdj0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)))) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
@ -208,9 +219,13 @@ numbers of user-defined menu items efficiently.")
"0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m")))) "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases (modify-phases %standard-phases (delete 'configure)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
@ -226,19 +241,23 @@ numbers of user-defined menu items efficiently.")
(define-public st (define-public st
(package (package
(name "st") (name "st")
(version "0.8.2") (version "0.8.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.suckless.org/st/st-" (uri (string-append "https://dl.suckless.org/st/st-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf")))) (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -277,9 +296,13 @@ drawing.")
"07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps")))) "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -323,15 +346,18 @@ point surf to another URI by setting its XProperties.")
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configuration (delete 'configure)) ; no configuration
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:make-flags (let ((pkg-config (lambda (flag) #:make-flags
(string-append (let ((target ,(%current-target-system))
"$(shell pkg-config " flag " " (pkg-config (lambda (flag)
"xft fontconfig x11 libpng)")))) (string-append
(list "$(shell pkg-config " flag " "
"CC=gcc" "xft fontconfig x11 libpng)"))))
(string-append "PREFIX=" %output) (list (string-append "CC=" (if target
(string-append "INCS=-I. " (pkg-config "--cflags")) (string-append target "-gcc")
(string-append "LIBS=" (pkg-config "--libs") " -lm"))))) "gcc"))
(string-append "PREFIX=" %output)
(string-append "INCS=-I. " (pkg-config "--cflags"))
(string-append "LIBS=" (pkg-config "--libs") " -lm")))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
@ -356,15 +382,19 @@ few minutes.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "xbattmon-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)))) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))))
(inputs (inputs
`(("libx11" ,libx11))) `(("libx11" ,libx11)))
(home-page "https://git.2f30.org/xbattmon/") (home-page "https://git.2f30.org/xbattmon/")
@ -381,7 +411,7 @@ few minutes.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "wificurse-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"067ghr1xly5ca41kc83xila1p5hpq0bxfcmc8jvxi2ggm6wrhavn")))) "067ghr1xly5ca41kc83xila1p5hpq0bxfcmc8jvxi2ggm6wrhavn"))))
@ -414,18 +444,22 @@ drivers capable of injecting packets in wireless networks.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "skroll-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://2f30.org/") (home-page "https://2f30.org/")
(synopsis "Commandline utility which scrolls text") (synopsis "Commandline utility which scrolls text")
(description (description
@ -442,18 +476,22 @@ left.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "sbm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/sbm/") (home-page "https://git.2f30.org/sbm/")
(synopsis "Simple bandwidth monitor") (synopsis "Simple bandwidth monitor")
(description (description
@ -468,18 +506,22 @@ left.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "prout-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("cups-minimal" ,cups-minimal) `(("cups-minimal" ,cups-minimal)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -507,8 +549,12 @@ cups server to be installed.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -541,8 +587,12 @@ cups server to be installed.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -559,20 +609,23 @@ environment variable.")
(define-public fortify-headers (define-public fortify-headers
(package (package
(name "fortify-headers") (name "fortify-headers")
(version "1.0") (version "1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "fortify-headers-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1dhz41jq1azcf7rbvga8w6pnx19l1j9r6jwj8qrlrfnjl9hdi9bb"))))
"0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -605,18 +658,22 @@ initially intended to be used on musl-based Linux distributions.
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "colors-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("libpng" ,libpng))) `(("libpng" ,libpng)))
(home-page "https://git.2f30.org/colors/") (home-page "https://git.2f30.org/colors/")
@ -635,25 +692,29 @@ colormap to stdout.")
(commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b")) (commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b"))
(package (package
(name "libutf") (name "libutf")
(version (string-append "0.0.0-" revision "." (string-take commit 7))) (version (git-version "0.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cls/libutf") (url "https://github.com/cls/libutf")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("gawk" ,gawk))) `(("gawk" ,gawk)))
(home-page "https://github.com/cls/libutf") (home-page "https://github.com/cls/libutf")
@ -677,26 +738,29 @@ as -1, to be used instead of U+FFFD.
;; No release tarballs so far. ;; No release tarballs so far.
(define-public lchat (define-public lchat
(let ((revision "3") (let ((revision "4")
(commit "f95191970fd59c52a8b09cff32bd8d2135cbfc6b")) (commit "e3b64e67b9b9d832462382246474ce1e7d92217c"))
(package (package
(name "lchat") (name "lchat")
(version (string-append "0.0.0-" revision "." (string-take commit 7))) (version (git-version "0.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/younix/lchat") (url "https://github.com/younix/lchat")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version "-checkout")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1qcjqbgmsskc04j2r6xl3amkwj05n520sq1wv2mqyqncz42qrxm0"))))
"07pxzziczhzprmjy61k7nl9i1kxpgnad37qkjf5fn4wf06nqdxpl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -733,18 +797,22 @@ chat output in the background.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.2f30.org/releases/" (uri (string-append "https://dl.2f30.org/releases/"
name "-" version ".tar.gz")) "scron-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/scron/") (home-page "https://git.2f30.org/scron/")
(synopsis "Simple cron daemon") (synopsis "Simple cron daemon")
(description (description

27
gnu/packages/syndication.scm
View File

@ -30,6 +30,7 @@
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -169,3 +170,29 @@ file system, and many more features.")
"Tuir provides a simple terminal viewer for Reddit (Terminal UI for Reddit).") "Tuir provides a simple terminal viewer for Reddit (Terminal UI for Reddit).")
(license (list license:expat (license (list license:expat
license:gpl3+)))) ; tuir/packages/praw license:gpl3+)))) ; tuir/packages/praw
(define-public rawdog
(package
(name "rawdog")
(version "2.23")
(source
(origin
(method url-fetch)
(uri (string-append "https://offog.org/files/rawdog-"
version ".tar.gz"))
(sha256
(base32
"18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2.7))
(inputs
`(("python2-feedparser" ,python2-feedparser)
("python2-pytidylib" ,python2-pytidylib)))
(home-page "https://offog.org/code/rawdog/")
(synopsis "RSS Aggregator Without Delusions Of Grandeur")
(description
"@command{rawdog} is a feed aggregator, capable of producing a personal
\"river of news\" or a public \"planet\" page. It supports all common feed
formats, including all versions of RSS and Atom.")
(license license:gpl2+)))

3
gnu/packages/telephony.scm
View File

@ -620,7 +620,8 @@ address of one of the participants.")
(for-each (lambda (file) (install-file file lib)) (for-each (lambda (file) (install-file file lib))
(find-files "." "\\.so\\.")) (find-files "." "\\.so\\."))
(for-each (lambda (file) (install-file file lib)) (for-each (lambda (file) (install-file file lib))
(find-files "release/plugins" "\\.so$")))))))) (find-files "release/plugins" "\\.so$"))
#t))))))
(inputs (inputs
`(("avahi" ,avahi) `(("avahi" ,avahi)
("boost" ,boost) ("boost" ,boost)

37
gnu/packages/textutils.scm
View File

@ -151,24 +151,27 @@ libenca and several charset conversion libraries and tools.")
(sha256 (sha256
(base32 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) (base32 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs ;test data that is otherwise downloaded with curl (native-inputs
`(("NormalizationTest.txt" (let ((UNICODE_VERSION "13.0.0")) ; defined in data/Makefile
,(origin ;; Test data that is otherwise downloaded with curl.
(method url-fetch) `(("NormalizationTest.txt"
(uri (string-append "https://www.unicode.org/Public/13.0.0/ucd/" ,(origin
"NormalizationTest.txt")) (method url-fetch)
(sha256 (uri (string-append "https://www.unicode.org/Public/"
(base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) UNICODE_VERSION "/ucd/NormalizationTest.txt"))
("GraphemeBreakTest.txt" (sha256
,(origin (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn"))))
(method url-fetch) ("GraphemeBreakTest.txt"
(uri (string-append "https://www.unicode.org/Public/13.0.0/ucd/" ,(origin
"auxiliary/GraphemeBreakTest.txt")) (method url-fetch)
(sha256 (uri (string-append "https://www.unicode.org/Public/"
(base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) UNICODE_VERSION
"/ucd/auxiliary/GraphemeBreakTest.txt"))
(sha256
(base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj"))))
;; For tests. ;; For tests.
("perl" ,perl))) ("perl" ,perl))))
(arguments (arguments
'(#:make-flags (list "CC=gcc" '(#:make-flags (list "CC=gcc"
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" (assoc-ref %outputs "out")))

16
gnu/packages/tor.scm
View File

@ -51,24 +51,28 @@
(define-public tor (define-public tor
(package (package
(name "tor") (name "tor")
(version "0.4.2.7") (version "0.4.3.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dist.torproject.org/tor-" (uri (string-append "https://dist.torproject.org/tor-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886")))) "0s6qspi102drn1nk3gfxs51x992xarc44gkfsi8y3l48wr50wsk1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-lzma"
"--enable-zstd")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python" ,python-2))) ; for tests ("python" ,python))) ; for tests
(inputs (inputs
`(("zlib" ,zlib) `(("libevent" ,libevent)
("openssl" ,openssl)
("libevent" ,libevent)
("libseccomp" ,libseccomp) ("libseccomp" ,libseccomp)
("openssl" ,openssl)
("xz" ,xz) ("xz" ,xz)
("zlib" ,zlib)
("zstd" ,zstd "lib"))) ("zstd" ,zstd "lib")))
(home-page "https://www.torproject.org/") (home-page "https://www.torproject.org/")
(synopsis "Anonymous network router to improve privacy on the Internet") (synopsis "Anonymous network router to improve privacy on the Internet")

6
gnu/packages/valgrind.scm
View File

@ -47,7 +47,11 @@
(outputs '("doc" ;16 MB (outputs '("doc" ;16 MB
"out")) "out"))
(arguments (arguments
'(#:phases `(,@(if (string-prefix? "powerpc" (or (%current-target-system)
(%current-system)))
`(#:make-flags '("CFLAGS+=-maltivec"))
'())
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'patch-suppression-files (add-after 'install 'patch-suppression-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

6
gnu/packages/version-control.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net> ;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 John D. Boy <jboy@bius.moe> ;;; Copyright © 2020 John D. Boy <jboy@bius.moe>
@ -773,7 +773,7 @@ to lock down your entire repository.")
(define-public git-remote-gcrypt (define-public git-remote-gcrypt
(package (package
(name "git-remote-gcrypt") (name "git-remote-gcrypt")
(version "1.0.3") (version "1.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -782,7 +782,7 @@ to lock down your entire repository.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1")))) "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))

17
gnu/packages/video.scm
View File

@ -1610,7 +1610,7 @@ To load this plugin, specify the following option when starting mpv:
(define-public youtube-dl (define-public youtube-dl
(package (package
(name "youtube-dl") (name "youtube-dl")
(version "2020.05.03") (version "2020.05.08")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ytdl-org/youtube-dl/" (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@ -1618,7 +1618,7 @@ To load this plugin, specify the following option when starting mpv:
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal")))) "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; The problem here is that the directory for the man page and completion ;; The problem here is that the directory for the man page and completion
@ -2762,14 +2762,15 @@ supported players in addition to this package.")
(define-public handbrake (define-public handbrake
(package (package
(name "handbrake") (name "handbrake")
(version "1.3.1") (version "1.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.handbrake.fr/releases/" (uri (string-append "https://github.com/HandBrake/HandBrake/"
version "/HandBrake-" version "-source.tar.bz2")) "releases/download/" version "/"
"HandBrake-" version "-source.tar.bz2"))
(sha256 (sha256
(base32 (base32
"09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0")) "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove "contrib" and source not necessary for ;; Remove "contrib" and source not necessary for
@ -3873,7 +3874,7 @@ transcode or reformat the videos in any way, producing perfect backups.")
(define-public svt-av1 (define-public svt-av1
(package (package
(name "svt-av1") (name "svt-av1")
(version "0.8.2") (version "0.8.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3882,7 +3883,7 @@ transcode or reformat the videos in any way, producing perfect backups.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0273fxgf4r832y9s0p8hqdj1j1nj8nlz4hylya0b4nsif89yfrhp")))) "1rh4sz1bmrsxyxfxajsffw5jd17djcrymhwsi877v02fgln027qr"))))
(build-system cmake-build-system) (build-system cmake-build-system)
;; SVT-AV1 only supports Intel-compatible CPUs. ;; SVT-AV1 only supports Intel-compatible CPUs.
(supported-systems '("x86_64-linux" "i686-linux")) (supported-systems '("x86_64-linux" "i686-linux"))

62
gnu/packages/virtualization.scm
View File

@ -312,34 +312,34 @@ server and embedded PowerPC, and S390 guests.")
(substitute-keyword-arguments (package-arguments qemu) (substitute-keyword-arguments (package-arguments qemu)
((#:configure-flags _ '(list)) ((#:configure-flags _ '(list))
;; Restrict to the host's architecture. ;; Restrict to the host's architecture.
(let ((arch (car (string-split (or (%current-target-system) (match (car (string-split (or (%current-target-system)
(%current-system)) (%current-system))
#\-)))) #\-))
(cond ((string=? arch "i686") ("i686"
'(list "--target-list=i386-softmmu")) '(list "--target-list=i386-softmmu"))
((string-prefix? "x86_64" arch) ("x86_64"
'(list "--target-list=i386-softmmu,x86_64-softmmu")) '(list "--target-list=i386-softmmu,x86_64-softmmu"))
((string-prefix? "mips64" arch) ("mips64"
'(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu,"
"mips64-softmmu,mips64el-softmmu"))) "mips64-softmmu,mips64el-softmmu")))
((string-prefix? "mips" arch) ("mips"
'(list "--target-list=mips-softmmu,mipsel-softmmu")) '(list "--target-list=mips-softmmu,mipsel-softmmu"))
((string-prefix? "aarch64" arch) ("aarch64"
'(list "--target-list=arm-softmmu,aarch64-softmmu")) '(list "--target-list=arm-softmmu,aarch64-softmmu"))
((string-prefix? "arm" arch) ("arm"
'(list "--target-list=arm-softmmu")) '(list "--target-list=arm-softmmu"))
((string-prefix? "alpha" arch) ("alpha"
'(list "--target-list=alpha-softmmu")) '(list "--target-list=alpha-softmmu"))
((string-prefix? "powerpc64" arch) ("powerpc64"
'(list "--target-list=ppc-softmmu,ppc64-softmmu")) '(list "--target-list=ppc-softmmu,ppc64-softmmu"))
((string-prefix? "powerpc" arch) ("powerpc"
'(list "--target-list=ppc-softmmu")) '(list "--target-list=ppc-softmmu"))
((string-prefix? "s390" arch) ("s390"
'(list "--target-list=s390x-softmmu")) '(list "--target-list=s390x-softmmu"))
((string-prefix? "riscv" arch) ("riscv"
'(list "--target-list=riscv32-softmmu,riscv64-softmmu")) '(list "--target-list=riscv32-softmmu,riscv64-softmmu"))
(else ; An empty list actually builds all the targets. (else ; An empty list actually builds all the targets.
''())))))) ''())))))
;; Remove dependencies on optional libraries, notably GUI libraries. ;; Remove dependencies on optional libraries, notably GUI libraries.
(native-inputs (fold alist-delete (package-native-inputs qemu) (native-inputs (fold alist-delete (package-native-inputs qemu)
@ -745,14 +745,14 @@ domains, their live performance and resource utilization statistics.")
(define-public criu (define-public criu
(package (package
(name "criu") (name "criu")
(version "3.13") (version "3.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.openvz.org/criu/criu-" (uri (string-append "https://download.openvz.org/criu/criu-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa")))) "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"

8
gnu/packages/vpn.scm
View File

@ -247,13 +247,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
(define-public openconnect (define-public openconnect
(package (package
(name "openconnect") (name "openconnect")
(version "8.09") (version "8.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
"openconnect-" version ".tar.gz")) "openconnect-" version ".tar.gz"))
(sha256 (sha256
(base32 "19p91hs6j348qp0v9c7abl3rb8d9ncc37k743qhrn29s9jz0567k")))) (base32 "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("libxml2" ,libxml2) `(("libxml2" ,libxml2)
@ -282,7 +282,7 @@ and probably others.")
(define-public openvpn (define-public openvpn
(package (package
(name "openvpn") (name "openvpn")
(version "2.4.8") (version "2.4.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -290,7 +290,7 @@ and probably others.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"149z3agjy03i66mcj5bplim2mh45s2ps1wmxbxczyzw0nxmsd37v")))) "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-iproute2=yes"))) '(#:configure-flags '("--enable-iproute2=yes")))

47
gnu/packages/web-browsers.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -66,7 +67,8 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system asdf)) #:use-module (guix build-system asdf)
#:use-module (guix build-system go))
(define-public midori (define-public midori
(package (package
@ -692,3 +694,46 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
(define-public sbcl-next (define-public sbcl-next
(deprecated-package "sbcl-next" next)) (deprecated-package "sbcl-next" next))
(define-public bombadillo
(package
(name "bombadillo")
(version "2.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://tildegit.org/sloum/bombadillo")
(commit version)))
(sha256
(base32
"1m52b1wk48gkqmjy8l0x3jaksrx2v8w6w59lhr7zaw2i0n4f5k0z"))
(file-name (git-file-name name version))))
(build-system go-build-system)
(arguments
`(#:import-path "tildegit.org/sloum/bombadillo"
#:install-source? #f
#:phases (modify-phases %standard-phases
(add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys)
(let* ((builddir "src/tildegit.org/sloum/bombadillo")
(out (assoc-ref outputs "out"))
(pkg (strip-store-file-name out))
(sharedir (string-append out "/share"))
(appdir (string-append sharedir "/applications"))
(docdir (string-append sharedir "/doc/" pkg))
(mandir (string-append sharedir "/man/man1"))
(pixdir (string-append sharedir "/pixmaps")))
(with-directory-excursion builddir
(install-file "bombadillo.desktop" appdir)
(install-file "LICENSE" docdir)
(install-file "bombadillo.1" mandir)
(install-file "bombadillo-icon.png" pixdir)
#t)))))))
(home-page "http://bombadillo.colorfield.space")
(synopsis "Terminal browser for the gopher, gemini, and finger protocols")
(description "Bombadillo is a non-web browser for the terminal with
vim-like key bindings, a document pager, configurable settings, and robust
command selection. The following protocols are supported as first-class
citizens: gopher, gemini, finger, and local. There is also support for telnet,
http, and https via third-party applications.")
(license license:gpl3+)))

175
gnu/packages/web.scm
View File

@ -123,9 +123,11 @@
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lsof)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages markup) #:use-module (gnu packages markup)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages nss) #:use-module (gnu packages nss)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages openstack) #:use-module (gnu packages openstack)
@ -3731,6 +3733,35 @@ possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds
and retry a few times.") and retry a few times.")
(license license:perl-license))) (license license:perl-license)))
(define-public perl-lwpx-paranoidagent
(package
(name "perl-lwpx-paranoidagent")
(version "1.12")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-"
version ".tar.gz"))
(sha256
(base32
"0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-libwww" ,perl-libwww)
;; Users should instead make sure SSL_ca_path is set properly.
;; ("perl-mozilla-ca" ,perl-mozilla-ca)
("perl-net-dns" ,perl-net-dns)))
(home-page "https://metacpan.org/release/LWPx-ParanoidAgent")
(synopsis "Security enhanced subclass of LWP::UserAgent")
(description "@code{LWPx::ParanoidAgent} is a class subclassing
@code{LWP::UserAgent} but paranoid against attackers. Its purpose is
to vet requests for a remote resource on behalf of a possibly
malicious user. The class can do the same as @code{LWP::UserAgent},
except that proxy support has been removed. Support for URI schemes
is limited to http and https.")
(license license:perl-license)))
(define-public perl-net-amazon-s3 (define-public perl-net-amazon-s3
(package (package
(name "perl-net-amazon-s3") (name "perl-net-amazon-s3")
@ -4653,15 +4684,14 @@ you'd expect.")
(define-public uhttpmock (define-public uhttpmock
(package (package
(name "uhttpmock") (name "uhttpmock")
(version "0.5.1") (version "0.5.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/"
name "-" version ".tar.xz")) "uhttpmock-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p"))))
"163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) `(("gobject-introspection" ,gobject-introspection)
@ -4859,6 +4889,13 @@ NetSurf project.")
(invoke "find" "doc" "underlays" "-type" "f" "-exec" (invoke "find" "doc" "underlays" "-type" "f" "-exec"
"touch" "{}" "+") "touch" "{}" "+")
#t)) #t))
(add-before 'check 'pre-check
;; XDG_DATA_DIRS is needed by the podcast.t test.
(lambda* (#:key inputs #:allow-other-keys)
(setenv "XDG_DATA_DIRS"
(string-append (assoc-ref inputs "shared-mime-info")
"/share"))
#t))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -4887,8 +4924,10 @@ NetSurf project.")
("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-file-mimeinfo" ,perl-file-mimeinfo)
("perl-html-tagset" ,perl-html-tagset) ("perl-html-tagset" ,perl-html-tagset)
("perl-image-magick" ,perl-image-magick) ("perl-image-magick" ,perl-image-magick)
("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent)
("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-mail-sendmail" ,perl-mail-sendmail)
("perl-timedate" ,perl-timedate) ("perl-timedate" ,perl-timedate)
("perl-xml-feed" ,perl-xml-feed)
("perl-xml-sax" ,perl-xml-sax) ("perl-xml-sax" ,perl-xml-sax)
("perl-xml-simple" ,perl-xml-simple) ("perl-xml-simple" ,perl-xml-simple)
("perl-xml-twig" ,perl-xml-twig) ("perl-xml-twig" ,perl-xml-twig)
@ -5450,6 +5489,60 @@ HTTP statistics for system administrators that require a visual server report
on the fly.") on the fly.")
(license license:x11))) (license license:x11)))
(define-public hitch
(package
(name "hitch")
(version "1.5.2")
(home-page "https://hitch-tls.org/")
(source (origin
(method url-fetch)
(uri (string-append home-page "source/hitch-" version ".tar.gz"))
(sha256
(base32
"1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
;; Most tests attempts to access hitch-tls.org which is
;; unavailable in the build container. Run them against
;; a dummy local web server instead.
(for-each (lambda (test)
(substitute* test
(("\\[hitch-tls\\.org\\]:80")
"[localhost]:8000")))
(find-files "src/tests" "\\.sh$"))
(system "python3 -m http.server &")
;; The build container does not reap zombie processes,
;; causing stop_hitch to hang indefinitely while waiting
;; for the process to terminate because 'kill -0' never
;; succeeds. Use a different test to see whether the
;; process has shut down.
(substitute* "src/tests/hitch_test.sh"
(("kill -0 \"\\$HITCH_PID\"")
"$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')"))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
;; For tests.
("curl" ,curl)
("egrep" ,grep)
("lsof" ,lsof)
("python" ,python)))
(inputs
`(("libev" ,libev)
("openssl" ,openssl)))
(synopsis "Scalable TLS proxy")
(description
"Hitch is a performant TLS proxy based on @code{libev}. It terminates
SSL/TLS connections and forwards the unencrypted traffic to a backend such
as a web server. It is designed to handle many thousand connections on
multicore machines.")
(license license:bsd-2)))
(define-public httptunnel (define-public httptunnel
(package (package
(name "httptunnel") (name "httptunnel")
@ -5613,15 +5706,15 @@ configuration language.")
(package (package
(name "varnish-modules") (name "varnish-modules")
(home-page "https://github.com/varnish/varnish-modules") (home-page "https://github.com/varnish/varnish-modules")
(version "0.15.0") (version "0.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.varnish-software.com" (uri (string-append "https://github.com/varnish/varnish-modules"
"/varnish-modules/varnish-modules-" "/releases/download/varnish-modules-" version
version ".tar.gz")) "/varnish-modules-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751")))) "1ph5bplsip4rycql1c2hgbvmrwbgcrgv2ldgfp7saxxbsv5cpcds"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -5631,7 +5724,7 @@ configuration language.")
(synopsis "Collection of Varnish modules") (synopsis "Collection of Varnish modules")
(description (description
"This package provides a collection of modules (@dfn{vmods}) for the Varnish "This package provides a collection of modules (@dfn{vmods}) for the Varnish
cache server, extending the @dfn{Varnish Configuration Language} (VCL) with cache server, extending the @acronym{VCL, Varnish Configuration Language} with
additional capabilities.") additional capabilities.")
(license license:bsd-2))) (license license:bsd-2)))
@ -5838,30 +5931,30 @@ into your tests. It automatically starts up a HTTP server in a separate thread
(define-public http-parser (define-public http-parser
(package (package
(name "http-parser") (name "http-parser")
(version "2.9.3") (version "2.9.4")
(home-page "https://github.com/nodejs/http-parser") (home-page "https://github.com/nodejs/http-parser")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (url home-page) (method git-fetch)
(commit (string-append "v" version)))) (uri (git-reference (url home-page)
(file-name (git-file-name name version)) (commit (string-append "v" version))))
(patches (sha256
;; When parsing URLs, treat an empty port (eg (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"))
;; `http://hostname:/`) as if it were unspecified. This patch is (file-name (git-file-name name version))
;; applied to Fedora's http-parser and to libgit2's bundled version. (patches
(list (list
(origin (origin
(method url-fetch) ;; Treat an empty port (e.g. `http://hostname:/`) when parsing
(uri (string-append ;; URLs as if no port were specified. This patch is applied
"https://src.fedoraproject.org/rpms/http-parser/raw/" ;; to Fedora's http-parser and to libgit2's bundled version.
"e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" (method url-fetch)
"f/0001-url-treat-empty-port-as-default.patch")) (uri (string-append
(sha256 "https://src.fedoraproject.org/rpms/http-parser/raw/"
(base32 "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/"
"0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) "f/0001-url-treat-empty-port-as-default.patch"))
(sha256 (sha256
(base32 (base32
"189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -5874,6 +5967,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread
'("CC=gcc"))) '("CC=gcc")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(match (%current-system)
("armhf-linux"
'((add-before 'check 'apply-assertion.patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs "assertion.patch")))
(invoke "patch" "-p1" "-i" patch)
#t)))))
(_ '()))
,@(if (%current-target-system) ,@(if (%current-target-system)
'((replace 'configure '((replace 'configure
(lambda* (#:key target #:allow-other-keys) (lambda* (#:key target #:allow-other-keys)
@ -5884,6 +5985,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread
(string-append "AR=" target "-ar\n"))) (string-append "AR=" target "-ar\n")))
#t))) #t)))
'((delete 'configure)))))) '((delete 'configure))))))
(native-inputs
`(,@(match (%current-system)
("armhf-linux"
;; A fix for <https://issues.guix.gnu.org/40604> which in turn
;; breaks i686-linux builds.
`(("assertion.patch"
,@(search-patches "http-parser-fix-assertion-on-armhf.patch"))))
(_ '()))))
(synopsis "HTTP request/response parser for C") (synopsis "HTTP request/response parser for C")
(description "This is a parser for HTTP messages written in C. It parses (description "This is a parser for HTTP messages written in C. It parses
both requests and responses. The parser is designed to be used in both requests and responses. The parser is designed to be used in

6
gnu/packages/wine.scm
View File

@ -328,7 +328,7 @@ integrate Windows applications into your desktop.")
(define-public wine-staging-patchset-data (define-public wine-staging-patchset-data
(package (package
(name "wine-staging-patchset-data") (name "wine-staging-patchset-data")
(version "5.6") (version "5.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -337,7 +337,7 @@ integrate Windows applications into your desktop.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d")))) (base32 "07i11alcymkfj1vgadcxd6khvjk1ay0x2dddwrvnc4gag9lvkddr"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
@ -387,7 +387,7 @@ integrate Windows applications into your desktop.")
"/wine-" version ".tar.xz"))) "/wine-" version ".tar.xz")))
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah")))) (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf (inputs `(("autoconf" ,autoconf) ; for autoreconf
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("gtk+" ,gtk+) ("gtk+" ,gtk+)

10
gnu/packages/wm.scm
View File

@ -9,7 +9,7 @@
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017, 2018, 2020 Nikita <nikita@n0.is>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
@ -1176,15 +1176,15 @@ It is inspired by Xmonad and dwm. Its major features include:
(define-public cwm (define-public cwm
(package (package
(name "cwm") (name "cwm")
(version "6.3") (version "6.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://chneukirchen.org/releases/cwm-" (uri (string-append "https://leahneukirchen.org/releases/cwm-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17pdp9cfgh2n3n3905l4rl9qk7b722i8psnarhlc2h98qzx7zmac")))) "0p350pbfn92m21jiq4i324sdskxhs71p435g0mgz7cmzprnhhg92"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list "CC=gcc" `(#:make-flags (list "CC=gcc"
@ -1219,7 +1219,7 @@ It is inspired by Xmonad and dwm. Its major features include:
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("bison" ,bison))) ("bison" ,bison)))
(home-page "https://github.com/chneukirchen/cwm") (home-page "https://github.com/leahneukirchen/cwm")
(synopsis "OpenBSD fork of the calmwm window manager") (synopsis "OpenBSD fork of the calmwm window manager")
(description "Cwm is a stacking window manager for X11. It is an OpenBSD (description "Cwm is a stacking window manager for X11. It is an OpenBSD
project derived from the original Calm Window Manager.") project derived from the original Calm Window Manager.")

Some files were not shown because too many files have changed in this diff Show More