me
/
guix
Archived
1
0
Fork 0

Merge branch 'master' into core-updates

master
Marius Bakke 2020-04-15 19:26:55 +02:00
commit bd21acf6c3
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
57 changed files with 37510 additions and 29282 deletions

View File

@ -663,11 +663,16 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-daemon \ --enable-daemon \
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
# Name of the 'guix' package shipped in the binary tarball.
GUIX_FOR_BINARY_TARBALL = guile3.0-guix
# The self-contained tarball. # The self-contained tarball.
guix-binary.%.tar.xz: guix-binary.%.tar.xz:
$(AM_V_GEN)GUIX_PACKAGE_PATH= \ $(AM_V_GEN)GUIX_PACKAGE_PATH= \
tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \
-s "$*" --localstatedir --profile-name=current-guix guix` ; \ --fallback \
-s "$*" --localstatedir --profile-name=current-guix \
$(GUIX_FOR_BINARY_TARBALL)` ; \
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
@ -701,6 +706,16 @@ gen-AUTHORS:
"$(top_srcdir)" "$(distdir)/AUTHORS"; \ "$(top_srcdir)" "$(distdir)/AUTHORS"; \
fi fi
# Like 'dist', but regenerate 'configure' so we get an up-to-date
# 'PACKAGE_VERSION' string. (In Gnulib, 'GNUmakefile' has a special trick to
# do that whenever a 'dist' target is used.)
dist-with-updated-version:
@echo "Running './bootstrap' for new version string..."
$(top_srcdir)/bootstrap
$(MAKE) $(AM_MAKEFLAGS) $(top_srcdir)/.version dist
.PHONY: dist-with-updated-version
# #
# Release management. # Release management.
@ -756,7 +771,7 @@ system_flags = $(foreach system,$(1),-s $(system))
# #
# XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext # XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext
# issue described at <https://savannah.gnu.org/bugs/index.php?51027>. # issue described at <https://savannah.gnu.org/bugs/index.php?51027>.
release: dist release: dist-with-updated-version
cd po; git checkout . cd po; git checkout .
@if ! git diff-index --quiet HEAD; then \ @if ! git diff-index --quiet HEAD; then \
echo "There are uncommitted changes; stopping." >&2 ; \ echo "There are uncommitted changes; stopping." >&2 ; \
@ -770,9 +785,9 @@ release: dist
"`git rev-parse HEAD`" "$(PACKAGE_VERSION)" "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
git add $(top_srcdir)/gnu/packages/package-management.scm git add $(top_srcdir)/gnu/packages/package-management.scm
git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
$(top_builddir)/pre-inst-env guix build guix \ $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \
$(call system_flags,$(SUPPORTED_SYSTEMS)) \ $(call system_flags,$(SUPPORTED_SYSTEMS)) \
-v1 --no-grafts -K -v1 --no-grafts --fallback
rm -f $(BINARY_TARBALLS) rm -f $(BINARY_TARBALLS)
$(MAKE) $(BINARY_TARBALLS) $(MAKE) $(BINARY_TARBALLS)
for system in $(SUPPORTED_SYSTEMS) ; do \ for system in $(SUPPORTED_SYSTEMS) ; do \
@ -786,12 +801,12 @@ release: dist
git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
$(top_builddir)/pre-inst-env guix build guix \ $(top_builddir)/pre-inst-env guix build guix \
$(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \
-v1 --no-grafts -K -v1 --no-grafts --fallback
for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system disk-image \ guix system disk-image \
--file-system-type=iso9660 \ --file-system-type=iso9660 \
--system=$$system \ --system=$$system --fallback \
gnu/system/install.scm` ; \ gnu/system/install.scm` ; \
if [ ! -f "$$image" ] ; then \ if [ ! -f "$$image" ] ; then \
echo "failed to produced Guix installation image for $$system" >&2 ; \ echo "failed to produced Guix installation image for $$system" >&2 ; \
@ -804,7 +819,7 @@ release: dist
for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
--system=$$system \ --system=$$system --fallback \
gnu/system/examples/vm-image.tmpl` ; \ gnu/system/examples/vm-image.tmpl` ; \
if [ ! -f "$$image" ] ; then \ if [ ! -f "$$image" ] ; then \
echo "failed to produced Guix VM image for $$system" >&2 ; \ echo "failed to produced Guix VM image for $$system" >&2 ; \

146
NEWS
View File

@ -2,7 +2,7 @@
#+TITLE: Guix NEWS history of user-visible changes #+TITLE: Guix NEWS history of user-visible changes
#+STARTUP: content hidestars #+STARTUP: content hidestars
Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
@ -11,6 +11,150 @@ Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
Please send Guix bug reports to bug-guix@gnu.org. Please send Guix bug reports to bug-guix@gnu.org.
* Changes in 1.1.0 (since 1.0.1)
** Package management
*** New guix deploy command to deploy several machines at once
*** Channels can now provide news, viewed with guix pull --news
*** guix system reconfigure saves provenance data
*** New guix system describe command to view system provenance info
*** New /run/current-system/{channels,configuration}.scm files
*** New guix time-machine command
*** guix pack has a new --entry-point option
*** guix pack saves environment variables for docker and singularity
*** guix pack provides a meaningful repository name for docker
*** New --target option for guix system
*** --no-build-hook was renamed to --no-offload
*** --keep-failed now implies --no-offload
*** --dry-run no longer implies --no-grafts
*** guix import crate has a new --recursive option
*** guix import crate can import a specific package version
*** guix pull returns Guix on Guile 3.0
*** guix pull and --with-git-url can clone repositories over SSH
*** --with-commit now accepts tags
*** guix challenge has a new --diff option to show differences
*** guix weather has a new --display-missing option
*** Guix can now fetch lzip-compressed substitutes in addition to gzip
*** guix publish supports lzip compression via -C
*** guix lint -c archival queries Software Heritage
*** guix archive has a new -t option to list archive contents
*** guix describe and similar commands emit terminal hyperlinks
*** guix build now attempts to substitute missing .drv files
*** guix package etc. now lock the profile they operate on
*** guix pull honors /etc/guix/channels.scm when it exists
*** New guix show command, synonymous with guix package --show
*** The --manifest option can be repeated to combine manifests
*** Some commands previously lacking --load-path now support it
** Distribution
*** The set of pre-built bootstrap “binary seeds” has been halved
*** Graphical installer has better support for non-Latin keyboard layouts
*** Graphical installer allows users to choose an HTTP/HTTPS proxy
*** Graphical installer allows users to edit the system configuration
*** New kernel-loadable-modules field in operating-system
*** rottlog service is now part of %base-services
*** %base-services now includes /usr/bin/env as a “special file”
*** herd set-http-proxy guix-daemon URL can be used to set a proxy
*** qemu-binfmt service now supports riscv32 and riscv64
*** File system UUIDs and labels are now supported for JFS
*** New services
auditd, fontconfig-file-system, getmail, gnome-keyring, kernel-module-loader,
knot-resolver, mumi, nfs, nftables, nix, pagekite, pam-mount, patchwork,
polkit-wheel, provenance, pulseaudio, sane, singularity, usb-modeswitch
*** 3514 new packages
*** 3368 package updates
Noteworthy updates:
bash 5.0.7, binutils 2.32, cups 2.3.1, emacs 26.3, enlightenment 0.23.1,
gcc-toolchain 9.3.0, gdb 9.1, ghc 8.6.5, gimp 2.10.18, glibc 2.29,
gnome 3.32.2, gnupg 2.2.20, go 1.13.9, guile 2.2.7,
icecat 68.7.0-guix0-preview1, icedtea 3.7.0, julia 1.3.1,
libreoffice 6.4.2.2, linux-libre 5.4.31, mate 1.24.0, ocaml 4.09.0,
octave 5.2.0, openjdk 12.33, perl 5.30.0, python2 2.7.16, python 3.7.4,
racket 7.6, rust 1.39.0, r 3.6.3, sbcl 2.0.3, shepherd 0.7.0, xfce 4.14.0,
xorg-server 1.20.7
** Programming interfaces
*** New build systems
copy-build-system, julia-build-system, node-build-system, qt-build-system
*** New with-build-handler and map/accumulate-builds in (guix store)
*** (guix gexp) has a new with-parameters form
*** New (guix remote) module for remote evaluation of gexps
*** New eval/container procedure in (gnu system linux-container)
*** (guix inferior) now reifies exceptions as &inferior-exception
*** (guix cve) uses the new NIST-provided JSON files instead of XML
*** New (guix json) module to map JSON objects to Scheme records
*** New (gnu installer tests) module to drive the graphical installer
*** New (guix diagnostics) module for consistent diagnostic messages
*** “Checkers” now live in (guix lint)
** Notewothy bug fixes
*** Grafts leads to inefficient substitute info retrieval
(<https://issues.guix.gnu.org/issue/22990>)
*** Grafting prevents build plan from being displayed upfront
(https://issues.guix.gnu.org/issue/28310)
*** Changing the HTTP/FTP proxy used by the daemon is inconvenient
(<https://issues.guix.gnu.org/issue/25569>)
*** guix system disk-image successfully builds a bad image
(<https://issues.guix.gnu.org/issue/34276>)
*** Installer cannot be restarted after a failed install
(<https://issues.guix.gnu.org/issue/35543>)
*** Null pointer error when partitioning with the graphical installer
(<https://issues.guix.gnu.org/issue/35858>)
*** 'guix upgrade' misdiagnoses upgrades in the presence of propagated inputs
(<https://issues.guix.gnu.org/issue/35872>)
*** mcron randomly stops running jobs
(<https://issues.guix.gnu.org/issue/37237>)
*** Mistaken warning "guix pull was never run"
(<https://issues.guix.gnu.org/issue/38196>)
*** `guix pack --format=squashfs` fails on CentOS7
(<https://issues.guix.gnu.org/issue/40043>)
*** installer: No way to input Latin characters with non-Latin keyboard layouts
(<https://issues.guix.gnu.org/issue/40273>)
*** installer: Always add '%base-initrd-modules' to 'initrd-modules'
(<https://issues.guix.gnu.org/issue/36099>)
*** [MATE] shutdown and reboot not possible from UI
(<https://issues.guix.gnu.org/issue/40327>)
*** 'guix-daemon' honors %localstatedir, %sysconfdir, and %storedir
(<https://issues.guix.gnu.org/issue/35874>)
*** Fix GUIX_LOCPATH quoting in guix-daemon.service (systemd)
(<https://issues.guix.gnu.org/issue/36074>)
*** Include USB_ModeSwitch in %desktop-services
(<https://issues.guix.gnu.org/issue/35640>)
*** linux-container: Mount a new /dev/pts instance in the container
(<https://issues.guix.gnu.org/issue/36463>)
*** system: Write the timezone to /etc/timezone
(<https://issues.guix.gnu.org/issue/35746>)
*** linux-modules: Define and use a module name database
(<https://issues.guix.gnu.org/issue/34902>)
*** pack: Create /tmp in Docker images
(<https://issues.guix.gnu.org/issue/37161>)
*** guix system: Reinstalling the bootloader preserves extra menu entries
(<https://issues.guix.gnu.org/issue/36876>)
*** system: Add 'mount' and 'umount' to '%setuid-programs'
(<https://issues.guix.gnu.org/issue/37569>)
*** linux-libre: Try to aggressively gather entropy during boot
(<https://issues.guix.gnu.org/issue/37501>)
*** daemon: Make 'profiles/per-user' non-world-writable
(<https://issues.guix.gnu.org/issue/37744>)
*** linux-boot: Don't ignore options when mounting root file system
(<https://issues.guix.gnu.org/issue/37977>)
*** Files produced by syslogd are no longer world-readable
(<https://issues.guix.gnu.org/issue/40405>)
** Native language support
*** Updated translations of the manual
The manual is fully translated into Spanish, more than 85% complete in French
and German, and has preliminary translations into Russian and Chinese.
*** Updated translations of messages
This version of Guix is fully translated in Brazilian Portuguese, French,
German, and Spanish, and partially translated in 10 other languages.
* Changes in 1.0.1 (since 1.0.0) * Changes in 1.0.1 (since 1.0.0)
** Package management ** Package management
*** The https_proxy environment variable is now honored *** The https_proxy environment variable is now honored

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -79,6 +79,14 @@ to 'make'."
(current-processor-count)))) (current-processor-count))))
(loop tail))))))))) (loop tail)))))))))
(define (parallel-job-count*)
;; XXX: Work around memory requirements not sustainable on i686 above '-j4'
;; or so: <https://bugs.gnu.org/40522>.
(let ((count (parallel-job-count)))
(if (string-prefix? "i686" %host-type)
(min count 4)
count)))
(define (% completed total) (define (% completed total)
"Return the completion percentage of COMPLETED over TOTAL as an integer." "Return the completion percentage of COMPLETED over TOTAL as an integer."
(inexact->exact (round (* 100. (/ completed total))))) (inexact->exact (round (* 100. (/ completed total)))))
@ -95,7 +103,7 @@ to 'make'."
(lambda () (lambda ()
(compile-files srcdir (getcwd) (compile-files srcdir (getcwd)
(filter file-needs-compilation? files) (filter file-needs-compilation? files)
#:workers (parallel-job-count) #:workers (parallel-job-count*)
#:host host #:host host
#:report-load (lambda (file total completed) #:report-load (lambda (file total completed)
(when file (when file

View File

@ -20919,7 +20919,7 @@ The time in seconds after which a process with no requests is killed.
@end deftp @end deftp
@deffn {Scheme Procedure} nginx-php-fpm-location @ @deffn {Scheme Procedure} nginx-php-location @
[#:nginx-package nginx] @ [#:nginx-package nginx] @
[socket (string-append "/var/run/php" @ [socket (string-append "/var/run/php" @
(version-major (package-version php)) @ (version-major (package-version php)) @
@ -27340,7 +27340,8 @@ VM. To enable that you'll also have to pass the following flags to @command{qem
name=com.redhat.spice.0 name=com.redhat.spice.0
@end example @end example
You'll also need to add the @pxref{Miscellaneous Services, Spice service}. You'll also need to add the @code{(spice-vdagent-service)} to your
system definition (@pxref{Miscellaneous Services, Spice service}).
@node Defining Services @node Defining Services
@section Defining Services @section Defining Services

View File

@ -23,6 +23,7 @@
(guix packages) (guix packages)
(guix profiles) (guix profiles)
((gnu ci) #:select (%cross-targets)) ((gnu ci) #:select (%cross-targets))
((gnu services xorg) #:select (%default-xorg-modules))
(guix utils) (guix utils)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
@ -49,7 +50,7 @@ TARGET."
(define %system-packages (define %system-packages
;; Key packages proposed by the Guix System installer. ;; Key packages proposed by the Guix System installer.
(map specification->package (append (map specification->package
'("xorg-server" "xfce" "gnome" "mate" "enlightenment" '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
"openbox" "awesome" "i3-wm" "ratpoison" "openbox" "awesome" "i3-wm" "ratpoison"
"xlockmore" "slock" "libreoffice" "xlockmore" "slock" "libreoffice"
@ -58,7 +59,8 @@ TARGET."
"linux-libre" "grub-hybrid" "linux-libre" "grub-hybrid"
;; FIXME: Add IceCat when Rust is available on i686. ;; FIXME: Add IceCat when Rust is available on i686.
;;"icecat" ;;"icecat"
))) ))
%default-xorg-modules))
(define %packages-to-cross-build (define %packages-to-cross-build
;; Packages that must be cross-buildable from x86_64-linux. ;; Packages that must be cross-buildable from x86_64-linux.
@ -93,6 +95,13 @@ TARGET."
%base-packages)) %base-packages))
%hydra-supported-systems))) %hydra-supported-systems)))
(define %system-manifest
(manifest
(append-map (lambda (system)
(map (cut package->manifest-entry* <> system)
%system-packages))
'("x86_64-linux" "i686-linux")))) ;Guix System
(define %cross-manifest (define %cross-manifest
(manifest (manifest
(append-map (lambda (target) (append-map (lambda (target)
@ -115,5 +124,6 @@ TARGET."
;; Return the union of all three manifests. ;; Return the union of all three manifests.
(concatenate-manifests (list %base-manifest (concatenate-manifests (list %base-manifest
%system-manifest
%cross-manifest %cross-manifest
%cross-bootstrap-manifest)) %cross-bootstrap-manifest))

View File

@ -118,9 +118,8 @@ version of this file."
;; printed on the console. ;; printed on the console.
(parameterize ((shepherd-message-port (parameterize ((shepherd-message-port
(%make-void-port "w"))) (%make-void-port "w")))
(lambda ()
(stop-service 'term-tty2) (stop-service 'term-tty2)
(start-service 'term-tty2 (list locale))))))) (start-service 'term-tty2 (list locale))))))
(define* (compute-locale-step #:key (define* (compute-locale-step #:key
locales-name locales-name

View File

@ -943,6 +943,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gd-brect-bounds.patch \
%D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
@ -1179,7 +1180,6 @@ dist_patch_DATA = \
%D%/packages/patches/libvnc-CVE-2018-20750.patch \ %D%/packages/patches/libvnc-CVE-2018-20750.patch \
%D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvnc-CVE-2019-15681.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libvpx-use-after-free-in-postproc.patch \
%D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \
@ -1385,7 +1385,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-jedi-deleted-variables.patch \
%D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-testtools.patch \
@ -1506,7 +1505,6 @@ dist_patch_DATA = \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \
%D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \
%D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/txr-shell.patch \
%D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \

View File

@ -1958,14 +1958,14 @@ experiments.")
(define-public r-genomicinteractions (define-public r-genomicinteractions
(package (package
(name "r-genomicinteractions") (name "r-genomicinteractions")
(version "1.20.2") (version "1.20.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomicInteractions" version)) (uri (bioconductor-uri "GenomicInteractions" version))
(sha256 (sha256
(base32 (base32
"0mqb899wah5n7bp2lajhwy2zpqqhi18plza3i3m51rfl9n62smph")))) "01ps97cs29qvzy5piq2l2k0yyr56rmg5cycfiqhbbvqpjrfvy60g"))))
(properties (properties
`((upstream-name . "GenomicInteractions"))) `((upstream-name . "GenomicInteractions")))
(build-system r-build-system) (build-system r-build-system)
@ -3332,14 +3332,14 @@ peak definition in combination with known profile characteristics.")
(define-public r-varianttools (define-public r-varianttools
(package (package
(name "r-varianttools") (name "r-varianttools")
(version "1.28.0") (version "1.28.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "VariantTools" version)) (uri (bioconductor-uri "VariantTools" version))
(sha256 (sha256
(base32 (base32
"0aafcprsqbn1xl8jqnxfl8r2d0lmzhssqpr26lam2cprh3yk0xiv")))) "1x57shc3slcbnc807ra1nwnjr37sqjh04n2xfwd469m4hkjb0jzh"))))
(properties `((upstream-name . "VariantTools"))) (properties `((upstream-name . "VariantTools")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3783,14 +3783,14 @@ provides reporting features.")
(define-public r-a4base (define-public r-a4base
(package (package
(name "r-a4base") (name "r-a4base")
(version "1.34.0") (version "1.34.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "a4Base" version)) (uri (bioconductor-uri "a4Base" version))
(sha256 (sha256
(base32 (base32
"0dgqyq4dnlcik5qqygnhxlhfr98sh6kmdcj2qllhrwyk0lmsfk01")))) "1a0yk05ikk1hr1vpxynydrb5xb1hj4hdqlh9zd13n83ir89dss83"))))
(properties `((upstream-name . "a4Base"))) (properties `((upstream-name . "a4Base")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -4032,14 +4032,14 @@ position-specific scores within R and Bioconductor.")
(define-public r-atacseqqc (define-public r-atacseqqc
(package (package
(name "r-atacseqqc") (name "r-atacseqqc")
(version "1.10.3") (version "1.10.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ATACseqQC" version)) (uri (bioconductor-uri "ATACseqQC" version))
(sha256 (sha256
(base32 (base32
"18zf90iksglbs13cwr4jjwsv332a19lf4bpdmy69jz8bpwrklv22")))) "1g07ni134cyl3jd9y19afip39kxddfgpm1jjm0rhrm7jgssp24in"))))
(properties `((upstream-name . "ATACseqQC"))) (properties `((upstream-name . "ATACseqQC")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

View File

@ -7502,13 +7502,13 @@ checks on R packages that are to be submitted to the Bioconductor repository.")
(define-public r-s4vectors (define-public r-s4vectors
(package (package
(name "r-s4vectors") (name "r-s4vectors")
(version "0.24.3") (version "0.24.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "S4Vectors" version)) (uri (bioconductor-uri "S4Vectors" version))
(sha256 (sha256
(base32 (base32
"01f7dms4kw9ajwqlvh5s47riv748xrrs41na03byhjvn4fbdc44y")))) "1fzs8j2d3wwfzm2fq63ywf68a4dbggyl5l098f148yn4jw7jd3bc"))))
(properties (properties
`((upstream-name . "S4Vectors"))) `((upstream-name . "S4Vectors")))
(build-system r-build-system) (build-system r-build-system)
@ -7944,13 +7944,13 @@ tab-delimited (tabix) files.")
(define-public r-delayedarray (define-public r-delayedarray
(package (package
(name "r-delayedarray") (name "r-delayedarray")
(version "0.12.2") (version "0.12.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "DelayedArray" version)) (uri (bioconductor-uri "DelayedArray" version))
(sha256 (sha256
(base32 (base32
"09lackgix5jpm16k0mz2zkibflfb4wzidbz4q32mlxmklf40037q")))) "02i88ll2d7r83nk0wdj28akvsz3jq19g6ixpaahfy3jy5av4byv6"))))
(properties (properties
`((upstream-name . "DelayedArray"))) `((upstream-name . "DelayedArray")))
(build-system r-build-system) (build-system r-build-system)
@ -7961,6 +7961,8 @@ tab-delimited (tabix) files.")
("r-iranges" ,r-iranges) ("r-iranges" ,r-iranges)
("r-matrix" ,r-matrix) ("r-matrix" ,r-matrix)
("r-matrixstats" ,r-matrixstats))) ("r-matrixstats" ,r-matrixstats)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/DelayedArray") (home-page "https://bioconductor.org/packages/DelayedArray")
(synopsis "Delayed operations on array-like objects") (synopsis "Delayed operations on array-like objects")
(description (description
@ -12769,7 +12771,7 @@ expression report comparing samples in an easily configurable manner.")
(define-public pigx-chipseq (define-public pigx-chipseq
(package (package
(name "pigx-chipseq") (name "pigx-chipseq")
(version "0.0.41") (version "0.0.42")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/"
@ -12777,7 +12779,7 @@ expression report comparing samples in an easily configurable manner.")
"/pigx_chipseq-" version ".tar.gz")) "/pigx_chipseq-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0akbxdmsjsq5fzbwaap04hqjpsfgv1l6yrc2pwgbya1xgqvcq6vy")))) "0xbvgqpk32a8iczhvac56cacr46rdkqb0allhhpvmj940idf72bi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; parts of the tests rely on access to the network ;; parts of the tests rely on access to the network
(arguments '(#:tests? #f)) (arguments '(#:tests? #f))

View File

@ -443,7 +443,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot (define u-boot
(package (package
(name "u-boot") (name "u-boot")
(version "2020.01") (version "2020.04")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -451,7 +451,7 @@ tree binary files. These are board description files used by Linux and BSD.")
"u-boot-" version ".tar.bz2")) "u-boot-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida")))) "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"))))
(native-inputs (native-inputs
`(("bc" ,bc) `(("bc" ,bc)
("bison" ,bison) ("bison" ,bison)

View File

@ -1,6 +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 © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -60,6 +61,13 @@
(substitute* "test/00/t0077a.sh" (substitute* "test/00/t0077a.sh"
(("ar qc") "ar qcU")) (("ar qc") "ar qcU"))
;; Guix builds have LC_ALL set to "en_US.utf8", which causes
;; `date` to use a 12-hour clock instead of 24h, which in turn
;; makes t0217a.sh fail because of unexpected date output.
(substitute* "test/02/t0217a.sh"
(("export TZ")
"export TZ\nLC_ALL=POSIX\nexport LC_ALL"))
(setenv "SH" (which "sh")) (setenv "SH" (which "sh"))
#t))))) #t)))))
(native-inputs `(("bison" ,bison) (native-inputs `(("bison" ,bison)

View File

@ -1559,15 +1559,20 @@ colors are provided.")
(define-public r-glue (define-public r-glue
(package (package
(name "r-glue") (name "r-glue")
(version "1.3.2") (version "1.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "glue" version)) (uri (cran-uri "glue" version))
(sha256 (sha256
(base32 (base32
"0alklqcf68kmccssp4j7a7fv553pyqyy6mkkfslav83inppm4d3g")))) "1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a"))))
(build-system r-build-system) (build-system r-build-system)
;; knitr depends on glue, so we can't add knitr here to build the
;; vignettes.
#;
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/tidyverse/glue") (home-page "https://github.com/tidyverse/glue")
(synopsis "Interpreted string literals") (synopsis "Interpreted string literals")
(description (description
@ -1727,13 +1732,13 @@ you to rapidly iterate while developing a package.")
(define-public r-rcpp (define-public r-rcpp
(package (package
(name "r-rcpp") (name "r-rcpp")
(version "1.0.4") (version "1.0.4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Rcpp" version)) (uri (cran-uri "Rcpp" version))
(sha256 (sha256
(base32 "1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr")))) (base32 "00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://www.rcpp.org") (home-page "http://www.rcpp.org")
(synopsis "Seamless R and C++ integration") (synopsis "Seamless R and C++ integration")
@ -4042,14 +4047,18 @@ iVAT).")
(define-public r-xfun (define-public r-xfun
(package (package
(name "r-xfun") (name "r-xfun")
(version "0.12") (version "0.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "xfun" version)) (uri (cran-uri "xfun" version))
(sha256 (sha256
(base32 "0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df")))) (base32 "03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3"))))
(build-system r-build-system) (build-system r-build-system)
;; knitr itself depends on xfun
#;
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/yihui/xfun") (home-page "https://github.com/yihui/xfun")
(synopsis "Miscellaneous functions") (synopsis "Miscellaneous functions")
(description (description
@ -5387,14 +5396,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).")
(define-public r-arules (define-public r-arules
(package (package
(name "r-arules") (name "r-arules")
(version "1.6-4") (version "1.6-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "arules" version)) (uri (cran-uri "arules" version))
(sha256 (sha256
(base32 (base32
"003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n")))) "0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-matrix" ,r-matrix))) `(("r-matrix" ,r-matrix)))
@ -6500,14 +6509,14 @@ vice versa), or to deal with multiple declared missing values.")
(define-public r-sjmisc (define-public r-sjmisc
(package (package
(name "r-sjmisc") (name "r-sjmisc")
(version "2.8.3") (version "2.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sjmisc" version)) (uri (cran-uri "sjmisc" version))
(sha256 (sha256
(base32 (base32
"0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h")))) "1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-dplyr" ,r-dplyr) `(("r-dplyr" ,r-dplyr)
@ -6517,6 +6526,8 @@ vice versa), or to deal with multiple declared missing values.")
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-sjlabelled" ,r-sjlabelled) ("r-sjlabelled" ,r-sjlabelled)
("r-tidyselect" ,r-tidyselect))) ("r-tidyselect" ,r-tidyselect)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/strengejacke/sjmisc") (home-page "https://github.com/strengejacke/sjmisc")
(synopsis "Data and variable transformation functions") (synopsis "Data and variable transformation functions")
(description (description
@ -7905,14 +7916,14 @@ console, resulting in an interactive editing environment.")
(define-public r-survey (define-public r-survey
(package (package
(name "r-survey") (name "r-survey")
(version "3.37") (version "4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "survey" version)) (uri (cran-uri "survey" version))
(sha256 (sha256
(base32 (base32
"1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy")))) "1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice) `(("r-lattice" ,r-lattice)
@ -8285,14 +8296,14 @@ packages maintained by Torsten Hothorn.")
(define-public r-multcomp (define-public r-multcomp
(package (package
(name "r-multcomp") (name "r-multcomp")
(version "1.4-12") (version "1.4-13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "multcomp" version)) (uri (cran-uri "multcomp" version))
(sha256 (sha256
(base32 (base32
"14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b")))) "1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-codetools" ,r-codetools) `(("r-codetools" ,r-codetools)
@ -8630,20 +8641,22 @@ results using @code{ggplot2}.")
(define-public r-effectsize (define-public r-effectsize
(package (package
(name "r-effectsize") (name "r-effectsize")
(version "0.2.0") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "effectsize" version)) (uri (cran-uri "effectsize" version))
(sha256 (sha256
(base32 (base32
"1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww")))) "0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg"))))
(properties `((upstream-name . "effectsize"))) (properties `((upstream-name . "effectsize")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-bayestestr" ,r-bayestestr) `(("r-bayestestr" ,r-bayestestr)
("r-insight" ,r-insight) ("r-insight" ,r-insight)
("r-parameters" ,r-parameters))) ("r-parameters" ,r-parameters)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/easystats/effectsize") (home-page "https://github.com/easystats/effectsize")
(synopsis "Indices of effect size and standardized parameters") (synopsis "Indices of effect size and standardized parameters")
(description (description
@ -8744,14 +8757,14 @@ back to file after modifications.")
(define-public r-fs (define-public r-fs
(package (package
(name "r-fs") (name "r-fs")
(version "1.4.0") (version "1.4.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "fs" version)) (uri (cran-uri "fs" version))
(sha256 (sha256
(base32 (base32
"1ishdxrxy88w1lrn657a573wdra5v7xf1yfa1c4kss07rlynwrj7")))) "0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -8786,18 +8799,18 @@ terminals that do not support Unicode.")
(define-public r-usethis (define-public r-usethis
(package (package
(name "r-usethis") (name "r-usethis")
(version "1.5.1") (version "1.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "usethis" version)) (uri (cran-uri "usethis" version))
(sha256 (sha256
(base32 (base32
"07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy")))) "12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-clipr" ,r-clipr) `(("r-cli" ,r-cli)
("r-clisymbols" ,r-clisymbols) ("r-clipr" ,r-clipr)
("r-crayon" ,r-crayon) ("r-crayon" ,r-crayon)
("r-curl" ,r-curl) ("r-curl" ,r-curl)
("r-desc" ,r-desc) ("r-desc" ,r-desc)
@ -8806,6 +8819,7 @@ terminals that do not support Unicode.")
("r-git2r" ,r-git2r) ("r-git2r" ,r-git2r)
("r-glue" ,r-glue) ("r-glue" ,r-glue)
("r-purrr" ,r-purrr) ("r-purrr" ,r-purrr)
("r-rematch2" ,r-rematch2)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-rprojroot" ,r-rprojroot) ("r-rprojroot" ,r-rprojroot)
("r-rstudioapi" ,r-rstudioapi) ("r-rstudioapi" ,r-rstudioapi)
@ -9175,14 +9189,14 @@ experiments using ANOVA or mixed models.")
(define-public r-lmertest (define-public r-lmertest
(package (package
(name "r-lmertest") (name "r-lmertest")
(version "3.1-1") (version "3.1-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lmerTest" version)) (uri (cran-uri "lmerTest" version))
(sha256 (sha256
(base32 (base32
"0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj")))) "1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"))))
(properties `((upstream-name . "lmerTest"))) (properties `((upstream-name . "lmerTest")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -12067,14 +12081,14 @@ users of rARPACK are advised to switch to the RSpectra package.")
(define-public r-compositions (define-public r-compositions
(package (package
(name "r-compositions") (name "r-compositions")
(version "1.40-4") (version "1.40-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "compositions" version)) (uri (cran-uri "compositions" version))
(sha256 (sha256
(base32 (base32
"0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a")))) "0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-bayesm" ,r-bayesm) `(("r-bayesm" ,r-bayesm)
@ -12817,14 +12831,14 @@ can be used with function approximation, eligibility traces (Singh & Sutton,
(define-public r-lemon (define-public r-lemon
(package (package
(name "r-lemon") (name "r-lemon")
(version "0.4.3") (version "0.4.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lemon" version)) (uri (cran-uri "lemon" version))
(sha256 (sha256
(base32 (base32
"0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw")))) "0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-ggplot2" ,r-ggplot2) `(("r-ggplot2" ,r-ggplot2)
@ -12833,6 +12847,7 @@ can be used with function approximation, eligibility traces (Singh & Sutton,
("r-knitr" ,r-knitr) ("r-knitr" ,r-knitr)
("r-lattice" ,r-lattice) ("r-lattice" ,r-lattice)
("r-plyr" ,r-plyr) ("r-plyr" ,r-plyr)
("r-rlang" ,r-rlang)
("r-scales" ,r-scales))) ("r-scales" ,r-scales)))
(home-page "https://github.com/stefanedwards/lemon") (home-page "https://github.com/stefanedwards/lemon")
(synopsis "Freshen up your ggplot2 plots") (synopsis "Freshen up your ggplot2 plots")
@ -13113,21 +13128,23 @@ classes.")
(define-public r-classint (define-public r-classint
(package (package
(name "r-classint") (name "r-classint")
(version "0.4-2") (version "0.4-3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "classInt" version)) (uri (cran-uri "classInt" version))
(sha256 (sha256
(base32 (base32
"0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv")))) "1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"))))
(properties `((upstream-name . "classInt"))) (properties `((upstream-name . "classInt")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-class" ,r-class) `(("r-class" ,r-class)
("r-e1071" ,r-e1071) ("r-e1071" ,r-e1071)
("r-kernsmooth" ,r-kernsmooth))) ("r-kernsmooth" ,r-kernsmooth)))
(native-inputs `(("gfortran" ,gfortran))) (native-inputs
`(("gfortran" ,gfortran)
("r-knitr" ,r-knitr)))
(home-page "https://github.com/r-spatial/classInt/") (home-page "https://github.com/r-spatial/classInt/")
(synopsis "Choose univariate class intervals") (synopsis "Choose univariate class intervals")
(description (description
@ -13138,14 +13155,14 @@ univariate class intervals for mapping or other graphics purposes.")
(define-public r-spdata (define-public r-spdata
(package (package
(name "r-spdata") (name "r-spdata")
(version "0.3.3") (version "0.3.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "spData" version)) (uri (cran-uri "spData" version))
(sha256 (sha256
(base32 (base32
"1v66qkvsx77hvv5c78v760yp0hknf7xzcjir2ri3ha456mz79yl5")))) "09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh"))))
(properties `((upstream-name . "spData"))) (properties `((upstream-name . "spData")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -13215,14 +13232,14 @@ tessellation.")
(define-public r-sf (define-public r-sf
(package (package
(name "r-sf") (name "r-sf")
(version "0.9-0") (version "0.9-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sf" version)) (uri (cran-uri "sf" version))
(sha256 (sha256
(base32 (base32
"117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6")))) "1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("gdal" ,gdal) `(("gdal" ,gdal)
@ -15960,14 +15977,14 @@ in pipelines.")
(define-public r-parameters (define-public r-parameters
(package (package
(name "r-parameters") (name "r-parameters")
(version "0.6.0") (version "0.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "parameters" version)) (uri (cran-uri "parameters" version))
(sha256 (sha256
(base32 (base32
"0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn")))) "0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy"))))
(properties `((upstream-name . "parameters"))) (properties `((upstream-name . "parameters")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16191,14 +16208,14 @@ are noisy or are discontinuous at the solution.")
(define-public r-txtplot (define-public r-txtplot
(package (package
(name "r-txtplot") (name "r-txtplot")
(version "1.0-3") (version "1.0-4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "txtplot" version)) (uri (cran-uri "txtplot" version))
(sha256 (sha256
(base32 (base32
"1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h")))) "00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/txtplot/") (home-page "https://cran.r-project.org/web/packages/txtplot/")
(synopsis "Text-based plotting") (synopsis "Text-based plotting")
@ -17112,17 +17129,19 @@ See e.g. Gentle (2003) @url{doi:10.1007/b97336}.")
(define-public r-lhs (define-public r-lhs
(package (package
(name "r-lhs") (name "r-lhs")
(version "1.0.1") (version "1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lhs" version)) (uri (cran-uri "lhs" version))
(sha256 (sha256
(base32 (base32
"0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4")))) "0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"))))
(properties `((upstream-name . "lhs"))) (properties `((upstream-name . "lhs")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs `(("r-rcpp" ,r-rcpp))) (propagated-inputs `(("r-rcpp" ,r-rcpp)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/bertcarnell/lhs") (home-page "https://github.com/bertcarnell/lhs")
(synopsis "Latin Hypercube Samples") (synopsis "Latin Hypercube Samples")
(description (description
@ -18790,14 +18809,14 @@ Edition), John Wiley and Sons.")
(define-public r-anthropometry (define-public r-anthropometry
(package (package
(name "r-anthropometry") (name "r-anthropometry")
(version "1.13") (version "1.14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Anthropometry" version)) (uri (cran-uri "Anthropometry" version))
(sha256 (sha256
(base32 (base32
"1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8")))) "0y52g15pcgs4b68sfczn6nnpdqsialsb4mq3wb9a2gba7qdcf76y"))))
(properties `((upstream-name . "Anthropometry"))) (properties `((upstream-name . "Anthropometry")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -18810,6 +18829,8 @@ Edition), John Wiley and Sons.")
("r-nnls" ,r-nnls) ("r-nnls" ,r-nnls)
("r-rgl" ,r-rgl) ("r-rgl" ,r-rgl)
("r-shapes" ,r-shapes))) ("r-shapes" ,r-shapes)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/Anthropometry/") (home-page "https://cran.r-project.org/web/packages/Anthropometry/")
(synopsis "Statistical methods for anthropometric data") (synopsis "Statistical methods for anthropometric data")
(description (description
@ -20804,19 +20825,21 @@ Encyclopedia of Integer Sequences} (OEIS) in the function help page.")
(define-public r-isoband (define-public r-isoband
(package (package
(name "r-isoband") (name "r-isoband")
(version "0.2.0") (version "0.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "isoband" version)) (uri (cran-uri "isoband" version))
(sha256 (sha256
(base32 (base32
"1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq")))) "1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q"))))
(properties `((upstream-name . "isoband"))) (properties `((upstream-name . "isoband")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-rcpp" ,r-rcpp) `(("r-rcpp" ,r-rcpp)
("r-testthat" ,r-testthat))) ("r-testthat" ,r-testthat)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/wilkelab/isoband") (home-page "https://github.com/wilkelab/isoband")
(synopsis "Generate isolines and isobands from regularly spaced elevation grids") (synopsis "Generate isolines and isobands from regularly spaced elevation grids")
(description (description
@ -20924,13 +20947,13 @@ carrying out convergence diagnostics and statistical and graphical analysis of
(define-public r-httpcode (define-public r-httpcode
(package (package
(name "r-httpcode") (name "r-httpcode")
(version "0.2.0") (version "0.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "httpcode" version)) (uri (cran-uri "httpcode" version))
(sha256 (sha256
(base32 (base32
"06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv")))) "0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/sckott/httpcode") (home-page "https://github.com/sckott/httpcode")
(synopsis "HTTP status code helper") (synopsis "HTTP status code helper")

View File

@ -4,6 +4,7 @@
;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,9 +36,11 @@
#:use-module (gnu packages gdb) #:use-module (gnu packages gdb)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages textutils)) #:use-module (gnu packages textutils)
#:use-module (gnu packages xorg))
(define-public rdmd (define-public rdmd
(package (package
@ -348,3 +351,49 @@ The design emphasis is on maximum simplicity for simple projects,
while providing the opportunity to customize things when while providing the opportunity to customize things when
needed.") needed.")
(license license:expat))) (license license:expat)))
(define-public gtkd
(package
(name "gtkd")
(version "3.9.0")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://gtkd.org/Downloads/sources/GtkD-"
version ".zip"))
(sha256
(base32 "0qv8qlpwwb1d078pnrf0a59vpbkziyf53cf9p6m8ms542wbcxllp"))))
(build-system gnu-build-system)
(native-inputs
`(("unzip" ,unzip)
("ldc" ,ldc)
("pkg-config" ,pkg-config)
("xorg-server-for-tests" ,xorg-server-for-tests)))
(arguments
`(#:test-target "test"
#:make-flags
`("DC=ldc2"
,(string-append "prefix=" (assoc-ref %outputs "out"))
,(string-append "libdir=" (assoc-ref %outputs "out")
"/lib"))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "GNUmakefile"
;; We do the tests ourselves.
(("default-goal: libs test") "default-goal: libs")
(("all: libs shared-libs test") "all: libs shared-libs")
;; Work around upstream bug.
(("\\$\\(prefix\\)\\/\\$\\(libdir\\)") "$(libdir)"))
#t))
(add-before 'check 'prepare-x
(lambda _
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
#t)))))
(home-page "https://gtkd.org/")
(synopsis "D binding and OO wrapper of GTK+")
(description "This package provides bindings to GTK+ for D.")
(license license:lgpl2.1)))

View File

@ -67,6 +67,7 @@
;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr> ;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -596,6 +597,45 @@ Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a
handful of functions that are not resource-specific.") handful of functions that are not resource-specific.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-typit
;; Last release is from 2017.
(let ((commit "231cb7df43253b84323520b8ed70f128d37003af")
(revision "1"))
(package
(name "emacs-typit")
(version (git-version "0.2.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mrkkrp/typit.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-dictionaries
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(site-lisp
(string-append
out "/share/emacs/site-lisp/dict")))
(mkdir-p site-lisp)
(copy-recursively "dict" site-lisp)
#t))))))
(propagated-inputs
`(("emacs-f" ,emacs-f)
("emacs-mmt" ,emacs-mmt)))
(home-page "https://github.com/mrkkrp/typit")
(synopsis "Typing game for Emacs with two difficulties")
(description "Emacs Typit is a typing game for Emacs. Words that are
picked randomly from the most frequent words in language you're practicing,
until time is up.")
(license license:gpl3+))))
(define-public emacs-scribble-mode (define-public emacs-scribble-mode
(let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2") (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2")
(revision "2")) (revision "2"))
@ -2122,6 +2162,26 @@ window).")
single buffer.") single buffer.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-mmt
(package
(name "emacs-mmt")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mrkkrp/mmt.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav"))))
(build-system emacs-build-system)
(home-page "https://github.com/mrkkrp/mmt")
(synopsis "Classic tools to write Emacs Lisp macros")
(description "Emacs MMT is a package that contains classic tools for Emacs
Lisp developers who want to write macros with convenience.")
(license license:gpl3+)))
(define-public emacs-tablist (define-public emacs-tablist
(package (package
(name "emacs-tablist") (name "emacs-tablist")
@ -7424,20 +7484,18 @@ for search-based navigation of buffers.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-helm-ag (define-public emacs-helm-ag
(let ((commit "2fc02c4ead29bf0db06fd70740cc7c364cb650ac")
(revision "1"))
(package (package
(name "emacs-helm-ag") (name "emacs-helm-ag")
(version (git-version "0.58" revision commit)) (version "0.59")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/syohex/emacs-helm-ag.git") (url "https://github.com/syohex/emacs-helm-ag.git")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21")))) (base32 "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm))) `(("emacs-helm" ,emacs-helm)))
@ -7446,7 +7504,7 @@ for search-based navigation of buffers.")
(description (description
"This package provides a frontend for grepping tools like ag and ack, "This package provides a frontend for grepping tools like ag and ack,
as well as features for editing search results.") as well as features for editing search results.")
(license license:gpl3+)))) (license license:gpl3+)))
;; There hasn't been a tag or release since 2016, so we take the latest ;; There hasn't been a tag or release since 2016, so we take the latest
;; commit. ;; commit.
@ -12864,7 +12922,7 @@ into sections while preserving the structure imposed by any timestamps.")
(define-public emacs-org-make-toc (define-public emacs-org-make-toc
(package (package
(name "emacs-org-make-toc") (name "emacs-org-make-toc")
(version "0.4") (version "0.5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -12873,7 +12931,7 @@ into sections while preserving the structure imposed by any timestamps.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw")))) "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-org" ,emacs-org) `(("emacs-org" ,emacs-org)
@ -14158,12 +14216,12 @@ their meaning for the current Emacs major-mode.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-ref (define-public emacs-org-ref
(let ((commit "8c9b5d7efb9f0c1ad5186b8203bdd017f4249129") ;; No release since June 2017.
(revision "1")) (let ((commit "5bb9be2232db72b04754d7e4c02a3976ad422f6f")
(revision "2"))
(package (package
(name "emacs-org-ref") (name "emacs-org-ref")
(version (string-append "1.1.1" "-" revision "." (version (git-version "1.1.1" revision commit))
(string-take commit 7)))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -14172,29 +14230,40 @@ their meaning for the current Emacs major-mode.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "15gcvbfj19kyv4nxa632b261dwhb26m99plq230qhv9ssfwfgxbx"))))
"1rxz0bjdsayk0slv23i07d9xhj2m7s4hsc81wc2d1cs52dkr5zmz"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)
("emacs-helm" ,emacs-helm) ("emacs-helm" ,emacs-helm)
("emacs-helm-bibtex" ,emacs-helm-bibtex) ("emacs-helm-bibtex" ,emacs-helm-bibtex)
("emacs-ivy" ,emacs-ivy) ("emacs-htmlize" ,emacs-htmlize)
("emacs-hydra" ,emacs-hydra) ("emacs-hydra" ,emacs-hydra)
("emacs-ivy" ,emacs-ivy)
("emacs-key-chord" ,emacs-key-chord) ("emacs-key-chord" ,emacs-key-chord)
("emacs-s" ,emacs-s) ("emacs-pdf-tools" ,emacs-pdf-tools)
("emacs-f" ,emacs-f) ("emacs-s" ,emacs-s)))
("emacs-pdf-tools" ,emacs-pdf-tools)))
(home-page "https://github.com/jkitchin/org-ref") (home-page "https://github.com/jkitchin/org-ref")
(synopsis "Citations, cross-references and bibliographies in org-mode") (synopsis "Citations, cross-references and bibliographies in Org mode")
(description (description
"Lisp code to setup bibliography, cite, ref and label org-mode links. "Org Ref is an Emacs library that provides rich support for citations,
Also sets up reftex and helm for org-mode citations. The links are labels and cross-references in Org mode.
clickable and do things that are useful.
The default setup uses helm-bibtex. The basic idea of Org Ref is that it defines a convenient interface to insert
citations from a reference database (e.g., from BibTeX files), and a set of
functional Org links for citations, cross-references and labels that export
properly to LaTeX, and that provide clickable functionality to the user. Org
Ref interfaces with Helm BibTeX to facilitate citation entry, and it can also
use RefTeX.
You should really read org-ref.org in this package for details.") It also provides a fairly large number of utilities for finding bad citations,
extracting BibTeX entries from citations in an Org file, and functions to
create and modify BibTeX entries from a variety of sources, most notably from
a DOI.
Org Ref is especially suitable for Org documents destined for LaTeX export and
scientific publication. Org Ref is also useful for research documents and
notes.")
(license license:gpl3+)))) (license license:gpl3+))))
;; This project is unmaintained. Please use emacs-org-re-reveal instead. ;; This project is unmaintained. Please use emacs-org-re-reveal instead.
@ -22407,3 +22476,59 @@ conventions.")
(description "Haskell-Snippets is a collection of YASnippet Haskell (description "Haskell-Snippets is a collection of YASnippet Haskell
snippets for Emacs.") snippets for Emacs.")
(license license:expat)))) (license license:expat))))
(define-public emacs-org-roam
(package
(name "emacs-org-roam")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jethrokuan/org-roam.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-company" ,emacs-company)
("emacs-dash" ,emacs-dash)
("emacs-emacsql-sqlite" ,emacs-emacsql)
("emacs-f" ,emacs-f)
("emacs-org-ref" ,emacs-org-ref)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/jethrokuan/org-roam/")
(synopsis "Non-hierarchical note-taking with Org mode")
(description "Emacs Org Roam is a solution for taking non-hierarchical
notes with Org mode. Notes are captured without hierarchy and are connected
by tags. Notes can be found and created quickly. Org Roam should also work
as a plug-and-play solution for anyone already using Org mode for their
personal wiki.")
(license license:gpl3+)))
(define-public emacs-uml-mode
;; Package has no release. Version is extracted from "Version:" keyword in
;; main file.
(let ((commit "4c37ac1c4424b2313cd8f16ba48a98a4cc214200")
(revision "1"))
(package
(name "emacs-uml-mode")
(version (git-version "0.0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ianxm/emacs-uml.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "145i4srnfvd1vyibri2a1l6p9mbjvkkwlrpi41134pbarqffcnka"))))
(build-system emacs-build-system)
(home-page "https://github.com/ianxm/emacs-uml")
(synopsis "Minor mode for editing ASCII UML sequence diagrams")
(description "Emacs UML mode is a minor mode that makes it easy to build
ASCII UML sequence diagrams in Emacs, which can be embedded in source code,
comments or emails.")
(license license:gpl3+))))

View File

@ -1018,22 +1018,42 @@ the 'showing the effect of'-style of operation.")
(define-public volk (define-public volk
(package (package
(name "volk") (name "volk")
(version "1.3") (version "2.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://libvolk.org/releases/volk-" (uri (string-append "https://www.libvolk.org/releases/volk-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bz3ywc6y5wmz3i8p4z2wbzhns8bc0ywdkl9qnxpcvfcscarbdlh")))) "1wz5nhmw6np8ka30pgy1qnima3rk2ksln4klfhrj7wah3fian0k9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-pythonpath
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(python (assoc-ref inputs "python"))
(file (string-append out "/bin/volk_modtool"))
(path (string-append
out
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages:"
(getenv "PYTHONPATH"))))
(wrap-program file
`("PYTHONPATH" ":" prefix (,path))
`("PATH" ":" prefix
(,(string-append python "/bin:")))))
#t)))))
(inputs (inputs
`(("boost" ,boost))) `(("boost" ,boost)))
(native-inputs (native-inputs
`(("python-2" ,python-2) `(("python" ,python-wrapper)
("python2-cheetah" ,python2-cheetah))) ("python-mako" ,python-mako)))
(home-page "http://libvolk.org/") (home-page "https://www.libvolk.org/")
(synopsis "Vector-Optimized Library of Kernels") (synopsis "Vector-Optimized Library of Kernels")
(description (description
"@code{volk} contains procedures with machine-specific optimizations "@code{volk} contains procedures with machine-specific optimizations

View File

@ -397,6 +397,56 @@ Playing bastet can be a painful experience, especially if you usually make
canyons and wait for the long I-shaped block to clear four rows at a time.") canyons and wait for the long I-shaped block to clear four rows at a time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public blobwars
(package
(name "blobwars")
(version "2.00")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/blobwars/"
"blobwars-" version ".tar.gz"))
(sha256
(base32 "16aagvkx6azf75gm5kaa94bh5npydvhqp3fvdqyfsanzdjgjf1n4"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no test
#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" out)
(string-append "BINDIR=" out "/bin/")
"USEPAK=1"
"RELEASE=1"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'werror-begone
(lambda _
(substitute* "Makefile" (("-Werror") ""))
#t))
(delete 'configure)))) ;no configure script
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("hicolor-icon-theme" ,hicolor-icon-theme)
("sdl" ,(sdl-union (list sdl2
sdl2-image
sdl2-mixer
sdl2-ttf
sdl2-net)))))
(home-page "https://sourceforge.net/projects/blobwars/")
(synopsis "Platform action game featuring a blob with a lot of weapons")
(description "Blobwars: Metal Blob Solid is a 2D platform game, the first
in the Blobwars series. You take on the role of a fearless Blob agent. Your
mission is to infiltrate various enemy bases and rescue as many MIAs as
possible, while battling many vicious aliens.")
(license (list license:gpl2 ; For code and graphics
license:cc0 ; Music and sounds have specific licenses
license:cc-by3.0 ; see /doc/readme
license:cc-by-sa3.0
license:lgpl2.1+
license:bsd-2))))
(define-public cataclysm-dda (define-public cataclysm-dda
(package (package
(name "cataclysm-dda") (name "cataclysm-dda")

View File

@ -6741,7 +6741,8 @@ libxml2.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")))) "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"))
(patches (search-patches "gdm-default-session.patch"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

View File

@ -750,7 +750,7 @@ from forcing GEXP-PROMISE."
("libxt" ,libxt) ("libxt" ,libxt)
("libffi" ,libffi) ("libffi" ,libffi)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("libvpx" ,libvpx-1.7) ("libvpx" ,libvpx)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
("pixman" ,pixman) ("pixman" ,pixman)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -167,14 +168,13 @@ downloading episode status changes.")
(define-public python-podcastparser (define-public python-podcastparser
(package (package
(name "python-podcastparser") (name "python-podcastparser")
(version "0.6.4") (version "0.6.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "podcastparser" version)) (uri (pypi-uri "podcastparser" version))
(sha256 (sha256
(base32 (base32 "0k62ppg20i41gcc5x8ddjn7zbpy47hqpxzrq9257g2c71m4qw07b"))))
"1ksj1gcmbnm5i43xhpqxbs2mqi6xzawwwkwbh9h6lwa1wxxvv247"))))
(native-inputs (native-inputs
`(("python-nose" ,python-nose))) `(("python-nose" ,python-nose)))
(build-system python-build-system) (build-system python-build-system)

View File

@ -1140,7 +1140,7 @@ microblogging service.")
(define-public guile-parted (define-public guile-parted
(package (package
(name "guile-parted") (name "guile-parted")
(version "0.0.3") (version "0.0.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1149,7 +1149,7 @@ microblogging service.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc")) "0b7h8psfm9gmmwb65pp5zwzglvwnfmw5j40g09hhf3f7kwxc0mv2"))
(modules '((guix build utils))))) (modules '((guix build utils)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1679,6 +1679,84 @@ capabilities.")
(home-page "https://dthompson.us/projects/sly.html") (home-page "https://dthompson.us/projects/sly.html")
(license license:gpl3+))) (license license:gpl3+)))
(define-public g-golf
(let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7"))
(package
(name "g-golf")
(version (git-version "1" "683" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/g-golf.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"09p0gf71wbmlm9kri693a8fvr9hl3hhlmlidyadwjdh7853xg0h8"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-2.2)
("guile-lib" ,guile-lib)
("clutter" ,clutter)
("gtk" ,gtk+)
("glib" ,glib)))
(propagated-inputs
`(("gobject-introspection" ,gobject-introspection)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'tests-work-arounds
(lambda* (#:key inputs #:allow-other-keys)
;; In build environment, There is no /dev/tty
(substitute*
"test-suite/tests/gobject.scm"
(("/dev/tty") "/dev/null"))))
(add-before 'configure 'substitute-libs
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((get (lambda (key lib)
(string-append (assoc-ref inputs key) "/lib/" lib)))
(libgi (get "gobject-introspection" "libgirepository-1.0"))
(libglib (get "glib" "libglib-2.0"))
(libgobject (get "glib" "libgobject-2.0"))
(libgdk (get "gtk" "libgdk-3")))
(substitute* "configure"
(("SITEDIR=\"\\$datadir/g-golf\"")
"SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"")
(("SITECCACHEDIR=\"\\$libdir/g-golf/")
"SITECCACHEDIR=\"$libdir/"))
(substitute* "g-golf/init.scm"
(("libgirepository-1.0") libgi)
(("libglib-2.0") libglib)
(("libgdk-3") libgdk)
(("libgobject-2.0") libgobject)
(("\\(dynamic-link \"libg-golf\"\\)")
(format #f "~s"
`(dynamic-link
(format #f "~alibg-golf"
(if (getenv "GUILE_GGOLF_UNINSTALLED")
""
,(format #f "~a/lib/"
(assoc-ref outputs "out"))))))))
(setenv "GUILE_AUTO_COMPILE" "0")
(setenv "GUILE_GGOLF_UNINSTALLED" "1")
#t))))))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
"G-Golf (Gnome: (Guile Object Library for)) is a library for developing
modern applications in Guile Scheme. It comprises a direct binding to the
GObject Introspection API and higher-level functionality for importing Gnome
libraries and making GObject classes (and methods) available in Guile's
object-oriented programming system, GOOPS.")
(license license:lgpl3+))))
(define-public g-wrap (define-public g-wrap
(package (package
(name "g-wrap") (name "g-wrap")
@ -2722,11 +2800,11 @@ in C using Gtk+-3 and WebKitGtk.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacsy-minimal (define-public emacsy-minimal
(let ((commit "f3bf0dbd803d7805b6ae8303253507ad13922293")) (let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6"))
(package (package
(inherit emacsy) (inherit emacsy)
(name "emacsy-minimal") (name "emacsy-minimal")
(version (git-version "v0.4.1" "19" commit)) (version (git-version "v0.4.1" "28" commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2735,7 +2813,7 @@ in C using Gtk+-3 and WebKitGtk.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ivy28km1p7nlrf63xx3hvrpxf5ld5amk1wcan3k7sqv1kq9mqdb")))) "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -17,6 +18,7 @@
;;; 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 hardware) (define-module (gnu packages hardware)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -276,3 +278,32 @@ supported by the Linux kernel.")
;; Source file headers still say GPL2+, but the authorial intent ;; Source file headers still say GPL2+, but the authorial intent
;; (from COPYING and the F9 'about' screen) is clearly GPL3+. ;; (from COPYING and the F9 'about' screen) is clearly GPL3+.
(license license:gpl3+))) (license license:gpl3+)))
(define-public rkdeveloptool
(let ((commit "6e92ebcf8b1812da02663494a68972f956e490d3")
(revision "0"))
(package
(name "rkdeveloptool")
(version (git-version "1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rockchip-linux/rkdeveloptool.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)))
(inputs
`(("libusb" ,libusb)))
(home-page "https://github.com/rockchip-linux/rkdeveloptool")
(synopsis "Read from and write to RockChicp devices over USB")
(description
"Rkdeveloptool can read from and write to RockChip devices over USB, such
as the Pinebook Pro.")
(license license:gpl2+))))

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,7 +22,6 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages upnp) #:use-module (gnu packages upnp)
#:use-module (gnu packages web)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -30,7 +30,7 @@
(define-public i2pd (define-public i2pd
(package (package
(name "i2pd") (name "i2pd")
(version "2.29.0") (version "2.31.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -39,12 +39,11 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300")))) (base32 "1q2gxz041ha9n5lfn91iy11sdf3z7d806vcq4z43m7lf92m7i4nn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs `(("boost" ,boost) (inputs `(("boost" ,boost)
("miniupnpc" ,miniupnpc) ("miniupnpc" ,miniupnpc)
("openssl" ,openssl) ("openssl" ,openssl)
("websocketpp" ,websocketpp)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments '(#:configure-flags (arguments '(#:configure-flags
(let ((source (assoc-ref %build-inputs "source"))) (let ((source (assoc-ref %build-inputs "source")))
@ -52,7 +51,6 @@
"-DWITH_PCH=OFF" "-DWITH_PCH=OFF"
"-DWITH_STATIC=OFF" "-DWITH_STATIC=OFF"
"-DWITH_UPNP=ON" "-DWITH_UPNP=ON"
"-DWITH_WEBSOCKETS=ON"
"-DWITH_LIBRARY=ON" "-DWITH_LIBRARY=ON"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DWITH_BINARY=ON")) "-DWITH_BINARY=ON"))

View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,18 +28,25 @@
(define-public kawa (define-public kawa
(package (package
(name "kawa") (name "kawa")
(version "3.0") (version "3.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz")) (uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "06g015zjlfgsx0n4lb326czkbf1grlx0n6dx074m808hdg6m16lc"))))
"1k9qpydc64ar4aqyg3q7jmmxy503ayj85227qfhc5n6ngchqavhy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-build? #f `(#:parallel-build? #f
#:parallel-tests? #f)) #:parallel-tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-kawa
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/share/kawa/bin/kawa")
`("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea"))))
#t))))))
(inputs (inputs
`(("icedtea" ,icedtea-8 "jdk"))) `(("icedtea" ,icedtea-8 "jdk")))
(home-page "https://www.gnu.org/software/kawa/") (home-page "https://www.gnu.org/software/kawa/")

View File

@ -369,50 +369,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(sha256 hash))) (sha256 hash)))
(define-public linux-libre-5.6-version "5.6.3") (define-public linux-libre-5.6-version "5.6.4")
(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 "1ajh1iw3bplm6ckcycg45wfmmqkvfiqmh6i3m1895dfapfd6h4qx"))) (hash (base32 "14cxbc9xi4s3xwx4yb1yd4z0kidsk3d443skf5sgmdhcalg79wax")))
(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.31") (define-public linux-libre-5.4-version "5.4.32")
(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 "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451"))) (hash (base32 "1czjjnln1cqrnjxw0md6mpw9haw9abdyvmxnjds56ym4nzx9jb8r")))
(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.114") (define-public linux-libre-4.19-version "4.19.115")
(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 "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y"))) (hash (base32 "1hh170z3mv181l6cc6qqc12wif5jsmxbh2qxbq6b9km5irydkchi")))
(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.175") (define-public linux-libre-4.14-version "4.14.176")
(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 "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b"))) (hash (base32 "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw")))
(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.218") (define-public linux-libre-4.9-version "4.9.219")
(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 "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz"))) (hash (base32 "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb")))
(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.218") (define-public linux-libre-4.4-version "4.4.219")
(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 "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a"))) (hash (base32 "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f")))
(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)))

View File

@ -1711,7 +1711,7 @@ also be supported.")
(define-public sbcl-ironclad (define-public sbcl-ironclad
(package (package
(name "sbcl-ironclad") (name "sbcl-ironclad")
(version "0.48") (version "0.49")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1719,8 +1719,7 @@ also be supported.")
(url "https://github.com/sharplispers/ironclad/") (url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32 "0kbzqg2aasrhjwy3nrzy2ddy809n1j045w4qkyc3r2syqd203d4q"))
"1wzczpgvgjc5h8ghz75kxi7iykmqxqchdhgdhkif9j99kyqvbyam"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
@ -1728,7 +1727,8 @@ also be supported.")
`(("rt" ,sbcl-rt))) `(("rt" ,sbcl-rt)))
(inputs (inputs
`(("bordeaux-threads" ,sbcl-bordeaux-threads) `(("bordeaux-threads" ,sbcl-bordeaux-threads)
("flexi-streams" ,sbcl-flexi-streams))) ("flexi-streams" ,sbcl-flexi-streams)
("trivial-garbage" ,sbcl-trivial-garbage)))
(synopsis "Cryptographic toolkit written in Common Lisp") (synopsis "Cryptographic toolkit written in Common Lisp")
(description (description
"Ironclad is a cryptography library written entirely in Common Lisp. "Ironclad is a cryptography library written entirely in Common Lisp.
@ -6321,10 +6321,10 @@ various string metrics in Common Lisp:
(sbcl-package->cl-source-package sbcl-mk-string-metrics)) (sbcl-package->cl-source-package sbcl-mk-string-metrics))
(define-public sbcl-cl-str (define-public sbcl-cl-str
(let ((commit "3d5ec86e3a0199e5973aacde951086dfd754b5e5")) (let ((commit "eb480f283e28802d67b35bf916506701152f9a2a"))
(package (package
(name "sbcl-cl-str") (name "sbcl-cl-str")
(version (git-version "0.8" "1" commit)) (version (git-version "0.17" "1" commit))
(home-page "https://github.com/vindarel/cl-str") (home-page "https://github.com/vindarel/cl-str")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -6332,12 +6332,13 @@ various string metrics in Common Lisp:
(url home-page) (url home-page)
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "0szzzbygw9h985yxz909vvqrp69pmpcpahn7hn350lnyjislk9ga")) (base32 "1hpq5m8zjjnzns370zy27z2vcm1p8n2ka5ij2x67gyc9amz9vla0"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("cl-ppcre" ,sbcl-cl-ppcre) `(("cl-ppcre" ,sbcl-cl-ppcre)
("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
("cl-change-case" ,sbcl-cl-change-case)))
(native-inputs (native-inputs
`(("prove" ,sbcl-prove) `(("prove" ,sbcl-prove)
("prove-asdf" ,sbcl-prove-asdf))) ("prove-asdf" ,sbcl-prove-asdf)))
@ -11358,3 +11359,67 @@ multiple checkers, including Aspell and Hunspell.")
(define-public cl-enchant (define-public cl-enchant
(sbcl-package->cl-source-package sbcl-enchant)) (sbcl-package->cl-source-package sbcl-enchant))
(define-public sbcl-cl-change-case
(let ((commit "5ceff2a5f8bd845b6cb510c6364176b27a238fd3"))
(package
(name "sbcl-cl-change-case")
(version (git-version "0.1.0" "1" commit))
(home-page "https://github.com/rudolfochrist/cl-change-case")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1afyglglk9z3yg8gylcl301bl2r8vq3sllyznzj9s5xi5gs6qyf2"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cl-ppcre" ,sbcl-cl-ppcre)
("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
'(;; FIXME: Test pass but phase fails with 'Component
;; "cl-change-case-test" not found, required by'.
#:tests? #f
#:test-asd-file "cl-change-case-test.asd"))
(synopsis "Convert Common Lisp strings between camelCase, PascalCase and more")
(description
"@code{cl-change-case} is library to convert strings between camelCase,
PascalCase, snake_case, param-case, CONSTANT_CASE and more.")
(license license:llgpl))))
(define-public cl-change-case
(sbcl-package->cl-source-package sbcl-cl-change-case))
(define-public sbcl-moptilities
(let ((commit "a436f16b357c96b82397ec018ea469574c10dd41"))
(package
(name "sbcl-moptilities")
(version (git-version "0.3.13" "1" commit))
(home-page "https://github.com/gwkkwg/moptilities/")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("closer-mop" ,sbcl-closer-mop)))
(native-inputs
`(("lift" ,sbcl-lift)))
(synopsis "Compatibility layer for Common Lisp MOP implementation differences")
(description
"MOP utilities provide a common interface between Lisps and make the
MOP easier to use.")
(license license:expat))))
(define-public cl-moptilities
(sbcl-package->cl-source-package sbcl-moptilities))

View File

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
@ -855,7 +855,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr (define-public txr
(package (package
(name "txr") (name "txr")
(version "234") (version "235")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -863,24 +863,29 @@ enough to play the original mainframe Zork all the way through.")
(url "http://www.kylheku.com/git/txr/") (url "http://www.kylheku.com/git/txr/")
(commit (string-append "txr-" version)))) (commit (string-append "txr-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "txr-shell.patch"))
(sha256 (sha256
(base32 (base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn"))))
"0c9qsj4xwc24c9g02mr5n97m4d87d4n0pcc2c2n58l2vg5dnzba0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("cc=gcc") '(#:configure-flags
#:phases (modify-phases %standard-phases (list "cc=gcc"
(string-append "--prefix=" (assoc-ref %outputs "out")))
#:test-target "tests"
#:phases
(modify-phases %standard-phases
(replace 'configure
;; ./configure is a hand-written script that can't handle standard
;; autotools arguments like CONFIG_SHELL.
(lambda* (#:key configure-flags #:allow-other-keys)
(setenv "txr_shell" (which "bash"))
(apply invoke "./configure" configure-flags)
#t))
(add-after 'configure 'fix-tests (add-after 'configure 'fix-tests
(lambda _ (lambda _
(substitute* "tests/017/realpath.tl" (substitute* (list "tests/017/realpath.tl"
"tests/017/realpath.expected")
(("/usr/bin") "/")) (("/usr/bin") "/"))
(substitute* "tests/017/realpath.expected" #t)))))
(("/usr/bin") "/"))
#t))
(replace 'check
(lambda _
(invoke "make" "tests"))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("flex" ,flex))) ("flex" ,flex)))

View File

@ -387,7 +387,7 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt (define-public mutt
(package (package
(name "mutt") (name "mutt")
(version "1.13.4") (version "1.13.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list
@ -397,7 +397,7 @@ aliasing facilities to work just as they would on normal mail.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm")) "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"))
(patches (search-patches "mutt-store-references.patch")))) (patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs

View File

@ -164,7 +164,7 @@ the traditional flat-text whatis databases.")
(define-public man-pages (define-public man-pages
(package (package
(name "man-pages") (name "man-pages")
(version "5.05") (version "5.06")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -174,7 +174,7 @@ the traditional flat-text whatis databases.")
(string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/"
"man-pages-" version ".tar.xz"))) "man-pages-" version ".tar.xz")))
(sha256 (sha256
(base32 "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm")))) (base32 "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (delete 'configure)) '(#:phases (modify-phases %standard-phases (delete 'configure))

View File

@ -92,7 +92,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
(define-public mpd (define-public mpd
(package (package
(name "mpd") (name "mpd")
(version "0.21.21") (version "0.21.22")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -101,7 +101,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
"/mpd-" version ".tar.xz")) "/mpd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1kk8q5z99zdzwv3angn03jwnxhqdad0pnyi5j67c2qiv1rgv3gg1")))) "18lvyv3crijki5nxjdhf1byayyavdvj07dk6rm856n4vi78qfmjn"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'...

View File

@ -2024,14 +2024,14 @@ displays the results in real time.")
(define-public strongswan (define-public strongswan
(package (package
(name "strongswan") (name "strongswan")
(version "5.8.2") (version "5.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.strongswan.org/strongswan-" (uri (string-append "https://download.strongswan.org/strongswan-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 "03j3fx357bh89n44a5v9wdc92azdx2d37j7jmlyr4z1kwzdhv446")))) (base32 "0g2m08gmgdi3qvvqz6zy7n16np53sp232xd0rdc2vdhk73img6id"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -111,9 +111,9 @@
;; Latest version of Guix, which may or may not correspond to a release. ;; Latest version of Guix, which may or may not correspond to a release.
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.0.1") (let ((version "1.1.0")
(commit "09844816c77caaa60f4149f99a34733966724627") (commit "d62c9b2671be55ae0305bebfda17b595f33797f2")
(revision 15)) (revision 0))
(package (package
(name "guix") (name "guix")
@ -129,7 +129,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1fciffls6cw9zz13vig5x37r73qxc0irzyh0caimciddlksvabf7")) "0v76hb0pidfgvxa22gq6hqf5yc3m527gl7hpzykazgjh881g2vmy"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

View File

@ -0,0 +1,91 @@
This patch ensures '.desktop' files are picked up in the system profile
and not in the directories listed in $XDG_DATA_DIRS. The latter includes
'gnome-session.desktop', which should be used if it's in
/run/current-system/profile, and only then.
Fixes <https://bugs.gnu.org/37831>.
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 6a116a8..02c1458 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -348,24 +348,18 @@ get_system_session_dirs (GdmSession *self)
GArray *search_array = NULL;
char **search_dirs;
int i;
- const gchar * const *system_data_dirs = g_get_system_data_dirs ();
static const char *x_search_dirs[] = {
"/etc/X11/sessions/",
DMCONFDIR "/Sessions/",
DATADIR "/gdm/BuiltInSessions/",
- DATADIR "/xsessions/",
+ "/run/current-system/profile/share/xsessions/"
};
static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
search_array = g_array_new (TRUE, TRUE, sizeof (char *));
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL);
- g_array_append_val (search_array, dir);
- }
-
g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
#ifdef ENABLE_WAYLAND_SUPPORT
@@ -373,16 +367,7 @@ get_system_session_dirs (GdmSession *self)
#ifdef ENABLE_USER_DISPLAY_SERVER
g_array_prepend_val (search_array, wayland_search_dir);
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_insert_val (search_array, i, dir);
- }
#else
- for (i = 0; system_data_dirs[i]; i++) {
- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_append_val (search_array, dir);
- }
-
g_array_append_val (search_array, wayland_search_dir);
#endif
}
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
index afbc5c0..bb5e3e6 100644
--- a/libgdm/gdm-sessions.c
+++ b/libgdm/gdm-sessions.c
@@ -238,19 +238,11 @@ collect_sessions (void)
"/etc/X11/sessions/",
DMCONFDIR "/Sessions/",
DATADIR "/gdm/BuiltInSessions/",
- DATADIR "/xsessions/",
- NULL
+ "/run/current-system/profile/share/xsessions/"
};
xorg_search_array = g_array_new (TRUE, TRUE, sizeof (char *));
- const gchar * const *system_data_dirs = g_get_system_data_dirs ();
-
- for (i = 0; system_data_dirs[i]; i++) {
- session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL);
- g_array_append_val (xorg_search_array, session_dir);
- }
-
g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs));
#ifdef ENABLE_WAYLAND_SUPPORT
@@ -261,11 +253,6 @@ collect_sessions (void)
wayland_search_array = g_array_new (TRUE, TRUE, sizeof (char *));
- for (i = 0; system_data_dirs[i]; i++) {
- session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_append_val (wayland_search_array, session_dir);
- }
-
g_array_append_vals (wayland_search_array, wayland_search_dirs, G_N_ELEMENTS (wayland_search_dirs));
#endif

View File

@ -1,34 +0,0 @@
From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
From: Jerome Jiang <jianj@google.com>
Date: Wed, 23 May 2018 15:43:00 -0700
Subject: [PATCH] VP8: Fix use-after-free in postproc.
The pointer in vp8 postproc refers to show_frame_mi which is only
updated on show frame. However, when there is a no-show frame which also
changes the size (thus new frame buffers allocated), show_frame_mi is
not updated with new frame buffer memory.
Change the pointer in postproc to mi which is always updated.
Bug: 842265
Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd
---
vp8/common/postproc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index d67ee8a57..8c292d616 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5);
- const MODE_INFO *mode_info_context = cm->show_frame_mi;
+ const MODE_INFO *mode_info_context = cm->mi;
int mbr, mbc;
/* The pixel thresholds are adjusted according to if or not the macroblock
--
2.19.0

View File

@ -1,38 +0,0 @@
Fix test failure in some environments, including Guix.
Taken from upstream:
https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf
diff --git a/test/completion/basic.py b/test/completion/basic.py
index b40068179..3ff919ca6 100644
--- a/test/completion/basic.py
+++ b/test/completion/basic.py
@@ -209,11 +209,11 @@ def global_as_import():
deleted_var = 3
del deleted_var
-#? int()
+#?
deleted_var
-#? ['deleted_var']
+#? []
deleted_var
-#! ['deleted_var = 3']
+#! []
deleted_var
# -----------------
diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py
index 4fdb861b0..6858b6ca8 100644
--- a/test/test_api/test_full_name.py
+++ b/test/test_api/test_full_name.py
@@ -112,7 +112,8 @@ def test_os_path(Script):
def test_os_issues(Script):
"""Issue #873"""
- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt']
+ # nt is not found, because it's deleted
+ assert [c.name for c in Script('import os\nos.nt''').complete()] == []
def test_param_name(Script):

View File

@ -1,59 +0,0 @@
Use the current shell instead of trying to find another one and
failing to do so.
diff --git a/configure b/configure
index f1adb919..7891b4dc 100755
--- a/configure
+++ b/configure
@@ -26,28 +26,6 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The #!/bin/sh might be some legacy piece of crap,
-# not even up to 1990 POSIX.2 spec. So the first step
-# is to look for a better shell in some known places
-# and re-execute ourselves with that interpreter.
-#
-
-if test x$txr_shell = x ; then
- for shell in /bin/bash /usr/bin/bash /usr/xpg4/bin/sh ; do
- if test -x $shell ; then
- txr_shell=$shell
- break
- fi
- done
- if test x$txr_shell = x ; then
- echo "No known POSIX shell found: falling back on /bin/sh, which may not work"
- txr_shell=/bin/sh
- fi
- export txr_shell
- exec $txr_shell $0 ${@+"$@"}
-fi
-
set -u
#
@@ -190,13 +168,6 @@ while [ $# -gt 0 ] ; do
exit 1
fi
- eval "var_exists=\${$var+y}"
-
- if [ "$var_exists" != y ] ; then
- printf "$0: nonexistent option: '%s'\n" "$1"
- exit 1
- fi
-
eval "$var='$val'"
eval "var_given_exists=\${${var}_given+y}"
@@ -208,6 +179,8 @@ while [ $# -gt 0 ] ; do
shift
done
+txr_shell=$CONFIG_SHELL
+
#
# If --help was given (or --help=<nonempty> or help=<nonempty>) then
# print help and exit. The termination status is failed, to indicate

View File

@ -53,6 +53,7 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages less) #:use-module (gnu packages less)
@ -386,6 +387,49 @@ functions. The password hashing function is implemented in XS with a
pure Perl backup version for systems that cannot handle XS.") pure Perl backup version for systems that cannot handle XS.")
(license gpl2+))) (license gpl2+)))
(define-public perl-authen-passphrase
(package
(name "perl-authen-passphrase")
(version "0.008")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-"
version ".tar.gz"))
(sha256
(base32
"0qq4krap687rxf6xr31bg5nj5dqmm1frcm7fq249v1bxc4h4bnsm"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)
("perl-test-pod" ,perl-test-pod)
("perl-test-pod-coverage" ,perl-test-pod-coverage)))
(propagated-inputs
`(("perl-authen-dechpwd" ,perl-authen-dechpwd)
("perl-crypt-des" ,perl-crypt-des)
("perl-crypt-eksblowfish" ,perl-crypt-eksblowfish)
("perl-crypt-mysql" ,perl-crypt-mysql)
("perl-crypt-passwdmd5" ,perl-crypt-passwdmd5)
("perl-crypt-unixcrypt_xs" ,perl-crypt-unixcrypt_xs)
("perl-data-entropy" ,perl-data-entropy)
("perl-digest-md4" ,perl-digest-md4)
("perl-module-runtime" ,perl-module-runtime)
("perl-params-classify" ,perl-params-classify)))
(home-page "https://metacpan.org/release/Authen-Passphrase")
(synopsis "Hashed passwords/passphrases as objects")
(description "@code{Authen-Passphrase} is the base class for a
system of objects that encapsulate passphrases. An object of this
type is a passphrase recogniser; its job is to recognise whether an
offered passphrase is the right one. For security such passphrase
recognisers usually do not themselves know the passphrase they are
looking for; they can merely recognise it when they see it. There are
many schemes in use to achieve this effect and the intent of this
class is to provide a consistent interface to them all. In addition
to the base class, this module also contains implementations of
several specific passphrase schemes.")
(license perl-license)))
(define-public perl-autovivification (define-public perl-autovivification
(package (package
(name "perl-autovivification") (name "perl-autovivification")
@ -1849,6 +1893,55 @@ CPAN::Meta object are present.")
versa.") versa.")
(license (package-license perl)))) (license (package-license perl))))
(define-public perl-crypt-cbc
(package
(name "perl-crypt-cbc")
(version "2.33")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-"
version ".tar.gz"))
(sha256
(base32
"0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"))))
(build-system perl-build-system)
(native-inputs
`(("perl-crypt-rijndael" ,perl-crypt-rijndael)))
(home-page "https://metacpan.org/release/Crypt-CBC")
(synopsis "Encrypt Data with Cipher Block Chaining Mode")
(description "@code{Crypt::CBC} is a Perl-only implementation of
the cryptographic Cipher Block Chaining (CBC) mode. In combination
with a block cipher such as @code{Crypt::Rijndael} you can encrypt and
decrypt messages of arbitrarily long length. The encrypted messages
are compatible with the encryption format used by SSLeay.")
(license perl-license)))
(define-public perl-crypt-des
(package
(name "perl-crypt-des")
(version "2.07")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-"
version ".tar.gz"))
(sha256
(base32
"1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"))))
(build-system perl-build-system)
(native-inputs
`(("perl-crypt-cbc" ,perl-crypt-cbc)))
(home-page "https://metacpan.org/release/Crypt-DES")
(synopsis "DES encryption module")
(description "@code{Crypt::DES} is an XS-based implementation of
the DES cryptography algorithm. The module implements the
@code{Crypt::CBC} interface which has blocksize, keysize, encrypt and
decrypt functions.")
(license bsd-3)))
(define-public perl-crypt-eksblowfish (define-public perl-crypt-eksblowfish
(package (package
(name "perl-crypt-eksblowfish") (name "perl-crypt-eksblowfish")
@ -1883,6 +1976,57 @@ also includes an implementation of @code{bcrypt}, the Unix crypt()
password hashing algorithm based on Eksblowfish.") password hashing algorithm based on Eksblowfish.")
(license perl-license))) (license perl-license)))
(define-public perl-crypt-mysql
(package
(name "perl-crypt-mysql")
(version "0.04")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-"
version ".tar.gz"))
(sha256
(base32
"1qyx6ha13r0rh80ldv5wy2bq2pa74igwh8817xlapsfgxymdzswk"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)
("perl-dbd-mysql" ,perl-dbd-mysql)))
(propagated-inputs
`(("perl-digest-sha1" ,perl-digest-sha1)))
(home-page "https://metacpan.org/release/Crypt-MySQL")
(synopsis "Emulate the MySQL PASSWORD() function")
(description "@code{Crypt::MySQL} emulates the MySQL PASSWORD()
function. The module does not depend on an interface to the MySQL
database server. This enables the comparison of encrypted passwords
without the need for a real MySQL environment.")
(license perl-license)))
(define-public perl-crypt-passwdmd5
(package
(name "perl-crypt-passwdmd5")
(version "1.40")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-"
version ".tgz"))
(sha256
(base32
"0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
(home-page "https://metacpan.org/release/Crypt-PasswdMD5")
(synopsis "Interoperable MD5-based crypt() functions")
(description "@code{Crypt::PasswdMD5} provides various
crypt()-compatible interfaces to the MD5-based crypt() function found
in various *nixes. It is based on the implementation found on FreeBSD
2.2.[56]-RELEASE.")
(license perl-license)))
(define-public perl-crypt-randpasswd (define-public perl-crypt-randpasswd
(package (package
(name "perl-crypt-randpasswd") (name "perl-crypt-randpasswd")
@ -1957,6 +2101,29 @@ supported encryption modes are:
(description "A pure Perl implementation of the RC4 algorithm.") (description "A pure Perl implementation of the RC4 algorithm.")
(license (package-license perl)))) (license (package-license perl))))
(define-public perl-crypt-unixcrypt_xs
(package
(name "perl-crypt-unixcrypt_xs")
(version "0.11")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-"
version ".tar.gz"))
(sha256
(base32
"1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Crypt-UnixCrypt_XS")
(synopsis "XS interface for a portable traditional crypt function")
(description "@code{Crypt::UnixCrypt_XS} implements the DES-based
Unix @code{crypt} function. For those who need to construct
non-standard variants of @code{crypt}, the various building blocks
used in @code{crypt} are also supplied separately.")
;; Files in the 'fcrypt' directory are covered by a BSD licence.
(license (list perl-license bsd-3))))
(define-public perl-cwd-guard (define-public perl-cwd-guard
(package (package
(name "perl-cwd-guard") (name "perl-cwd-guard")
@ -3413,6 +3580,29 @@ for CRC-CCITT, CRC-16 and CRC-32.")
interface for the RFC 2104 HMAC mechanism.") interface for the RFC 2104 HMAC mechanism.")
(license (package-license perl)))) (license (package-license perl))))
(define-public perl-digest-md4
(package
(name "perl-digest-md4")
(version "1.9")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-"
version ".tar.gz"))
(sha256
(base32
"19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Digest-MD4")
(synopsis "Interface to the MD4 Algorithm")
(description "The @code{Digest::MD4} module allows you to use the
RSA Data Security Inc.@: MD4 Message Digest algorithm from within Perl
programs. The algorithm takes as input a message of arbitrary length
and produces as output a 128-bit \"fingerprint\" or \"message digest\"
of the input. MD4 is described in RFC 1320.")
(license perl-license)))
(define-public perl-digest-md5 (define-public perl-digest-md5
(package (package
(name "perl-digest-md5") (name "perl-digest-md5")

View File

@ -76,6 +76,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2268,14 +2269,14 @@ from git information.
(define-public python-pyrsistent (define-public python-pyrsistent
(package (package
(name "python-pyrsistent") (name "python-pyrsistent")
(version "0.15.7") (version "0.16.0")
(home-page "https://github.com/tobgu/pyrsistent") (home-page "https://github.com/tobgu/pyrsistent")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyrsistent" version)) (uri (pypi-uri "pyrsistent" version))
(sha256 (sha256
(base32 (base32
"103j63g6lb5dfspph96zxjdpnq9h991kazd4f09ddgkpxpivbiyd")))) "1lrsjgblnapfimd0alsi1as5nz2lfqv97131l7d6anbjzq2rjri8"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-hypothesis" ,python-hypothesis) `(("python-hypothesis" ,python-hypothesis)
@ -11991,15 +11992,14 @@ characters, mouse support, and auto suggestions.")
(define-public python-jedi (define-public python-jedi
(package (package
(name "python-jedi") (name "python-jedi")
(version "0.16.0") (version "0.17.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "jedi" version)) (uri (pypi-uri "jedi" version))
(patches (search-patches "python-jedi-deleted-variables.patch"))
(sha256 (sha256
(base32 (base32
"1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m")))) "0c1h9x3a9klvk2g288wl328x8xgzw7136k6vs9hkd56b85vcjh6z"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -16358,14 +16358,14 @@ time-based (TOTP) passwords.")
(define-public python-parso (define-public python-parso
(package (package
(name "python-parso") (name "python-parso")
(version "0.6.2") (version "0.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "parso" version)) (uri (pypi-uri "parso" version))
(sha256 (sha256
(base32 (base32
"0mr1j4ijqnrihz1yap34g6i8vjldg5lz814sz4v0d8pbqvh5jmhc")))) "0b7irps2dqmzq41sxbpvxbivhh1x2hwmbqp45bbpd82446p9z3lh"))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(build-system python-build-system) (build-system python-build-system)
@ -18696,14 +18696,14 @@ tests.")
(define-public python-gssapi (define-public python-gssapi
(package (package
(name "python-gssapi") (name "python-gssapi")
(version "1.6.1") (version "1.6.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "gssapi" version)) (uri (pypi-uri "gssapi" version))
(sha256 (sha256
(base32 (base32
"1gymg4asvwrz7y13qpwp2s5g8qwq179d72gkj09q6bfcgs82l5wr")))) "02i5s7998dg5kcr4m0xwamd8vjqk1816xbzldyp68l91f6bynwcr"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-decorator" ,python-decorator) `(("python-decorator" ,python-decorator)
@ -19611,3 +19611,27 @@ there are extensions that allow you to use it with other frameworks.")
register external CLI commands via setuptools entry-points.") register external CLI commands via setuptools entry-points.")
(home-page "https://github.com/click-contrib/click-plugins") (home-page "https://github.com/click-contrib/click-plugins")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-diceware
(package
(name "python-diceware")
(version "0.9.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "diceware" version))
(sha256
(base32
"0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"))))
(build-system python-build-system)
(native-inputs
`(("python-coverage" ,python-coverage)
("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)))
(home-page "https://github.com/ulif/diceware/")
(synopsis "Generates memorable passphrases")
(description "This package generates passphrases by concatenating words
randomly picked from wordlists. It supports several sources of
randomness (including real life dice) and different wordlists (including
cryptographically signed ones).")
(license license:gpl3+)))

View File

@ -34,6 +34,7 @@
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages engineering)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
@ -243,7 +244,13 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(uri (string-append "https://www.gnuradio.org/releases/gnuradio/" (uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
"gnuradio-" version ".tar.xz")) "gnuradio-" version ".tar.xz"))
(sha256 (sha256
(base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")))) (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled volk to use the shared one.
(delete-file-recursively "volk")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -288,6 +295,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qwt" ,qwt) ("qwt" ,qwt)
("volk" ,volk)
("zeromq" ,zeromq))) ("zeromq" ,zeromq)))
(arguments (arguments
`(#:modules ((guix build cmake-build-system) `(#:modules ((guix build cmake-build-system)
@ -298,6 +306,8 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
#:imported-modules (,@%cmake-build-system-modules #:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system) (guix build glib-or-gtk-build-system)
(guix build python-build-system)) (guix build python-build-system))
#:configure-flags
'("-DENABLE_INTERNAL_VOLK=OFF")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
@ -383,7 +393,8 @@ environment.")
("gnuradio" ,gnuradio) ("gnuradio" ,gnuradio)
("log4cpp" ,log4cpp) ("log4cpp" ,log4cpp)
;; TODO: Add more drivers. ;; TODO: Add more drivers.
("rtl-sdr" ,rtl-sdr))) ("rtl-sdr" ,rtl-sdr)
("volk" ,volk)))
(synopsis "GNU Radio block for interfacing with various radio hardware") (synopsis "GNU Radio block for interfacing with various radio hardware")
(description "This is a block for GNU Radio allowing to use a common API (description "This is a block for GNU Radio allowing to use a common API
to access different radio hardware.") to access different radio hardware.")
@ -462,7 +473,8 @@ primitives for SDR (Software Defined Radio).")
("gmp" ,gmp) ("gmp" ,gmp)
("gnuradio" ,gnuradio) ("gnuradio" ,gnuradio)
("libosmo-dsp" ,libosmo-dsp) ("libosmo-dsp" ,libosmo-dsp)
("log4cpp" ,log4cpp))) ("log4cpp" ,log4cpp)
("volk" ,volk)))
(synopsis "GNU Radio block to correct IQ imbalance") (synopsis "GNU Radio block to correct IQ imbalance")
(description (description
"This is a GNU Radio block to correct IQ imbalance in quadrature "This is a GNU Radio block to correct IQ imbalance in quadrature
@ -504,7 +516,8 @@ to the fix block above.
("portaudio" ,portaudio) ("portaudio" ,portaudio)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtsvg" ,qtsvg))) ("qtsvg" ,qtsvg)
("volk" ,volk)))
(arguments (arguments
`(#:tests? #f)) ; No tests `(#:tests? #f)) ; No tests
(synopsis "Software defined radio receiver") (synopsis "Software defined radio receiver")

View File

@ -720,14 +720,14 @@ interactive POSIX shell targeted at resource-constrained systems.")
(define-public mksh (define-public mksh
(package (package
(name "mksh") (name "mksh")
(version "57") (version "58")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R" (uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x")))) (base32 "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; tests require access to /dev/tty `(#:tests? #f ; tests require access to /dev/tty

View File

@ -590,13 +590,13 @@ and operations on them using LAPACK and SuiteSparse.")
(define-public r-nlme (define-public r-nlme
(package (package
(name "r-nlme") (name "r-nlme")
(version "3.1-145") (version "3.1-147")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "nlme" version)) (uri (cran-uri "nlme" version))
(sha256 (sha256
(base32 "1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh")))) (base32 "1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-lattice" ,r-lattice))) `(("r-lattice" ,r-lattice)))
@ -693,14 +693,14 @@ analysis.")
(define-public r-survival (define-public r-survival
(package (package
(name "r-survival") (name "r-survival")
(version "3.1-11") (version "3.1-12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "survival" version)) (uri (cran-uri "survival" version))
(sha256 (sha256
(base32 (base32
"1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4")))) "07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-matrix" ,r-matrix))) `(("r-matrix" ,r-matrix)))
@ -1066,13 +1066,13 @@ the input of another.")
(define-public r-reshape2 (define-public r-reshape2
(package (package
(name "r-reshape2") (name "r-reshape2")
(version "1.4.3") (version "1.4.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "reshape2" version)) (uri (cran-uri "reshape2" version))
(sha256 (sha256
(base32 "03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa")))) (base32 "1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-plyr" ,r-plyr) `(("r-plyr" ,r-plyr)
@ -1148,14 +1148,14 @@ agnes cluster diagrams.")
(define-public r-gdtools (define-public r-gdtools
(package (package
(name "r-gdtools") (name "r-gdtools")
(version "0.2.1") (version "0.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gdtools" version)) (uri (cran-uri "gdtools" version))
(sha256 (sha256
(base32 (base32
"1aax50wyrs4336zpf247l8wmp4spab2n70msziy1ip4gbjn26wa1")))) "08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -1989,14 +1989,14 @@ and environmental data in the framework of Euclidean exploratory methods.")
(define-public r-xml2 (define-public r-xml2
(package (package
(name "r-xml2") (name "r-xml2")
(version "1.3.0") (version "1.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "xml2" version)) (uri (cran-uri "xml2" version))
(sha256 (sha256
(base32 (base32
"138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani")))) "0r7rxp922785dcryghbb3wxqgdav7mafwnmxjqfx8zaj3v1q2j3z"))))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
`(("libxml2" ,libxml2) `(("libxml2" ,libxml2)
@ -2080,14 +2080,14 @@ limited to R.")
(define-public r-backports (define-public r-backports
(package (package
(name "r-backports") (name "r-backports")
(version "1.1.5") (version "1.1.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "backports" version)) (uri (cran-uri "backports" version))
(sha256 (sha256
(base32 (base32
"0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33")))) "170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/backports") (home-page "https://cran.r-project.org/web/packages/backports")
(synopsis "Reimplementations of functions introduced since R 3.0.0") (synopsis "Reimplementations of functions introduced since R 3.0.0")
@ -2401,13 +2401,13 @@ informative error messages when it's not available.")
(define-public r-devtools (define-public r-devtools
(package (package
(name "r-devtools") (name "r-devtools")
(version "2.2.2") (version "2.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "devtools" version)) (uri (cran-uri "devtools" version))
(sha256 (sha256
(base32 (base32
"1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279")))) "1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-callr" ,r-callr) `(("r-callr" ,r-callr)
@ -2435,6 +2435,8 @@ informative error messages when it's not available.")
("r-testthat" ,r-testthat) ("r-testthat" ,r-testthat)
("r-usethis" ,r-usethis) ("r-usethis" ,r-usethis)
("r-withr" ,r-withr))) ("r-withr" ,r-withr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/hadley/devtools") (home-page "https://github.com/hadley/devtools")
(synopsis "Tools to make developing R packages easier") (synopsis "Tools to make developing R packages easier")
(description "The devtools package is a collection of package development (description "The devtools package is a collection of package development
@ -2573,21 +2575,15 @@ well as additional utilities such as panel and axis annotation functions.")
(define-public r-rcpparmadillo (define-public r-rcpparmadillo
(package (package
(name "r-rcpparmadillo") (name "r-rcpparmadillo")
(version "0.9.850.1.0") (version "0.9.860.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "RcppArmadillo" version)) (uri (cran-uri "RcppArmadillo" version))
(sha256 (sha256
(base32 (base32
"0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz")))) "1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5"))))
(properties `((upstream-name . "RcppArmadillo"))) (properties `((upstream-name . "RcppArmadillo")))
(build-system r-build-system) (build-system r-build-system)
;; All needed for vignettes
(native-inputs
`(("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)
("ghc-pandoc" ,ghc-pandoc)
("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)))
(propagated-inputs (propagated-inputs
`(("r-rcpp" ,r-rcpp))) `(("r-rcpp" ,r-rcpp)))
(home-page "https://github.com/RcppCore/RcppArmadillo") (home-page "https://github.com/RcppCore/RcppArmadillo")
@ -3769,13 +3765,13 @@ features present in other programming languages.")
(define-public r-plotly (define-public r-plotly
(package (package
(name "r-plotly") (name "r-plotly")
(version "4.9.2") (version "4.9.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "plotly" version)) (uri (cran-uri "plotly" version))
(sha256 (sha256
(base32 (base32
"19zw3qnhfgqdxlvma8xyikir46aiqhfcwxf072z9xgq0hknpblm5")))) "1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-base64enc" ,r-base64enc) `(("r-base64enc" ,r-base64enc)
@ -4101,14 +4097,14 @@ existing packages provide.")
(define-public r-sfsmisc (define-public r-sfsmisc
(package (package
(name "r-sfsmisc") (name "r-sfsmisc")
(version "1.1-5") (version "1.1-6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sfsmisc" version)) (uri (cran-uri "sfsmisc" version))
(sha256 (sha256
(base32 (base32
"173qgm2bn84x544fc3x9gc2rv995sbsvji9lnn2drx8drvzyy8lf")))) "04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/sfsmisc") (home-page "https://cran.r-project.org/web/packages/sfsmisc")
(synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich")
@ -4695,17 +4691,18 @@ models, generalized linear models and model-based clustering.")
(define-public r-mclust (define-public r-mclust
(package (package
(name "r-mclust") (name "r-mclust")
(version "5.4.5") (version "5.4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "mclust" version)) (uri (cran-uri "mclust" version))
(sha256 (sha256
(base32 (base32
"0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm")))) "1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
`(("gfortran" ,gfortran))) `(("gfortran" ,gfortran)
("r-knitr" ,r-knitr)))
(home-page "https://www.stat.washington.edu/mclust/") (home-page "https://www.stat.washington.edu/mclust/")
(synopsis "Gaussian mixture modelling for model-based clustering etc.") (synopsis "Gaussian mixture modelling for model-based clustering etc.")
(description (description
@ -5137,14 +5134,14 @@ algorithms.")
(define-public r-lme4 (define-public r-lme4
(package (package
(name "r-lme4") (name "r-lme4")
(version "1.1-21") (version "1.1-23")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lme4" version)) (uri (cran-uri "lme4" version))
(sha256 (sha256
(base32 (base32
"035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz")))) "0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-boot" ,r-boot) `(("r-boot" ,r-boot)
@ -5155,7 +5152,10 @@ algorithms.")
("r-nloptr" ,r-nloptr) ("r-nloptr" ,r-nloptr)
("r-nlme" ,r-nlme) ("r-nlme" ,r-nlme)
("r-rcpp" ,r-rcpp) ("r-rcpp" ,r-rcpp)
("r-rcppeigen" ,r-rcppeigen))) ("r-rcppeigen" ,r-rcppeigen)
("r-statmod" ,r-statmod)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/lme4") (home-page "https://cran.r-project.org/web/packages/lme4")
(synopsis "Linear mixed-effects models using eigen and S4") (synopsis "Linear mixed-effects models using eigen and S4")
(description (description
@ -5403,14 +5403,14 @@ genome-wide association studies can be analyzed efficiently.")
(define-public r-cairo (define-public r-cairo
(package (package
(name "r-cairo") (name "r-cairo")
(version "1.5-11") (version "1.5-12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "Cairo" version)) (uri (cran-uri "Cairo" version))
(sha256 (sha256
(base32 (base32
"1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg")))) "02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f"))))
(properties `((upstream-name . "Cairo"))) (properties `((upstream-name . "Cairo")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -5439,20 +5439,21 @@ is supported.")
(define-public r-lubridate (define-public r-lubridate
(package (package
(name "r-lubridate") (name "r-lubridate")
(version "1.7.4") (version "1.7.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lubridate" version)) (uri (cran-uri "lubridate" version))
(sha256 (sha256
(base32 (base32
"14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i")))) "0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-rcpp" ,r-rcpp) `(("r-generics" ,r-generics)
("r-stringr" ,r-stringr))) ("r-rcpp" ,r-rcpp)))
(home-page (native-inputs
"https://cran.r-project.org/web/packages/lubridate") `(("r-knitr" ,r-knitr)))
(home-page "https://cran.r-project.org/web/packages/lubridate/")
(synopsis "Make dealing with dates a little easier") (synopsis "Make dealing with dates a little easier")
(description (description
"This package provides functions to work with date-times and time-spans: "This package provides functions to work with date-times and time-spans:

View File

@ -152,14 +152,14 @@ as well as the classic centralized workflow.")
(define-public git (define-public git
(package (package
(name "git") (name "git")
(version "2.26.0") (version "2.26.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-" (uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly")))) "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("native-perl" ,perl) `(("native-perl" ,perl)
@ -176,7 +176,7 @@ as well as the classic centralized workflow.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq")))) "0j2031x3qchwjmiy2h849j4x1vd8y4rgqv2ak9dc87xbbpsbfg59"))))
;; For subtree documentation. ;; For subtree documentation.
("asciidoc" ,asciidoc-py3) ("asciidoc" ,asciidoc-py3)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
@ -892,9 +892,9 @@ collaboration using typical untrusted file hosts or services.")
(method url-fetch) (method url-fetch)
;; cgit is tightly bound to git. Use GIT_VER from the Makefile, ;; cgit is tightly bound to git. Use GIT_VER from the Makefile,
;; which may not match the current (package-version git). ;; which may not match the current (package-version git).
(uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz") (uri "mirror://kernel.org/software/scm/git/git-2.25.3.tar.xz")
(sha256 (sha256
(base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) (base32 "0yvr97cl0dvj3fwblq1mb0cp97v8hrn9l98p8b1jx8815mbsnz9h"))))
("openssl" ,openssl) ("openssl" ,openssl)
("groff" ,groff) ("groff" ,groff)
("python" ,python) ("python" ,python)

View File

@ -602,7 +602,7 @@ available.")
(define-public x265 (define-public x265
(package (package
(name "x265") (name "x265")
(version "3.2.1") (version "3.3")
(outputs '("out" "static")) (outputs '("out" "static"))
(source (source
(origin (origin
@ -612,7 +612,7 @@ available.")
(string-append "https://download.videolan.org/videolan/x265/" (string-append "https://download.videolan.org/videolan/x265/"
"x265_" version ".tar.gz"))) "x265_" version ".tar.gz")))
(sha256 (sha256
(base32 "1k5vijsy6cgcghw69f5275xfmbjjx7js0nlbgxbd6krnjb7sv6zv")) (base32 "170b61cgpcs5n35qps0p40dqs1q81vkgagzbs4zv7pzls6718vpj"))
(patches (search-patches "x265-arm-flags.patch")) (patches (search-patches "x265-arm-flags.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
@ -1622,25 +1622,6 @@ To load this plugin, specify the following option when starting mpv:
(license license:bsd-3) (license license:bsd-3)
(home-page "https://www.webmproject.org/"))) (home-page "https://www.webmproject.org/")))
;; GNU IceCat fails to build against 1.8.0, so keep this version for now.
(define-public libvpx-1.7
(package
(inherit libvpx)
(version "1.7.0")
(source (origin
(inherit (package-source libvpx))
(uri (git-reference
(url "https://chromium.googlesource.com/webm/libvpx")
(commit (string-append "v" version))))
(file-name (git-file-name "libvpx" version))
(sha256
(base32
"0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"))
(patches
(append
(origin-patches (package-source libvpx))
(search-patches "libvpx-use-after-free-in-postproc.patch")))))))
(define-public youtube-dl (define-public youtube-dl
(package (package
(name "youtube-dl") (name "youtube-dl")

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -133,6 +133,12 @@
`(;; Running tests in parallel can occasionally lead to failures, like: `(;; Running tests in parallel can occasionally lead to failures, like:
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
#:parallel-tests? #f #:parallel-tests? #f
;; FIXME: Disable tests on i686 to work around
;; <https://bugs.gnu.org/40527>.
#:tests? ,(or (%current-target-system)
(not (string=? "i686-linux" (%current-system))))
#:configure-flags (list "--enable-usb-redir" "--enable-opengl" #:configure-flags (list "--enable-usb-redir" "--enable-opengl"
"--enable-docs" "--enable-docs"
(string-append "--smbd=" (string-append "--smbd="
@ -1177,7 +1183,7 @@ DOS or Microsoft Windows.")
(define-public xen (define-public xen
(package (package
(name "xen") (name "xen")
(version "4.11.1") (version "4.13.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1186,7 +1192,7 @@ DOS or Microsoft Windows.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1wv1hyfii14vi9lfjmnv07h2gpm3b7kvh2p55f4yy2b40simksgk")))) "0py50n995gv909i0d1lfdcj9wcp5g1d5z6m2291jqqlfyany138g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1300,14 +1306,13 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
new-search-path ":"))) new-search-path ":")))
(setenv env-name new-env-value))) (setenv env-name new-env-value)))
environment-variable-names)) environment-variable-names))
(setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CROSS_CPATH" (getenv "CPATH"))
(setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(filter-environment! cross? (filter-environment! cross?
'("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" '("CROSS_CPATH"
"CROSS_LIBRARY_PATH")) "CROSS_LIBRARY_PATH"))
(filter-environment! (lambda (e) (not (cross? e))) (filter-environment! (lambda (e) (not (cross? e)))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" '("CPATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
;; Guix tries to be helpful and automatically adds ;; Guix tries to be helpful and automatically adds
;; mini-os-git-checkout/include to the include path, ;; mini-os-git-checkout/include to the include path,
@ -1316,7 +1321,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
(not (not
(string-contains e (string-contains e
"mini-os-git-checkout"))) "mini-os-git-checkout")))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" '("CPATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
(setenv "EFI_VENDOR" "guix") (setenv "EFI_VENDOR" "guix")
#t)) #t))

View File

@ -2,7 +2,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.")
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") (name "webkitgtk")
(version "2.28.0") (version "2.28.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
"webkitgtk-" version ".tar.xz")) "webkitgtk-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn")))) "1n7k4yriqhr38f4fgy8pzdn1nm60m53z8p478sgg64swxnijdg5c"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments

View File

@ -142,7 +142,6 @@ representation."
(documentation "Load kernel modules.") (documentation "Load kernel modules.")
(provision '(kernel-module-loader)) (provision '(kernel-module-loader))
(requirement '(file-systems)) (requirement '(file-systems))
(respawn? #f)
(one-shot? #t) (one-shot? #t)
(modules `((srfi srfi-1) (modules `((srfi srfi-1)
(srfi srfi-34) (srfi srfi-34)

View File

@ -291,6 +291,13 @@ and return the resulting '.go' file."
(default-environment-variables (default-environment-variables
'("PATH=/run/current-system/profile/bin")) '("PATH=/run/current-system/profile/bin"))
;; Booting off a DVD, especially on a slow machine, can make
;; everything slow. Thus, increase the timeout compared to the
;; default 5s in the Shepherd 0.7.0. See
;; <https://bugs.gnu.org/40572>.
;; XXX: Use something better when the next Shepherd is out.
(set! (@@ (shepherd service) %pid-file-timeout) 30)
;; Arrange to spawn a REPL if something goes wrong. This is better ;; Arrange to spawn a REPL if something goes wrong. This is better
;; than a kernel panic. ;; than a kernel panic.
(call-with-error-handling (call-with-error-handling

View File

@ -4,6 +4,7 @@
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix modules)
#:use-module ((guix packages) #:select (package-version)) #:use-module ((guix packages) #:select (package-version))
#:use-module ((guix store) #:select (%store-prefix)) #:use-module ((guix store) #:select (%store-prefix))
#:use-module (gnu installer) #:use-module (gnu installer)
@ -50,6 +52,7 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages nvi) #:use-module (gnu packages nvi)
#:use-module (gnu packages xorg)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (installation-os #:export (installation-os
@ -287,6 +290,38 @@ the user's target storage device rather than on the RAM disk."
(persistent? #f) (persistent? #f)
(max-database-size (* 5 (expt 2 20)))))) ;5 MiB (max-database-size (* 5 (expt 2 20)))))) ;5 MiB
;; These define a service to load the uvesafb kernel module with the
;; appropriate options. The GUI installer needs it when the machine does not
;; support Kernel Mode Setting. Otherwise kmscon is missing /dev/fb0.
(define (uvesafb-shepherd-service _)
(list (shepherd-service
(documentation "Load the uvesafb kernel module.")
(provision '(uvesafb))
(requirement '(file-systems))
(start #~(lambda ()
;; uvesafb is only supported on x86 and x86_64.
(or (not (and (string-suffix? "linux-gnu" %host-type)
(or (string-prefix? "x86_64" %host-type)
(string-prefix? "i686" %host-type))))
(file-exists? "/dev/fb0")
(invoke #+(file-append kmod "/bin/modprobe")
"uvesafb"
(string-append "v86d=" #$v86d "/sbin/v86d")
"mode_option=1024x768"))))
(respawn? #f)
(one-shot? #t))))
(define uvesafb-service-type
(service-type
(name 'uvesafb)
(extensions
(list (service-extension shepherd-root-service-type
uvesafb-shepherd-service)))
(description
"Load the @code{uvesafb} kernel module with the right options.")
(default-value #t)))
(define %installation-services (define %installation-services
;; List of services of the installation system. ;; List of services of the installation system.
(let ((motd (plain-file "motd" " (let ((motd (plain-file "motd" "
@ -407,7 +442,13 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
(list bare-bones-os (list bare-bones-os
glibc-utf8-locales glibc-utf8-locales
texinfo texinfo
guile-2.2))))) guile-2.2))
;; Machines without Kernel Mode Setting (those with many old and
;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI
;; installer. Some may also need a kernel parameter like nomodeset
;; or vga=793, but we leave that for the user to specify in GRUB.
(service uvesafb-service-type))))
(define %issue (define %issue
;; Greeting. ;; Greeting.

View File

@ -339,8 +339,9 @@ Report the availability of substitutes.\n"))
"Load the manifest from FILE and return the list of packages it refers to." "Load the manifest from FILE and return the list of packages it refers to."
(let* ((user-module (make-user-module '((guix profiles) (gnu)))) (let* ((user-module (make-user-module '((guix profiles) (gnu))))
(manifest (load* file user-module))) (manifest (load* file user-module)))
(map manifest-entry-item (delete-duplicates (map manifest-entry-item
(manifest-transitive-entries manifest)))) (manifest-transitive-entries manifest))
eq?)))
;;; ;;;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff