3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00

Merge branch 'master' into core-updates

This commit is contained in:
Danny Milosavljevic 2021-02-11 19:12:36 +01:00
commit abd318ff4b
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
141 changed files with 6499 additions and 43936 deletions

View file

@ -150,6 +150,7 @@ MODULES = \
guix/build-system/node.scm \
guix/build-system/perl.scm \
guix/build-system/python.scm \
guix/build-system/renpy.scm \
guix/build-system/ocaml.scm \
guix/build-system/qt.scm \
guix/build-system/waf.scm \
@ -205,6 +206,7 @@ MODULES = \
guix/build/ocaml-build-system.scm \
guix/build/qt-build-system.scm \
guix/build/r-build-system.scm \
guix/build/renpy-build-system.scm \
guix/build/rakudo-build-system.scm \
guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \
@ -361,10 +363,6 @@ AUX_FILES = \
gnu/packages/aux-files/linux-libre/5.10-arm64.conf \
gnu/packages/aux-files/linux-libre/5.10-i686.conf \
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.4-arm.conf \
gnu/packages/aux-files/linux-libre/5.4-arm64.conf \
gnu/packages/aux-files/linux-libre/5.4-i686.conf \

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -241,7 +241,7 @@ interface (FFI) of Guile.")
(define* (build-program source version
#:optional (guile-version (effective-version))
#:key (pull-version 0))
#:key (pull-version 0) (channel-metadata #f))
"Return a program that computes the derivation to build Guix from SOURCE."
(define select?
;; Select every module but (guix config) and non-Guix modules.
@ -359,6 +359,8 @@ interface (FFI) of Guile.")
(run-with-store store
(guix-derivation source version
#$guile-version
#:channel-metadata
'#$channel-metadata
#:pull-version
#$pull-version)
#:system system)
@ -380,7 +382,9 @@ interface (FFI) of Guile.")
;; The procedure below is our return value.
(define* (build source
#:key verbose? (version (date-version-string)) system
#:key verbose?
(version (date-version-string)) channel-metadata
system
(pull-version 0)
;; For the standalone Guix, default to Guile 3.0. For old
@ -397,6 +401,7 @@ files."
;; Build the build program and then use it as a trampoline to build from
;; SOURCE.
(mlet %store-monad ((build (build-program source version guile-version
#:channel-metadata channel-metadata
#:pull-version pull-version))
(system (if system (return system) (current-system)))
(home -> (getenv "HOME"))

View file

@ -25,6 +25,7 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
GUIX_SYSTEM_TYPE
GUIX_ASSERT_SUPPORTED_SYSTEM
GUIX_CHANNEL_METADATA
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])

View file

@ -7890,6 +7890,19 @@ passes flags specified by the @code{#:make-maker-flags} or
Which Perl package is used can be specified with @code{#:perl}.
@end defvr
@defvr {Scheme Variable} renpy-build-system
This variable is exported by @code{(guix build-system renpy)}. It implements
the more or less standard build procedure used by Ren'py games, which consists
of loading @code{#:game} once, thereby creating bytecode for it.
It further creates a wrapper script in @code{bin/} and a desktop entry in
@code{share/applications}, both of which can be used to launch the game.
Which Ren'py package is used can be specified with @code{#:renpy}.
Games can also be installed in outputs other than ``out'' by using
@code{#:output}.
@end defvr
@defvr {Scheme Variable} qt-build-system
This variable is exported by @code{(guix build-system qt)}. It
is intended for use with applications using Qt or KDE.

View file

@ -4,6 +4,9 @@
[Unit]
Description=Publish the GNU Guix store
Requires=guix-daemon.service
PartOf=guix-daemon.service
After=guix-daemon.service
[Service]
ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181

View file

@ -18,9 +18,64 @@
(channel-news
(version 0)
(entry (commit "aa8de806252e3835d57fab351b02d13db762deac")
(title
(en "Risk of local privilege escalation @i{via} setuid programs")
(de "Risiko lokaler Rechteausweitung bei setuid-Programmen")
(fr "Risque de gain local de privilèges @i{via} les programmes setuid"))
(body
(en "On Guix System, setuid programs were, until now, installed as
setuid-root @emph{and} setgid-root (in the @file{/run/setuid-programs}
directory). However, most of these programs are meant to run as setuid-root,
but not setgid-root. Thus, this setting posed a risk of local privilege
escalation.
This bug has been fixed and users are advised to upgrade their system, with a
command along the lines of:
@example
guix system reconfigure /run/current-system/configuration.scm
@end example
Users of Guix on a ``foreign distro'' are unaffected. See
@url{https://issues.guix.gnu.org/46395} for more information.")
(de "Auf Guix System wurden setuid-Programme bisher mit setuid-root
@emph{und} setgid-root ausgestattet (im Verzeichnis
@file{/run/setuid-programs}). Die meisten solchen Programme sind jedoch nur
dafür gedacht, mit setuid-root zu laufen, ohne setgid-root. Durch diese
Einstellung war daher vielleicht eine lokale Rechteausweitung (local
privilege escalation) möglich.
Dieser Fehler wurde behoben und Benutzern wird geraten, ihr System zu
aktualisieren, etwa mit diesem Befehl:
@example
guix system reconfigure /run/current-system/configuration.scm
@end example
Benutzer von Guix auf einer Fremddistribution sind @emph{nicht} betroffen.
Siehe @url{https://issues.guix.gnu.org/46395} für weitere Informationen.")
(fr "Sur Guix System, les programmes setuid étaient jusqu présent
installés setuid-root @emph{et} setgid-root (dans le répertoire
@file{/run/setuid-programs}). Ces programmes sont généralement conçus pour
être setuid-root, mais pas setgid-root, et cette situation posait donc un
risque de gain local de privilèges.
Ce problème est corrigé et vous êtes encouragé·e à mettre à jour votre
système, avec une commande de ce genre :
@example
guix system reconfigure /run/current-system/configuration.scm
@end example
Les usagers de Guix sur une distrib externe ne sont pas touché·es. Plus
d'informations sont disponibles à @url{https://issues.guix.gnu.org/46395} (en
anglais).")))
(entry (commit "aedbc5ff32a62f45aeed74c6833399a6cf2c22dc")
(title
(en "Create a manifest with @command{guix package --export-manifest}")
(de "Manifest erzeugen mit @command{guix package --export-manifest}")
(fr "Créer un manifeste avec @command{guix package --export-manifest}"))
(body
(en "The @command{guix package --export-manifest} command outputs a
@ -39,6 +94,25 @@ This allows you to ``pin'' Guix to the revision that was used to build the
profile.
Run @command{info \"(guix) Invoking guix package\"} for more info.")
(de "Mit dem Befehl @command{guix package --export-manifest} wird ein
@dfn{Manifest} aus Ihrem Profil erzeugt. Bei einem Manifest handelt es sich um
ein Stück Code, das Sie an @command{guix package --manifest} zum Einspielen
der Pakete aus dem Manifest übergeben können (oder an jeden anderen Befehl,
der die Befehlszeilenoption @option{--manifest} versteht).
Die Absicht hinter dieser neuen Befehlszeilenoption @option{--export-manifest}
ist, dass man leichter von einem imperativen Stil, bei dem man wiederholt
@command{guix install} und ähnliche Befehle aufruft, zum deklarativen Stil
wechseln kann. Im deklarativen Stil tragen Sie die Liste der Pakete, die Sie
haben möchten, in eine Manifest-Datei ein.
Analog können Sie mit der neuen Befehlszeilenoption @option{--export-channels}
zu Ihrem Profil eine @dfn{Kanalspezifikation} erzeugen, die für @command{guix
pull --channels} geeignet ist. Damit können Sie für Guix immer die Version
benutzen, mit der das Profil erstellt wurde.
Führen Sie für mehr Informationen @command{info \"(guix.de) Aufruf von guix
package\"} aus.")
(fr "La commande @command{guix package --export-manifest} affiche un
@dfn{manifeste} pour le profil choisi. Ce manifeste est un bout de code qu'on
peut passer à @command{guix package --manifest} (ou n'importe qu'elle commande

View file

@ -73,12 +73,9 @@
(define install-allwinner64-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/spl/sunxi-spl.bin"))
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
(let ((spl (string-append bootloader "/libexec/u-boot-sunxi-with-spl.fit.itb")))
(write-file-on-device spl (stat:size (stat spl))
image (* 8 1024))
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 40 1024)))))
image (* 8 1024)))))
(define install-imx-u-boot
#~(lambda (bootloader root-index image)
@ -91,7 +88,7 @@
(define install-puma-rk3399-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/u-boot-spl.rksd"))
(let ((spl (string-append bootloader "/libexec/idbloader.img"))
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
(write-file-on-device spl (stat:size (stat spl))
image (* 64 512))

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@ -234,7 +234,7 @@ they already exist."
"/" (basename prog))))
(copy-file prog target)
(chown target 0 0)
(chmod target #o6555)))
(chmod target #o4555)))
(format #t "setting up setuid programs in '~a'...~%"
%setuid-directory)

View file

@ -898,9 +898,6 @@ dist_patch_DATA = \
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
%D%/packages/patches/classpath-aarch64-support.patch \
%D%/packages/patches/clementine-fix-sqlite.patch \
%D%/packages/patches/clementine-remove-crypto++-dependency.patch \
%D%/packages/patches/clementine-use-openssl.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/cmake-curl-certificates.patch \
%D%/packages/patches/coda-use-system-libs.patch \
@ -967,7 +964,6 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-patch-server-functions.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-undohist-ignored.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
@ -1162,7 +1158,6 @@ dist_patch_DATA = \
%D%/packages/patches/hdf4-shared-fortran.patch \
%D%/packages/patches/hdf4-tirpc.patch \
%D%/packages/patches/hdf5-config-date.patch \
%D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \
%D%/packages/patches/hdf-eos2-build-shared.patch \
%D%/packages/patches/hdf-eos2-remove-gctp.patch \
%D%/packages/patches/hdf-eos2-fortrantests.patch \
@ -1561,6 +1556,7 @@ dist_patch_DATA = \
%D%/packages/patches/pypy3-7.3.1-fix-tests.patch \
%D%/packages/patches/qemu-build-info-manual.patch \
%D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qpdfview-qt515-compat.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-absolute-runpath.patch \
@ -1707,9 +1703,6 @@ dist_patch_DATA = \
%D%/packages/patches/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
%D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \
%D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \
%D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \

View file

@ -1985,7 +1985,7 @@ system is under heavy load.")
(define-public detox
(package
(name "detox")
(version "1.3.0")
(version "1.3.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1994,7 +1994,7 @@ system is under heavy load.")
(file-name (git-file-name name version))
(sha256
(base32
"1dd608c7g65s5lj02cddvani3q9kzirddgkjqa22ap9d4f8b9xgr"))))
"13mhs62m7bpff45liy65pajq5jg3i12jj90vwdkra94z9mlr2rlz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@ -2837,13 +2837,13 @@ a new command using the matched rule, and runs it.")
(define-public di
(package
(name "di")
(version "4.48")
(version "4.48.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://gentoo.com/di/di-" version ".tar.gz"))
(sha256
(base32 "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"))))
(base32 "0rxli3bcm6vlcfx2jminviv8aawwczrpp9kja5zniawy6528al30"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; obscure test failures
@ -3459,7 +3459,7 @@ make it a perfect utility on modern distros.")
(define-public thermald
(package
(name "thermald")
(version "2.4.1")
(version "2.4.2")
(source
(origin
(method git-fetch)
@ -3468,7 +3468,7 @@ make it a perfect utility on modern distros.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6"))))
(base32 "0nzjfiis4d3ml765s65bywk5dhx5x2fb3hpiixpxzzrs50ajwasj"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 20192021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -44,14 +44,14 @@
(define-public clamav
(package
(name "clamav")
(version "0.103.0")
(version "0.103.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz"))
(sha256
(base32
"0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j"))
"0mz2aq8dh4i7mh59r71scczgyjbsj8l0a51nkwxsys5ji5xw823k"))
(modules '((guix build utils)))
(snippet
'(begin

View file

@ -48,12 +48,14 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
@ -692,3 +694,35 @@ more.")
license:gpl2+
license:lgpl2.0+
license:lgpl2.1+))))
(define-public python-jplephem
(package
(name "python-jplephem")
(version "2.15")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jplephem" version))
(sha256
(base32 "1ca3dswsslij79qg6dcijjz4l0fj6nzmxld8z93v45ahlkhps0g0"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "PYTHONPATH"
(string-append "./build/lib:"
(getenv "PYTHONPATH")))
(setenv "PATH" (string-append out "/bin:"
(getenv "PATH")))
(invoke "python" "-m" "unittest" "discover" "-s" "test")))))))
(inputs
`(("python-numpy" ,python-numpy)))
(home-page "https://github.com/brandon-rhodes/python-jplephem")
(synopsis "Python version of NASA DE4xx ephemerides")
(description
"The package is a Python implementation of the mathematics that standard
JPL ephemerides use to predict raw (x,y,z) planetary positions.")
(license license:expat)))

View file

@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020,2021
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
@ -82,7 +82,11 @@ main (int argc, char **argv)
unsetenv ("GUILE_LOAD_PATH");
unsetenv ("GUILE_LOAD_COMPILED_PATH");
scm_install_gmp_memory_functions = 1;
/* XXX: Do not let GMP allocate via libgc as this can lead to memory
corruption in GnuTLS/Nettle since Nettle also uses GMP:
<https://issues.guix.gnu.org/46330>. */
scm_install_gmp_memory_functions = 0;
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.0 Kernel Configuration
# Linux/arm 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -4786,7 +4786,6 @@ CONFIG_MFD_RK808=y
# CONFIG_MFD_RN5T618 is not set
CONFIG_MFD_SEC_CORE=y
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SL28CPLD is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
# CONFIG_ABX500_CORE is not set
@ -7053,7 +7052,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7766,7 +7764,6 @@ CONFIG_BCM_VIDEOCORE=y
# CONFIG_BCM2835_VCHIQ is not set
# CONFIG_SND_BCM2835 is not set
# CONFIG_VIDEO_BCM2835 is not set
# CONFIG_BCM2835_VCHIQ_MMAL is not set
CONFIG_PI433=m
#
@ -9784,6 +9781,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.0 Kernel Configuration
# Linux/arm64 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -4242,7 +4242,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_REGMAP=m
#
# Memory mapped GPIO drivers
@ -4298,7 +4297,6 @@ CONFIG_GPIO_BD70528=m
CONFIG_GPIO_BD71828=m
CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MAX77620=y
CONFIG_GPIO_SL28CPLD=m
# end of MFD GPIO expanders
#
@ -4540,7 +4538,6 @@ CONFIG_SENSORS_NCT6775=m
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_PWM_FAN is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_SL28CPLD=m
# CONFIG_SENSORS_SHT15 is not set
CONFIG_SENSORS_SHT21=m
# CONFIG_SENSORS_SHT3x is not set
@ -4670,7 +4667,6 @@ CONFIG_GPIO_WATCHDOG=m
# CONFIG_WDAT_WDT is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_ZIIRAVE_WATCHDOG is not set
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_SBSA_WATCHDOG=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
@ -4807,8 +4803,6 @@ CONFIG_MFD_RK808=m
# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
# CONFIG_ABX500_CORE is not set
@ -5850,7 +5844,6 @@ CONFIG_DRM_AMDGPU_USERPTR=y
# Display Engine Configuration
#
CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_DCN=y
# CONFIG_DRM_AMD_DC_HDCP is not set
CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration
@ -7013,7 +7006,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7730,7 +7722,6 @@ CONFIG_BCM_VIDEOCORE=y
# CONFIG_BCM2835_VCHIQ is not set
# CONFIG_SND_BCM2835 is not set
# CONFIG_VIDEO_BCM2835 is not set
# CONFIG_BCM2835_VCHIQ_MMAL is not set
# CONFIG_PI433 is not set
#
@ -8641,7 +8632,6 @@ CONFIG_PWM_BCM2835=m
CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_SUN4I=m
CONFIG_PWM_TEGRA=m
@ -9670,7 +9660,6 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
@ -9948,6 +9937,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 5.10.0 Kernel Configuration
# Linux/i386 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -826,6 +826,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
CONFIG_HAVE_STATIC_CALL=y
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
CONFIG_ARCH_SPLIT_ARG64=y
#
# GCOV-based kernel profiling
@ -4624,7 +4625,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@ -4686,7 +4686,6 @@ CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_TIMBERDALE=y
CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS6586X=y
@ -4989,7 +4988,6 @@ CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@ -5113,7 +5111,6 @@ CONFIG_WM8350_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_RAVE_SP_WATCHDOG=m
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
@ -5283,8 +5280,6 @@ CONFIG_MFD_RT5033=m
CONFIG_MFD_RC5T583=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_SI476X_CORE=m
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@ -7013,6 +7008,7 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_HDA=m
# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_XTENSA=m
@ -7604,7 +7600,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7659,7 +7654,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
@ -9386,7 +9380,6 @@ CONFIG_PWM_LPSS=m
CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM_PCA9685=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.10.0 Kernel Configuration
# Linux/x86 5.10.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -2214,6 +2214,7 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP_W1=m
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_REGMAP_SOUNDWIRE=m
CONFIG_REGMAP_SCCB=m
CONFIG_REGMAP_I3C=m
CONFIG_REGMAP_SPI_AVMM=m
@ -4600,7 +4601,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@ -4660,7 +4660,6 @@ CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
@ -4961,7 +4960,6 @@ CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@ -5085,7 +5083,6 @@ CONFIG_WM8350_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_RAVE_SP_WATCHDOG=m
CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
@ -5243,8 +5240,6 @@ CONFIG_MFD_RT5033=m
CONFIG_MFD_RC5T583=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_SI476X_CORE=m
CONFIG_MFD_SIMPLE_MFD_I2C=m
CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@ -6902,7 +6897,9 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_HDA=m
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_XTENSA=m
#
@ -6989,6 +6986,7 @@ CONFIG_SND_SOC_MAX9867=m
CONFIG_SND_SOC_MAX98927=m
CONFIG_SND_SOC_MAX98373=m
CONFIG_SND_SOC_MAX98373_I2C=m
CONFIG_SND_SOC_MAX98373_SDW=m
CONFIG_SND_SOC_MAX98390=m
CONFIG_SND_SOC_MAX9860=m
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
@ -7018,6 +7016,7 @@ CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m
CONFIG_SND_SOC_RT1011=m
CONFIG_SND_SOC_RT1015=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5514_SPI=m
CONFIG_SND_SOC_RT5616=m
@ -7032,6 +7031,13 @@ CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m
CONFIG_SND_SOC_RT5682=m
CONFIG_SND_SOC_RT5682_I2C=m
CONFIG_SND_SOC_RT5682_SDW=m
CONFIG_SND_SOC_RT700=m
CONFIG_SND_SOC_RT700_SDW=m
CONFIG_SND_SOC_RT711=m
CONFIG_SND_SOC_RT711_SDW=m
CONFIG_SND_SOC_RT715=m
CONFIG_SND_SOC_RT715_SDW=m
CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SI476X=m
CONFIG_SND_SOC_SIGMADSP=m
@ -7095,6 +7101,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_WSA881X=m
CONFIG_SND_SOC_ZL38060=m
CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SOC_MAX9759=m
@ -7499,7 +7506,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@ -7554,7 +7560,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
@ -8657,7 +8662,15 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
CONFIG_RPMSG_VIRTIO=m
# end of Rpmsg drivers
# CONFIG_SOUNDWIRE is not set
CONFIG_SOUNDWIRE=m
#
# SoundWire Devices
#
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE_QCOM=m
CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
#
# SOC (System On Chip) specific Drivers
@ -9321,7 +9334,6 @@ CONFIG_PWM_LPSS=m
CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM_PCA9685=m
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m
@ -10317,7 +10329,6 @@ CONFIG_DMA_OPS=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
CONFIG_DMA_CMA=y
CONFIG_DMA_PERNUMA_CMA=y

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

View file

@ -5657,7 +5657,7 @@ phylogenies.")
"/include/htslib/sam.h")
(string-append "SAMLIBS="
(assoc-ref %build-inputs "htslib")
"/lib/libhts.a"))
"/lib/libhts.so"))
#:phases
(modify-phases %standard-phases
;; No "configure" script.

View file

@ -478,7 +478,7 @@ tree binary files. These are board description files used by Linux and BSD.")
(define u-boot
(package
(name "u-boot")
(version "2020.10")
(version "2021.01")
(source (origin
(method url-fetch)
(uri (string-append
@ -486,7 +486,7 @@ tree binary files. These are board description files used by Linux and BSD.")
"u-boot-" version ".tar.bz2"))
(sha256
(base32
"08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"))))
"0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"))))
(native-inputs
`(("bc" ,bc)
("bison" ,bison)
@ -813,30 +813,19 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
;; Need to copy the firmware into u-boot build
;; directory.
(copy-file (string-append (assoc-ref inputs "firmware")
"/bl31.bin") "bl31-rk3399.bin")
(copy-file (string-append (assoc-ref inputs "firmware-m0")
"/rk3399m0.bin") "rk3399m0.bin")
#t))
(add-after 'build 'build-itb
(lambda* (#:key make-flags #:allow-other-keys)
;; The u-boot.itb is not built by default.
(apply invoke "make" `(,@make-flags ,"u-boot.itb"))))
(add-after 'build-itb 'build-rksd
(lambda* (#:key inputs #:allow-other-keys)
;; Build Rockchip SD card images.
(invoke "./tools/mkimage" "-T" "rksd" "-n" "rk3399" "-d"
"spl/u-boot-spl.bin" "u-boot-spl.rksd")))))))
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (string-append (assoc-ref inputs "firmware")
"/bl31.elf"))
#t))
;; Phases do not succeed on the bl31 ELF.
(delete 'strip)
(delete 'validate-runpath)))))
(native-inputs
`(("firmware" ,arm-trusted-firmware-puma-rk3399)
("firmware-m0" ,rk3399-cortex-m0)
`(("firmware" ,arm-trusted-firmware-rk3399)
,@(package-native-inputs base))))))
(define-public u-boot-qemu-riscv64
@ -927,6 +916,13 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-pinebook-pro-config
;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
(lambda _
(substitute* "configs/pinebook-pro-rk3399_defconfig"
(("CONFIG_USE_PREBOOT=y") "CONFIG_USE_PREBOOT=n"))
#t))
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (string-append (assoc-ref inputs "firmware")

View file

@ -49,7 +49,7 @@ supported content to the Kodi media center.")
(make-chromium-extension play-to-kodi))
(define uassets
(let ((commit "a5b1e3cae3e63435caa03940eff549133e524970"))
(let ((commit "61b43044fbe7be0cf4e9c636fe96236dc52e44cf"))
(origin
(method git-fetch)
(uri (git-reference
@ -58,12 +58,12 @@ supported content to the Kodi media center.")
(file-name (git-file-name "uAssets" (string-take commit 9)))
(sha256
(base32
"1qjq9x6qb07x4iyha3zzwjcgr0p54c2pdadvcp2kj7h34vjlpksj")))))
"03ikia0prmzsc34qa3418dc49ss8ari9hj6g3s6nvxrgyd127idi")))))
(define ublock-origin
(package
(name "ublock-origin")
(version "1.33.0")
(version "1.33.2")
(home-page "https://github.com/gorhill/uBlock")
(source (origin
(method git-fetch)
@ -71,7 +71,7 @@ supported content to the Kodi media center.")
(file-name (git-file-name name version))
(sha256
(base32
"1indr8p4imljgc1d5vyn48cbpzy9ygqmkk4q07czlrhcrz7hb4nx"))))
"1pdf3fzc7ld65gr87s1cdy2sb84jbqnyq9lvwg1mgzi9dg8x7639"))))
(build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium"))
(arguments

View file

@ -156,6 +156,10 @@ extraction from CDs.")
libcdio.")
(license gpl3+)))
;; Xorriso is used by Guix for creating ISO images. If you change this package,
;; please make sure the Guix functionality still works by running some related
;; system tests.
;; For example, try running `make check-system TESTS=iso-image-installer`.
(define-public xorriso
(package
(name "xorriso")

View file

@ -310,8 +310,8 @@
(string-append "ungoogled-chromium-" category "-" name))))
(sha256 (base32 hash))))
(define %chromium-version "88.0.4324.104")
(define %ungoogled-revision "4e2679ce15a53925b34a95aa3e1731751530dc22")
(define %chromium-version "88.0.4324.150")
(define %ungoogled-revision "f7c33ded1674556b6e9e72d597c706666f490da8")
(define %debian-revision "debian/84.0.4147.105-1")
(define %debian-patches
@ -329,7 +329,7 @@
(string-take %ungoogled-revision 7)))
(sha256
(base32
"09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5"))))
"0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y"))))
(define %guix-patches
(list (local-file
@ -467,7 +467,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx"))
"1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)
@ -825,7 +825,6 @@
("cups" ,cups)
("curl" ,curl)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("expat" ,expat)
("flac" ,flac)
("ffmpeg" ,ffmpeg)

View file

@ -48,8 +48,8 @@
#:use-module (guix build-system gnu))
(define-public cuirass
(let ((commit "6bd940fc24646533ed2c113d9b551d23fe4f030d")
(revision "65"))
(let ((commit "23688a0e451e0265ad29e150d6eba497d4291fb6")
(revision "67"))
(package
(name "cuirass")
(version (git-version "0.0.1" revision commit))
@ -61,7 +61,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0nv8y6dm17m4z28aqr47ch4l4qaqr1zixdv7jajxdky9dqy085vm"))))
"1r90wnj9w3vh3rr48mddp0xi874ffawc9nsb8cdnpw034px62k1k"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)

View file

@ -30,6 +30,7 @@
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -808,8 +809,10 @@ decompression of some loosely related file formats used by Microsoft.")
("python" ,python)
("valgrind" ,valgrind)))
(arguments
`(#:test-target "test"
#:parallel-tests? #f ;occasional failures when running in parallel
`(;; Not designed for parallel testing.
;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821
#:parallel-tests? #f
#:test-target "test"
#:make-flags (list (string-append "CC=" ,(cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
@ -2359,14 +2362,14 @@ to their original, binary CD format.")
(define-public tarlz
(package
(name "tarlz")
(version "0.17")
(version "0.19")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/tarlz/"
"tarlz-" version ".tar.lz"))
(sha256
(base32 "0gpdm6z9pdr5bn31kxg73wm686hhpb5pdf5782pbl5a4xqqhqj90"))))
(base32 "09xal55973ivzpaja93jcc1pfla8gb3vrk8dx7pj9qvvz5aynf9n"))))
(build-system gnu-build-system)
(native-inputs
`(("lzip" ,lzip)))

View file

@ -44,14 +44,14 @@
(define-public connman
(package
(name "connman")
(version "1.38")
(version "1.39")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/network/connman/"
"connman-" version ".tar.xz"))
(sha256
(base32 "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"))))
(base32 "1wqs307vjphhh73qbqk25zxhhqwn1mdk6bpzl5qcd4blkcbafqlz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

File diff suppressed because it is too large Load diff

View file

@ -206,7 +206,7 @@ text or blue underlined text, on ANSI terminals.")
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.54)
("rust-metadeps" ,rust-metadeps-1.1))))
("rust-metadeps" ,rust-metadeps-1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@ -236,7 +236,7 @@ text or blue underlined text, on ANSI terminals.")
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.53)
("rust-metadeps" ,rust-metadeps-1.1))))
("rust-metadeps" ,rust-metadeps-1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@ -531,7 +531,7 @@ and iOS.")
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.54)
("rust-metadeps" ,rust-metadeps-1.1))))
("rust-metadeps" ,rust-metadeps-1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@ -689,7 +689,7 @@ and iOS.")
(arguments
`(#:tests? #f ; tests not included in release
#:cargo-inputs
(("rust-color-quant" ,rust-color-quant-1.0)
(("rust-color-quant" ,rust-color-quant-1)
("rust-libc" ,rust-libc-0.2)
("rust-lzw" ,rust-lzw-0.10))
#:cargo-development-inputs
@ -1335,7 +1335,7 @@ graphics and video games.")
"The Piston game engine core libraries.")
(license license:expat)))
(define-public rust-piston-float-1.0
(define-public rust-piston-float-1
(package
(name "rust-piston-float")
(version "1.0.0")
@ -1452,7 +1452,7 @@ nicely with Piston libraries.")
"This package provides a generic library for textures")
(license license:expat)))
(define-public rust-piston-viewport-1.0
(define-public rust-piston-viewport-1
(package
(name "rust-piston-viewport")
(version "1.0.0")
@ -1469,7 +1469,7 @@ nicely with Piston libraries.")
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-piston-float" ,rust-piston-float-1.0))))
(("rust-piston-float" ,rust-piston-float-1))))
(home-page "https://github.com/PistonDevelopers/viewport")
(synopsis "Library for storing viewport information")
(description
@ -1555,9 +1555,9 @@ nicely with Piston libraries.")
(("rust-interpolation" ,rust-interpolation-0.2)
("rust-rusttype" ,rust-rusttype-0.7)
("rust-piston-texture" ,rust-piston-texture-0.8)
("rust-piston-viewport" ,rust-piston-viewport-1.0)
("rust-read-color" ,rust-read-color-1.0)
("rust-vecmath" ,rust-vecmath-1.0)
("rust-piston-viewport" ,rust-piston-viewport-1)
("rust-read-color" ,rust-read-color-1)
("rust-vecmath" ,rust-vecmath-1)
("rust-fnv" ,rust-fnv-1))))
(home-page "https://github.com/pistondevelopers/graphics")
(synopsis "Library for 2D graphics that works with multiple back-ends")
@ -1635,7 +1635,7 @@ interactive applications.")
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-piston-viewport" ,rust-piston-viewport-1.0)
(("rust-piston-viewport" ,rust-piston-viewport-1)
("rust-serde" ,rust-serde-1)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-bitflags" ,rust-bitflags-1))))
@ -2778,7 +2778,7 @@ the platform-specific getters provided by winit, or another library.")
`(#:cargo-inputs
(("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-maybe-uninit" ,rust-maybe-uninit-2.0)
("rust-maybe-uninit" ,rust-maybe-uninit-2)
("rust-pkg-config" ,rust-pkg-config-0.3))))
(home-page "https://github.com/erlepereira/x11-rs.git")
(synopsis "X11 library bindings for Rust")

File diff suppressed because it is too large Load diff

View file

@ -37,7 +37,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
@ -4012,6 +4012,7 @@ simultaneous database connections by using this framework.")
"--with-sqlite3"
(string-append "--with-sqlite-incdir=" sqlite "/include")
(string-append "--with-sqlite-libdir=" sqlite "/lib")))
#:tests? #f ; FIXME: Find why the tests get stuck forever.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests

View file

@ -284,7 +284,7 @@ other apt sources typically provided by open source developers.")
(define-public dpkg
(package
(name "dpkg")
(version "1.20.5")
(version "1.20.7.1")
(source
(origin
(method git-fetch)
@ -294,7 +294,7 @@ other apt sources typically provided by open source developers.")
(file-name (git-file-name name version))
(sha256
(base32
"190q968g1vdz07byvfvc2gladhpq3yl765mfiacglyix3nkisy0j"))))
"0d1cppigwhpv0z1ac94gjalkzs3n0gjyi383pkhz1h9d4fvmadk9"))))
(build-system gnu-build-system)
(arguments
`(#:phases

View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -216,14 +216,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
(define-public grammalecte
(package
(name "grammalecte")
(version "2.0.0")
(version "2.1.0")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://grammalecte.net/grammalecte/zip/"
"Grammalecte-fr-v" version ".zip"))
(sha256
(base32 "1mcpqglndcafiz9bnz69vjxncl5k98yzcy8pr8rmn738hgpzb53v"))))
(base32 "1j07zpqfvkxf52yhh0yf0xj1rh5whggc6s8fqrh6pbvz05lfdcr8"))))
(build-system python-build-system)
(home-page "https://grammalecte.net")
(synopsis "French spelling and grammar checker")

View file

@ -72,7 +72,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "164")
(version "165")
(source (origin
(method git-fetch)
(uri (git-reference
@ -81,7 +81,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0vjxhz8p0k4y19sl1msrl8x4z3v205rlwj52k5hijv2gn9sqh795"))))
"0chi8drkxdwk7mlfgljij0nihnxp9pi5ybhqaq8rc4l1zl6srirb"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -225,7 +225,7 @@ install.")
(define-public reprotest
(package
(name "reprotest")
(version "0.7.15")
(version "0.7.16")
(source
(origin
(method git-fetch)
@ -235,7 +235,7 @@ install.")
(file-name (git-file-name name version))
(sha256
(base32
"12lc1pb9d5h3blrzzx9nbqqj5bi9x23yj31fxafmk37803rl8a0m"))))
"0s7gyixk868dw6yqxsb1sq24mgg9ilz5s2yidd5j0zhl683n7dw9"))))
(inputs
`(("python-debian" ,python-debian)
("python-distro" ,python-distro)

View file

@ -224,14 +224,14 @@ tmpfs/ramfs filesystems.")
(define-public parted
(package
(name "parted")
(version "3.3")
(version "3.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/parted/parted-"
version ".tar.xz"))
(sha256
(base32
"0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"))))
"0hjkv84x1bs2qqyx1fnzjqyyqrhv7kpdbq9bgydmi99d8wi80ag1"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -253,7 +253,7 @@ tmpfs/ramfs filesystems.")
;; For the tests.
("e2fsprogs" ,e2fsprogs)
("perl" ,perl)
("python" ,python-2)
("python-wrapper" ,python-wrapper)
("util-linux" ,util-linux)))
(home-page "https://www.gnu.org/software/parted/")
(synopsis "Disk partition editor")

View file

@ -6,6 +6,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,7 +52,7 @@
;; Note - when changing Docker versions it is important to update the versions
;; of several associated packages (docker-libnetwork and go-sctp).
(define %docker-version "19.03.12")
(define %docker-version "19.03.13")
(define-public python-docker
(package
@ -319,7 +320,7 @@ built-in registry server of Docker.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dj6llfcgcbpq9q9j6b4wb0anbn1g5wzm8ikq2lyhg54i3154m93"))
(base32 "1mg3jjisdbqrqrrhyslj3715lslial2kcgjrpprb6q63i52963gj"))
(patches
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
@ -610,7 +611,7 @@ provisioning etc.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1bynmnaykhh1m42v6bxparlpm9kajpqsvlrlwgz1b9ivcklf5ik6"))))
(base32 "0wm5x8b8jll78h2zzncfdpxj0y3gv571z0nd39f036wsy7r23dsi"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

View file

@ -9,7 +9,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -313,32 +313,50 @@ local system.")
(license lgpl2.1+)))
(define-public zeal
(package
(name "zeal")
(version "0.6.1")
(home-page "https://github.com/zealdocs/zeal")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"))))
(build-system qt-build-system)
(arguments `(#:tests? #f)) ; no tests
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms)))
(synopsis "Offline documentation browser inspired by Dash")
(description "Zeal is a simple offline documentation browser
(let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
(revision "1"))
(package
(name "zeal")
(version (git-version "0.6.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zealdocs/zeal")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1ky2qi2cmjckc51lm3i28815ixgqdm36j7smixxr16jxpmbqs6sl"))))
(build-system qt-build-system)
(arguments
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(add-after 'wrap 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/zeal"))
(qt-process-path (string-append
(assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
#t))))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
("qtquickcontrols" ,qtquickcontrols)
("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms)))
(home-page "https://zealdocs.org/")
(synopsis "Offline documentation browser inspired by Dash")
(description "Zeal is a simple offline documentation browser
inspired by Dash.")
(license gpl3+)))
(license gpl3+))))

File diff suppressed because it is too large Load diff

View file

@ -7,6 +7,7 @@
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@ -54,6 +55,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
@ -1520,3 +1522,28 @@ families, plus many of their variants.")
license:lgpl3+
license:public-domain
license:zlib))))
(define-public python-psptool
(package
(name "python-psptool")
(version "2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "psptool" version))
(sha256
(base32
"1kx0xpfx67m4zclk4gs97wiwjms8i7z4f6b6m68y8sfgpshy4rf3"))
(modules '((guix build utils)))
(snippet
'(begin
;; IPython is not used by the package at all
(substitute* '("psptool/directory.py" "psptool/entry.py")
(("from IPython.*") ""))))))
(build-system python-build-system)
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
("python-prettytable" ,python-prettytable)))
(home-page "https://github.com/PSPReverse/psptool")
(synopsis "Tool for dealing with AMD binary blobs")
(description "PSPTool is a tool for dealing with AMD binary blobs")
(license license:gpl3+)))

View file

@ -132,9 +132,11 @@
(license license:gpl2)))
;; Building from recent Git because the official 5.0 release no longer builds.
;; Following commits and revision numbers of beta versions listed at
;; https://dolphin-emu.org/download/.
(define-public dolphin-emu
(let ((commit "a9745400ec5cea7e55d94955afbdc44d1a4982d1")
(revision "7"))
(let ((commit "a34823df61df65168aa40ef5e82e44defd4a0138")
(revision "13178"))
(package
(name "dolphin-emu")
(version (git-version "5.0" revision commit))
@ -160,7 +162,7 @@
#t))
(sha256
(base32
"0ic08ii4vlqlmk2wkfc99jiy6nji2wfq56r7slj23wgvhznnaabk"))))
"0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f
@ -183,11 +185,9 @@
(copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin")
(chdir "..")
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
(("\"vulkan\", 1") (string-append "\"vulkan\"")))
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
(("\"vulkan\"") (string-append "\"" libvulkan "\"")))
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
(("Common::DynamicLibrary::GetVersionedFilename") ""))
(("\"vulkan\", 1") (string-append "\"vulkan\""))
(("\"vulkan\"") (string-append "\"" libvulkan "\""))
(("Common::DynamicLibrary::GetVersionedFilename") ""))
#t))))
;; The FindGTK2 cmake script only checks hardcoded directories for

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
@ -331,8 +331,8 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
(let ((commit "db931a4571817d7d61be6bce306f1d42f7cd3398")
(revision "2"))
(let ((commit "612f6b9ab73c7f46e0254355b707d494a8ad9270")
(revision "3"))
(package
(name "bcachefs-tools")
(version (git-version "0.1" revision commit))
@ -344,7 +344,7 @@ from a mounted file system.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1zl8lda6ni6rhsmsng6smrcjihy2irjf03h1m7nvkqmkhq44j80s"))))
(base32 "1a62wkv1i6pg5k1cjw7fzn933cbz8cp8y40cdpfd8rxjx0wg2szb"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -627,7 +627,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(define-public disorderfs
(package
(name "disorderfs")
(version "0.5.10")
(version "0.5.11")
(source
(origin
(method git-fetch)
@ -637,7 +637,7 @@ from the jfsutils package. It is meant to be used in initrds.")
(file-name (git-file-name name version))
(sha256
(base32
"0lsisx5118k0qk0b5klbxl03rvhycnznyfx05yxmjawh85bfhmlh"))))
"1pnrj0h8sgqwgsc18vz3fkqsp6vhigdbi75vdj0si1r6wgslnr7z"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -847,7 +847,7 @@ APFS.")
(define-public zfs
(package
(name "zfs")
(version "2.0.1")
(version "2.0.2")
(outputs '("out" "module" "src"))
(source
(origin
@ -856,7 +856,7 @@ APFS.")
"/download/zfs-" version
"/zfs-" version ".tar.gz"))
(sha256
(base32 "0y3992l4nzr67q18lz1kizw0za1shvqbpmsjz9shv4frh5ihllbi"))))
(base32 "090b2pp0cgzkjcnbjf8ms28dah5dff8s04q31z62czapwiy0drdx"))))
(build-system linux-module-build-system)
(arguments
`(;; The ZFS kernel module should not be downloaded since the license
@ -1074,14 +1074,14 @@ compatible directories.")
(define-public python-dropbox
(package
(name "python-dropbox")
(version "11.0.0")
(version "11.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dropbox" version))
(sha256
(base32
"0r64jxm5m4a1sln2la3av0103filb0plqja1nnyibqvk9qrqs5jf"))))
"0ml6z37k6nkhkiy483kvifs8im8z7vabd2g9jl6fkf1fzy3n6bym"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; Tests require a network connection.
(native-inputs
@ -1103,14 +1103,14 @@ Dropbox API v2.")
(define-public dbxfs
(package
(name "dbxfs")
(version "1.0.50")
(version "1.0.51")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dbxfs" version))
(sha256
(base32
"01zvk862ybz12270q0r2l1i7kdj30ib2gxrlxmwvi19b2fkf39na"))
"1zz82d0mnql55397x4jx7z5rn857rf9zhjv895j93wpxdq10xwvk"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(build-system python-build-system)
(arguments

View file

@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
@ -1109,13 +1109,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ")
(define-public python-duniterpy
(package
(name "python-duniterpy")
(version "0.60.1")
(version "0.61.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "duniterpy" version))
(sha256
(base32 "1cwda5mk05zmpar7fpk9m4bziyz2s5pd0922h22fns5hw7vfsybh"))))
(base32 "1dr5zx7hi1ps36p1zw2n66lmikp2frwi3sp4rf2zyd216dl3r1jp"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required

View file

@ -464,7 +464,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
(package
(name (string-append "arm-trusted-firmware-" platform))
(version "2.3")
(version "2.4")
(source
(origin
(method git-fetch)
@ -475,7 +475,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(file-name (git-file-name "arm-trusted-firmware" version))
(sha256
(base32
"113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"))))
"12k0n79j156bdzqws18kpbli04kn00nh6dy42pjv6gakqrkx9px3"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -512,17 +512,18 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(native-inputs
`(,@(if (and (not (string-prefix? "aarch64" (%current-system)))
(string-prefix? "aarch64" arch))
;; gcc-7 since it is used for u-boot, which needs gcc-7.
`(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu" #:xgcc gcc-7))
;; Needs newer gcc version for some targets
`(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu" #:xgcc gcc-9))
("cross-binutils" ,(cross-binutils "aarch64-linux-gnu")))
'())
,@(if (and (not (string-prefix? "armhf" (%current-system)))
(string-prefix? "armhf" arch))
;; gcc-7 since it is used for u-boot, which needs gcc-7.
`(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" #:xgcc gcc-7))
;; Needs newer gcc version for some targets
`(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" #:xgcc gcc-9))
("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf")))
'())
))
;; Needs newer gcc version for some targets
("gcc" ,gcc-9)))
(home-page "https://www.trustedfirmware.org/")
(synopsis "Implementation of \"secure world software\"")
(description
@ -549,26 +550,6 @@ such as:
(define-public arm-trusted-firmware-rk3328
(make-arm-trusted-firmware "rk3328"))
(define-public arm-trusted-firmware-puma-rk3399
(let ((base (make-arm-trusted-firmware "rk3399"))
;; Vendor's arm trusted firmware branch hasn't been upstreamed yet.
(commit "d71e6d83612df896774ec4c03d49500312d2c324")
(revision "1"))
(package
(inherit base)
(name "arm-trusted-firmware-puma-rk3399")
(version (git-version "1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.theobroma-systems.com/arm-trusted-firmware.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0vqhwqqh8h9qlkpybg2v94911091c1418bc4pnzq5fd7zf0fjkf8")))))))
(define-public arm-trusted-firmware-rk3399
(let ((base (make-arm-trusted-firmware "rk3399")))
(package
@ -578,46 +559,3 @@ such as:
`(("cross32-gcc" ,(cross-gcc "arm-none-eabi"))
("cross32-binutils", (cross-binutils "arm-none-eabi"))
,@(package-native-inputs base))))))
(define-public rk3399-cortex-m0
(package
(name "rk3399-cortex-m0")
(version "1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.theobroma-systems.com/rk3399-cortex-m0.git")
(commit (string-append "v" version))))
(file-name (git-file-name "rk3399-cortex-m0" version))
(sha256
(base32
"02wz1vkf4j3zc8rx289z76xhrf71jhb2p05lvmygky393a9gjh9w"))))
(home-page "https://git.theobroma-systems.com/rk3399-cortex-m0.git/about/")
(synopsis "PMU Cortex M0 firmware for RK3399 Q7 (Puma)")
(description
"Cortex-M0 firmware used with the RK3399 to implement
power-management functionality and helpers (e.g. DRAM frequency
switching support).\n")
(license license:bsd-3)
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(mzerofiles (find-files "." "rk3399m0.(elf|bin)$")))
(for-each
(lambda (file)
(install-file file out))
mzerofiles))
#t))
(add-before 'build 'setenv
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CROSS_COMPILE" "arm-none-eabi-")
#t)))))
(native-inputs `(("cross-gcc" ,(cross-gcc "arm-none-eabi" #:xgcc gcc-7))
("cross-binutils" ,(cross-binutils "arm-none-eabi"))))))

View file

@ -33,7 +33,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2020 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
@ -2100,3 +2100,36 @@ operators and special symbols.")
is a stylish type with a polished yet relaxed feel. Its versatility makes it
suitable for a wide range of uses.")
(license license:silofl1.1))))
(define-public font-cozette
(package
(name "font-cozette")
(version "1.9.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/slavfox/Cozette")
(commit (string-append "v." version))))
(file-name (git-file-name name version))
(sha256
(base32
"0mb5ns6705piwgjw1g10czsakhyc1jnvxh342ixw8m5f1gf4595n"))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'build
(lambda _
(invoke "python3" "build.py" "fonts"))))))
(native-inputs
`(("fontforge" ,fontforge)
("python" ,python)
("python-crayons" ,python-crayons)
("python-fonttools" ,python-fonttools)
("python-numpy" ,python-numpy)
("python-pillow" ,python-pillow)))
(home-page "https://github.com/slavfox/Cozette")
(synopsis "Bitmap programming font")
(description "Cozette is a 6x13px (bounding box) bitmap font based on Dina
and heavily inspired by Creep.")
(license license:expat)))

View file

@ -15,7 +15,7 @@
;;; Copyright © 2017, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
@ -63,6 +63,7 @@
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@ -748,7 +749,7 @@ programming language.")
(url "https://github.com/keharriso/love-nuklear/")
(commit commit)
(recursive? #t)))
;; NOTE: the HEAD of the Nuklear git-submodule is at commit
;; NOTE: the HEAD of the Nuklear git-submodule is at commit
;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019
(file-name (git-file-name name version))
(sha256
@ -1088,7 +1089,7 @@ to create fully featured games and multimedia programs in the python language.")
(define-public python2-pygame-sdl2
(let ((real-version "2.1.0")
(renpy-version "7.3.5"))
(renpy-version "7.4.2"))
(package
(inherit python2-pygame)
(name "python2-pygame-sdl2")
@ -1098,13 +1099,13 @@ to create fully featured games and multimedia programs in the python language.")
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" renpy-version
"/pygame_sdl2-" version ".tar.gz"))
(sha256 (base32 "1bmr7j9mlsc4czpgw70ld15ymyp4wxrk9hdsqad40wjwdxvvg2dr"))
(sha256 (base32 "1lpk69nh379x5pdlr838x5b49spzksn9hyqiq2g0q28k0xk4lm67"))
(modules '((guix build utils)))
(snippet
'(begin
;; drop generated sources
(delete-file-recursively "gen")
(delete-file-recursively "gen3")
(delete-file-recursively "gen-static")
#t))))
(build-system python-build-system)
(arguments
@ -1141,13 +1142,13 @@ developed mainly for Ren'py.")
(define-public python2-renpy
(package
(name "python2-renpy")
(version "7.3.5")
(version "7.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.renpy.org/dl/" version
"/renpy-" version "-source.tar.bz2"))
(sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4"))
(sha256 (base32 "1mlrq9q3r36izyskq674qhp8s32iirvvfb4r8z6hi26189aaydsw"))
(modules '((guix build utils)))
(patches
(search-patches
@ -1204,8 +1205,8 @@ developed mainly for Ren'py.")
;; (both source and compiled) in the same directory.
(let* ((out (assoc-ref outputs "out"))
(site (string-append "/lib/python"
,(version-major+minor
(package-version python-2))
(python-version
(assoc-ref inputs "python"))
"/site-packages")))
(with-directory-excursion "module"
(apply (assoc-ref %standard-phases 'install) args))
@ -1218,11 +1219,14 @@ developed mainly for Ren'py.")
("fribidi" ,fribidi)
("glew" ,glew)
("libpng" ,libpng)
("python2-pygame" ,python2-pygame-sdl2)
("sdl-union"
,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
(propagated-inputs
`(("python2-future" ,python2-future)
("python2-pygame" ,python2-pygame-sdl2)))
(native-inputs
`(("python2-cython" ,python2-cython)
`(("gcc" ,gcc-8) ; for const variables as initializer elements
("python2-cython" ,python2-cython)
("xdg-utils" ,xdg-utils)))
(home-page "https://www.renpy.org/")
(synopsis "Ren'py python module")
@ -1234,7 +1238,6 @@ modules of Ren'py.")
(package
(inherit python2-renpy)
(name "renpy")
(version "7.3.5")
(build-system python-build-system)
(arguments
`(#:tests? #f ; see python2-renpy

View file

@ -53,9 +53,10 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Lu hux <luhux@outlook.com>
;;; Copyright © 2020 Tomás Ortín Fernández <tomasortin@mailbox.org>
;;; Copyright © 2021 Olivier Rojon <o.rojon@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -857,6 +858,52 @@ things far stranger and deadlier, and against the others like yourself, that
want what you have.")
(license license:cc-by-sa3.0)))
(define-public cockatrice
(let ((release-date "2021-01-26"))
(package
(name "cockatrice")
(version "2.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Cockatrice/Cockatrice")
(commit (string-append release-date "-Release-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9"))
(modules '((guix build utils)))
(snippet
;; Strip image URLs as they point towards non-free web services
'(substitute* "cockatrice/src/settings/downloadsettings.cpp"
(("downloadURLs.append\\(\".*\"\\);") "")))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DWITH_SERVER=1"
"-DWITH_CLIENT=1"
"-DWITH_ORACLE=1"
"-DTEST=1")))
(native-inputs
`(("googletest" ,googletest)
("pkg-config" ,pkg-config)))
(inputs
`(("protobuf" ,protobuf)
("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
("qttools" ,qttools)
("qtwebsockets" ,qtwebsockets)
("xz" ,xz)
("zlib" ,zlib)))
(home-page "https://cockatrice.github.io")
(synopsis "Tabletop card game simulator")
(description "Cockatrice is a program for playing tabletop card games
over a network. Its server design prevents users from manipulating the game
for unfair advantage. The client also provides a single-player mode, which
allows users to brew while offline.")
(license license:gpl2))))
(define-public corsix-th
(package
(name "corsix-th")
@ -6320,14 +6367,14 @@ fish. The whole game is accompanied by quiet, comforting music.")
(define-public crawl
(package
(name "crawl")
(version "0.26.0")
(version "0.26.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/crawl/crawl/releases/download/"
version "/stone_soup-" version "-nodeps.tar.xz"))
(sha256
(base32 "1m81x1sp6p2ka5w2nib3pcw5w5iv58z41c8aqn0dayi1lb3yslfb"))
(base32 "1d8p2np2q5951wqphq2f4dyvv976m2lh82b0qp7w9pp1h8zzi1ff"))
(patches (search-patches "crawl-upgrade-saves.patch"))))
(build-system gnu-build-system)
(inputs
@ -7071,7 +7118,7 @@ elements to achieve a simple goal in the most complex way possible.")
(define-public pioneer
(package
(name "pioneer")
(version "20200203")
(version "20210203")
(source (origin
(method git-fetch)
(uri (git-reference
@ -7080,7 +7127,7 @@ elements to achieve a simple goal in the most complex way possible.")
(file-name (git-file-name name version))
(sha256
(base32
"1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"))))
"1zyi1xyghj99hz8fa6dywpscj6flp04fspnlgxbivf3rgmnxflg7"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -9154,6 +9201,12 @@ play with up to four players simultaneously. It has network support.")
"-Dhaskell_flags=-dynamic;-fPIC")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-sources
(lambda _
;; Fix a missing 'include'.
(substitute* "QTfrontend/ui/page/pagegamestats.cpp"
(("#include <QSizePolicy>")
"#include <QSizePolicy>\n#include <QPainterPath>"))))
(replace 'check
(lambda _ (invoke "ctest")))
(add-after 'install 'install-icon

View file

@ -7,7 +7,7 @@
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019, 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -848,14 +848,14 @@ utilities for data translation and processing.")
(define-public postgis
(package
(name "postgis")
(version "3.0.3")
(version "3.1.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.osgeo.org/postgis/source/postgis-"
version ".tar.gz"))
(sha256
(base32
"05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7"))))
"0z9a39243fv37mansbbjq5mmxpnhr7xzn8pv92fr7dkdb3psz5hf"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@ -880,6 +880,7 @@ utilities for data translation and processing.")
("libxml2" ,libxml2)
("pcre" ,pcre)
("postgresql" ,postgresql)
("protobuf-c" ,protobuf-c)
("proj" ,proj)))
(native-inputs
`(("perl" ,perl)
@ -1602,7 +1603,7 @@ using the dataset of topographical information collected by
(define-public qmapshack
(package
(name "qmapshack")
(version "1.14.0")
(version "1.15.2")
(source
(origin
(method git-fetch)
@ -1611,8 +1612,7 @@ using the dataset of topographical information collected by
(commit (string-append "V_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07c2hrq9sn456w7l3gdr599rmjfv2k6mh159zza7p1py8r7ywksa"))))
(base32 "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7"))))
(build-system qt-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -2015,14 +2015,14 @@ growing set of geoscientific methods.")
(define-public qgis
(package
(name "qgis")
(version "3.12.1")
(version "3.16.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://qgis.org/downloads/qgis-"
version ".tar.bz2"))
(sha256
(base32 "1a41525y8ac44gzcfaffjx0lyrm49hgnr83jrq40r5mqd3vpmp57"))))
(base32 "012dv8dcg7w4lf6k37i41wialwhi0kpkxw2dnq19yqqk35632mzx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
@ -2037,23 +2037,26 @@ growing set of geoscientific methods.")
;; Configure correct path to PyQt5 SIP directory
(add-after 'unpack 'configure-pyqt5-sip-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/FindPyQt5.cmake"
(("\"\\\\\\\\1\" PYQT5_SIP_DIR")
(string-append "\"" (assoc-ref inputs "python-pyqt+qscintilla")
"/share/sip\" PYQT5_SIP_DIR")))
(substitute* (list "scripts/prepare-commit.sh"
"scripts/runtests-local-travis-config.sh"
(substitute* "cmake/FindPyQt5.py"
(("sip_dir = cfg.default_sip_dir")
(string-append "sip_dir = \""
(assoc-ref inputs "python-pyqt+qscintilla")
"/share/sip\"")))
(substitute* (list "scripts/prepare_commit.sh"
"scripts/qstringfixup.sh"
"scripts/release.pl"
"scripts/runtests_local_travis_config.sh"
"scripts/sip_include.sh"
"scripts/sipdiff"
"scripts/sipify_all.sh"
"scripts/spell_check/check_spelling.sh"
"scripts/spell_check/spell_test.sh"
"scripts/verify-indentation.sh"
"scripts/verify_indentation.sh"
"tests/code_layout/test_banned_keywords.sh"
"tests/code_layout/test_licenses.sh"
"tests/code_layout/test_shellcheck.sh"
"tests/code_layout/test_sip_include.sh"
"tests/code_layout/test_sipfiles_uptodate.sh"
"tests/code_layout/test_sipfiles.sh"
"tests/code_layout/test_sipify.sh")
(("\\$\\(git rev-parse --show-toplevel\\)")
(getcwd)))
@ -2073,77 +2076,95 @@ growing set of geoscientific methods.")
'(;; Disable tests that require network access
"qgis_filedownloader"
;; TODO: Find why the following tests fail
"ProcessingQgisAlgorithmsTestPt1"
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4"
"ProcessingGdalAlgorithmsRasterTest"
"ProcessingGdalAlgorithmsVectorTest"
"ProcessingGrass7AlgorithmsImageryTest"
"ProcessingGrass7AlgorithmsRasterTest"
"ProcessingGrass7AlgorithmsVectorTest"
"ProcessingOtbAlgorithmsTest"
"qgis_authmanagertest"
"qgis_compositionconvertertest"
"qgis_coordinatereferencesystemtest"
"qgis_geometrytest"
"qgis_layouthtmltest"
"qgis_layoutmaptest"
"qgis_layoutmapgridtest"
"qgis_painteffecttest"
"qgis_pallabelingtest"
"qgis_svgmarkertest"
"qgis_taskmanagertest"
"qgis_ziplayertest"
"qgis_processingtest"
"qgis_wcsprovidertest"
"qgis_arcgisrestutilstest"
"qgis_grassprovidertest7"
"qgis_gpsinformationwidget"
"ProcessingQgisAlgorithmsTestPt1"
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4"
"PyCoreAdittions"
"PyQgsPythonProvider"
"PyQgsAnnotation"
"PyQgsAppStartup"
"PyQgsAuthenticationSystem"
"PyQgsProject"
"PyQgsAuxiliaryStorage"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
"PyQgsDataItem"
"PyQgsFieldValidator"
"PyQgsFileUtils"
"PyQgsGeometryTest"
"PyQgsImageCache"
"PyQgsImportIntoPostGIS"
"PyQgsLayerDependencies"
"PyQgsLayerMetadata"
"PyQgsLayout"
"PyQgsLayoutHtml"
"PyQgsLayoutMapGrid"
"PyQgsMetadataBase"
"PyQgsLayoutExporter"
"PyQgsLayoutHtml"
"PyQgsLayoutLegend"
"PyQgsLayoutMapGrid"
"PyQgsMapLayer"
"PyQgsOGRProviderGpkg"
"PyQgsPalLabelingLayout"
"PyQgsImportIntoPostGIS"
"PyQgsProviderConnectionPostgres"
"PyQgsProviderConnectionGpkg"
"PyQgsShapefileProvider"
"PyQgsSvgCache"
"PyQgsTextRenderer"
"PyQgsMetadataBase"
"PyQgsOGRProvider"
"PyQgsOGRProviderGpkg"
"PyQgsOapifProvider"
"PyQgsPalLabelingLayout"
"PyQgsProject"
"PyQgsProviderConnectionGpkg"
"PyQgsProviderConnectionPostgres"
"PyQgsProviderConnectionSpatialite"
"PyQgsPythonProvider"
"PyQgsRasterLayer"
"PyQgsRulebasedRenderer"
"PyQgsSelectiveMasking"
"PyQgsSettings"
"PyQgsShapefileProvider"
"PyQgsSpatialiteProvider"
"PyQgsSvgCache"
"PyQgsSymbolExpressionVariables"
"PyQgsTextRenderer"
"PyQgsVectorFileWriter"
"PyQgsVectorLayer"
"PyQgsVectorLayerUtils"
"PyQgsVirtualLayerProvider"
"PyQgsWFSProvider"
"PyQgsOapifProvider"
"PyQgsLayerDependencies"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
"PyQgsSettings"
"PyQgsAuxiliaryStorage"
"PyQgsSelectiveMasking"
"PyQgsAppStartup"
"qgis_arcgisrestutilstest"
"qgis_authmanagertest"
"qgis_compositionconvertertest"
"qgis_coordinatereferencesystemtest"
"qgis_expressiontest"
"qgis_fontmarkertest"
"qgis_geometrycheckstest"
"qgis_geometrytest"
"qgis_gpsinformationwidget"
"qgis_grassprovidertest7"
"qgis_imagecachetest"
"qgis_labelingenginetest"
"qgis_layouthtmltest"
"qgis_layoutmanualtabletest"
"qgis_layoutmapgridtest"
"qgis_layoutmaptest"
"qgis_layoutpicturetest"
"qgis_layouttabletest"
"qgis_mapdevicepixelratiotest"
"qgis_maprendererjobtest"
"qgis_ogrproviderguitest"
"qgis_painteffecttest"
"qgis_pallabelingtest"
"qgis_processingtest"
"qgis_rasterlayertest"
"qgis_shellcheck"
"qgis_sipify"
"qgis_sip_include"
"qgis_sip_uptodate")
"qgis_sip_uptodate"
"qgis_sipify"
"qgis_styletest"
"qgis_svgmarkertest"
"qgis_taskmanagertest"
"qgis_wcsprovidertest"
"qgis_ziplayertest")
"|"))))
(add-after 'install 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
@ -2153,8 +2174,11 @@ growing set of geoscientific methods.")
#t))
(add-after 'wrap-qt 'wrap-gis
(lambda* (#:key inputs outputs #:allow-other-keys)
;; TODO: Find if there is a way to get SAGA to work.
;; Currently QGIS says "version of SAGA not supported".
;; Disable it for now.
(let* ((out (assoc-ref outputs "out"))
(saga (string-append (assoc-ref inputs "saga") "/bin"))
;;(saga (string-append (assoc-ref inputs "saga") "/bin"))
(grass-version ,(package-version grass))
(grass-majorminor (string-join
(list-head
@ -2163,7 +2187,7 @@ growing set of geoscientific methods.")
(grass (string-append (assoc-ref inputs "grass")
"/grass" grass-majorminor)))
(wrap-program (string-append out "/bin/qgis")
`("PATH" ":" prefix (,saga))
;;`("PATH" ":" prefix (,saga))
`("QGIS_PREFIX_PATH" = (,out))
`("GISBASE" = (,grass))))
#t)))))
@ -2183,6 +2207,7 @@ growing set of geoscientific methods.")
("netcdf" ,netcdf)
("postgresql" ,postgresql)
("proj" ,proj)
("protobuf" ,protobuf)
("python" ,python)
("python-chardet" ,python-chardet)
("python-dateutil" ,python-dateutil)
@ -2210,7 +2235,7 @@ growing set of geoscientific methods.")
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
("qwt" ,qwt)
("saga" ,saga)
;;("saga" ,saga)
("sqlite" ,sqlite)))
(native-inputs
`(("bison" ,bison)

View file

@ -9,6 +9,7 @@
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Ellis Kenyo <me@elken.dev>
;;; Copyright © 2020 Stefan Reichör <stefan@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,6 +33,7 @@
#:use-module (guix build-system meson)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
@ -888,3 +890,42 @@ feature-set for programming Vala effectively.")
(description "Nordic is a Gtk3.20+ theme created using the Nord color
pallete.")
(license license:gpl3))))
(define-public tiramisu
(let ((commit "8eb946dae0e2f98d3850d89e1bb535640e8c3266")
(revision "0"))
(package
(name "tiramisu")
(version (git-version "1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Sweets/tiramisu")
(commit commit)))
(sha256
(base32
"0wz2r8369d40vnxswknx0zxzbs03gzv0nc8al4g0ffg972p15j25"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "tiramisu" (string-append out "/bin"))
#t))))
#:make-flags
(list (string-append "CC=" ,(cc-for-target)))))
(inputs
`(("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/Sweets/tiramisu")
(synopsis "Desktop notifications, the UNIX way")
(description "tiramisu is a notification daemon based on dunst that
outputs notifications to STDOUT in order to allow the user to process
notifications any way they prefer.")
(license license:expat))))

View file

@ -44,7 +44,7 @@
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2019, 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2019, 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019, 2020, 2021 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
@ -794,6 +794,65 @@ patterns.")
license:lgpl2.1+
license:gpl2+))))
(define-public gnome-recipes
(package
(name "gnome-recipes")
(version "2.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/GNOME/recipes")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1h049mzqnlcfqwrhmzbq3pzzdglvy2bn9fj1p8wql7a60pn8sr32"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
(lambda _
(substitute* "meson_post_install.py"
(("gtk-update-icon-cache") (which "true")))
#t))
(add-after 'unpack 'unpack-libgd
(lambda* (#:key inputs #:allow-other-keys)
(let ((libgd (assoc-ref inputs "libgd")))
(copy-recursively libgd "subprojects/libgd")
#t))))))
(inputs
`(("glib" ,glib)
("gnome-autoar" ,gnome-autoar)
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gspell" ,gspell)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libcanberra" ,libcanberra)
("libsoup" ,libsoup)
("rest" ,rest)))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("itstool" ,itstool)
("libgd"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/GNOME/libgd")
(commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
(file-name (git-file-name "libgd" version))
(sha256
(base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))))
("pkg-config" ,pkg-config)))
(home-page "https://wiki.gnome.org/Apps/Recipes")
(synopsis "Discover recipes for preparing food")
(description "GNOME Recipes helps you discover what to cook today,
tomorrow, the rest of the week and for special occasions.")
(license license:gpl3+)))
(define-public gnome-photos
(package
(name "gnome-photos")
@ -11753,7 +11812,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku
(package
(name "komikku")
(version "0.25.1")
(version "0.26.0")
(source
(origin
(method git-fetch)
@ -11763,7 +11822,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version))
(sha256
(base32
"03skci66y9qqiv4bqbbc0w6d6agilwmx95cw7sribj06zcykm7m3"))))
"1g5rhp3d97v0s8nk536vqpv6qd4gha4h27bfdkypcqa42h8wyxm2"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

View file

@ -257,7 +257,7 @@ compatible to GNU Pth.")
(define-public gnupg
(package
(name "gnupg")
(version "2.2.25")
(version "2.2.27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
@ -265,7 +265,7 @@ compatible to GNU Pth.")
(patches (search-patches "gnupg-default-pinentry.patch"))
(sha256
(base32
"02n3klqbyzxyil13sg4wa0pcwr7vs7zjaslis926yjxg8yr0fly5"))))
"1693s2rp9sjwvdslj94n03wnb6rxysjy0dli0q1698af044h1ril"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -1305,11 +1305,11 @@ standards of the IceCat project.")
(cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat!
(define %icedove-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-build-id "20210205000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove
(package
(name "icedove")
(version "78.7.0")
(version "78.7.1")
(source icecat-source)
(properties
`((cpe-name . "thunderbird_esr")))
@ -1589,7 +1589,7 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository.
,(let ((changeset "d4c4077a3ef9b3221984f2d0b42f1d96c35776e8"))
,(let ((changeset "1ef5b612ee43c806752ca215b142a9733210f3cc"))
(origin
(method hg-fetch)
(uri (hg-reference
@ -1598,7 +1598,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
"0yabs4zlwb5jvlyk45lbw1nzfmra1f8bbwvwcwxjs1a8wcmrmb39")))))
"0kpn6jvymryf2gpj0dl5lpgln8mc3kxi3makms0wb84aajn842jv")))))
("autoconf" ,autoconf-2.13)
("cargo" ,rust "cargo")
("clang" ,clang)

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
@ -921,14 +921,14 @@ application suites.")
(define-public guile-cairo
(package
(name "guile-cairo")
(version "1.11.1")
(version "1.11.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/guile-cairo/guile-cairo-"
version ".tar.gz"))
(sha256
(base32
"1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"))
"0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"))
(modules '((guix build utils)))
(snippet
(begin
@ -939,12 +939,6 @@ application suites.")
(string-append name "dir = " prefix
"/guile/site/@GUILE_EFFECTIVE_VERSION@"
suffix)))
;; Guile 2.x <libguile.h> used to pull in <string.h> and
;; other headers but this is no longer the case in 3.0.
(substitute* (find-files "." "\\.[ch]$")
(("^ *# *include.*libguile\\.h.*$")
"#include <libguile.h>\n#include <string.h>\n"))
#t)))))
(build-system gnu-build-system)
(arguments

View file

@ -2399,7 +2399,9 @@ inspired by the SCSH regular expression system.")
`(("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs
`(("guile" ,guile-3.0)))
;; Depend on the latest Guile to avoid bytecode compatibility issues when
;; using modules built against the latest version.
`(("guile" ,guile-3.0-latest)))
(propagated-inputs
`(("guile-reader" ,guile-reader)
("guile-commonmark" ,guile-commonmark)))
@ -2504,6 +2506,19 @@ key-value cache and store.")
"3.0 2.2 2.0"))
#t))))
(build-system gnu-build-system)
;; The tests throw exceptions with Guile 3.0.5, because they evaluate
;; (exit ...).
;;
;; This has been fixed upstream, but there has not been a new release
;; containing this change.
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests-when-building-with-guile-3.0.5
(lambda _
(substitute* (find-files "tests" "\\.scm$")
(("\\(exit.*") ""))
#t)))))
(inputs
`(("guile" ,guile-3.0)))
(native-inputs
@ -2626,7 +2641,10 @@ The picture values can directly be displayed in Geiser.")
(package
(inherit guile-picture-language)
(name "guile2.2-picture-language")
(inputs `(("guile" ,guile-2.2)))))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-cairo" ,guile2.2-cairo)
("guile-rsvg" ,guile2.2-rsvg)))))
(define-public guile3.0-picture-language
(deprecated-package "guile3.0-picture-language"

View file

@ -575,14 +575,14 @@ specification. These are the main features:
(package
(inherit guile-json-3)
(name "guile-json")
(version "4.5.1")
(version "4.5.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/guile-json/guile-json-"
version ".tar.gz"))
(sha256
(base32
"0iigada80cg7dl10z6ligiykci0cv9b88zmncz47nsz5g9gacdpc"))))))
"0cqr0ljqmzlc2bwrapcsmcgxg147h66mcxf23824ri5i6vn4dc0s"))))))
(define-public guile2.2-json
(package-for-guile-2.2 guile-json-4))

View file

@ -238,7 +238,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(define-public srain
(package
(name "srain")
(version "1.1.2")
(version "1.1.3")
(source
(origin
(method git-fetch)
@ -247,7 +247,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1jjs3lrlz67z9ghpc4c406a5r3naisn1famdh9rwwcg4y4y1vcws"))))
(base32 "1vqjjsxzc4601dpc8lf9k25rp2c7sjab7l5a6cbfygpr8dqvm6vq"))))
(arguments
`(#:tests? #f ;there are no tests
#:phases
@ -261,7 +261,8 @@ using a mouse. It is customizable and extensible with plugins and scripts.")
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(inputs
`(("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)

View file

@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-5.10-version "5.10.12")
(define-public linux-libre-5.10-version "5.10.14")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x")))
(hash (base32 "0ahxga1jdgn8kxln0pn8j42qxx0dhrhm9vcpwilyjnwb36gvf9zs")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
@ -369,7 +369,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.94")
(define-public linux-libre-5.4-version "5.4.96")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@ -377,12 +377,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2")))
(hash (base32 "1q7mz69wzk1ps5770l9bj556qyndiz2frjjsl7pigsy5brlxwa7p")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.172")
(define-public linux-libre-4.19-version "4.19.174")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@ -390,12 +390,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g")))
(hash (base32 "1rcy0hfbc3ny52mfrfysknm1q2scqz0g8l28j0qlyw8cx41wgxhg")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.218")
(define-public linux-libre-4.14-version "4.14.220")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@ -403,33 +403,39 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3")))
(hash (base32 "1qip0c8nvfximgg4fj9xai741cgvi9f141bsps3zmrryjd796i6h")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.254")
(define-public linux-libre-4.9-version "4.9.256")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
;; 4.9.256 is the same as 4.9.255, but is meant to test if anything
;; breaks when the minor version overflows an 8-bit representation.
;; Same story for 4.4.256.
;; https://lwn.net/Articles/845206/
;; http://kroah.com/log/blog/2021/02/05/8-bits-are-enough-for-a-version-number-dot-dot-dot/
"4.9.255"
(base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg")
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn")))
(hash (base32 "15qlv4m56dzv195xjy4yp8qsrkbmv51vwfg0qcm664hkrb4i32y4")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.254")
(define-public linux-libre-4.4-version "4.4.256")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
;; See the comment in deblob-scripts-4.9
"4.4.255"
(base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw")
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd")))
(hash (base32 "1z7vfy4h0mjvv0rcvvpb55x5fl16c6cgpcafz5gpjp0pw1p2lva8")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -1472,14 +1478,14 @@ deviation, and minimum and maximum values. It can show a nice histogram too.")
(define-public psmisc
(package
(name "psmisc")
(version "23.3")
(version "23.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/psmisc/psmisc/psmisc-"
version ".tar.xz"))
(sha256
(base32 "16i7qzjmm6g0lzha8yzpfrlcxnvkgh95hkq9gdjd4zmzb8d0wxa1"))))
(base32 "0y8n1jd2dn4cvc5mh806d66qnq8xl0xmzczbycjwal10rvmcw33z"))))
(build-system gnu-build-system)
(arguments
`(,@(if (%current-target-system)
@ -1769,8 +1775,8 @@ parameters.")
(description
"Procps is the package that has a bunch of small useful utilities
that give information about processes using the Linux /proc file system.
The package includes the programs ps, top, vmstat, w, kill, free,
slabtop, and skill.")
The package includes the programs free, pgrep, pidof, pkill, pmap, ps, pwdx,
slabtop, tload, top, vmstat, w, watch and sysctl.")
(license license:gpl2)))
(define-public usbutils
@ -2352,7 +2358,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute
(package
(name "iproute2")
(version "5.9.0")
(version "5.10.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -2360,7 +2366,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz"))
(sha256
(base32
"1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"))))
"1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5"))))
(build-system gnu-build-system)
(arguments
`( ;; There is a test suite, but it wants network namespaces and sudo.

File diff suppressed because it is too large Load diff

View file

@ -221,7 +221,7 @@ interface to the Tk widget system.")
(define-public ecl
(package
(name "ecl")
(version "20.4.24")
(version "21.2.1")
(source
(origin
(method url-fetch)
@ -229,7 +229,7 @@ interface to the Tk widget system.")
"https://common-lisp.net/project/ecl/static/files/release/"
name "-" version ".tgz"))
(sha256
(base32 "01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"))))
(base32 "000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"))))
(build-system gnu-build-system)
;; src/configure uses 'which' to confirm the existence of 'gzip'.
(native-inputs

View file

@ -1060,7 +1060,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu
(package
(name "mu")
(version "1.4.14")
(version "1.4.15")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/"
@ -1068,7 +1068,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
"mu-" version ".tar.xz"))
(sha256
(base32
"1fk0zyxajwyzp1f8yn7imbqq77s2w5cab5m9jla4zrybwkdi0r6z"))))
"0ailz0k5fdgq6gdl5m7jxy315b7qn5ckj6xwd49hsiq9vqblwlpp"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)

View file

@ -78,7 +78,7 @@ Features include:
(define-public tootle
(package
(name "tootle")
(version "1.0-alpha2")
(version "1.0")
(source
(origin
(method git-fetch)
@ -88,7 +88,7 @@ Features include:
(file-name (git-file-name name version))
(sha256
(base32
"16xz58xasprza89j3ljrfpgvn05yc00p1ch96nyia99r1dyms9rx"))))
"1nm57239mhdq462an6bnhdlijpijxmjs9mqbyirwxwa048d3n4rm"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
@ -1080,7 +1080,7 @@ incompatible with HDF5.")
(define-public hdf5-1.8
(package
(name "hdf5")
(version "1.8.21")
(version "1.8.22")
(source
(origin
(method url-fetch)
@ -1095,9 +1095,8 @@ incompatible with HDF5.")
(string-append major minor)))
"/src/hdf5-" version ".tar.bz2")))
(sha256
(base32 "03glk4w4wyb1jyb443g53y3y1ncnf6mj2cqwm6avfr2awkgb3cg5"))
(patches (search-patches "hdf5-config-date.patch"
"hdf5-1.8-mpi-deprecations.patch"))))
(base32 "194ki2s5jrgl4czkvy5nc9nwjyapah0fj72l0gb0aysplp38i6v8"))
(patches (search-patches "hdf5-config-date.patch"))))
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)))
@ -3508,7 +3507,7 @@ point numbers.")
(define-public wxmaxima
(package
(name "wxmaxima")
(version "20.12.2")
(version "21.01.0")
(source
(origin
(method git-fetch)
@ -3517,13 +3516,12 @@ point numbers.")
(commit (string-append "Version-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1rxnxk7yanb9ac5pxbii6k7gg3b09pbp9rmwvsvgpbrk17mg79r9"))))
(base32 "1bnv9410xmk73adqi4r6w0qgbqk7qig0vr5219839c09xagyyd12"))))
(build-system cmake-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
(inputs
`(("libomp" ,libomp)
("wxwidgets" ,wxwidgets)
`(("wxwidgets" ,wxwidgets)
("maxima" ,maxima)
;; Runtime support.
("adwaita-icon-theme" ,adwaita-icon-theme)

View file

@ -2,7 +2,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,14 +37,14 @@
(define-public mc
(package
(name "mc")
(version "4.8.25")
(version "4.8.26")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.midnight-commander.org/mc-"
version ".tar.xz"))
(sha256
(base32 "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"))))
(base32 "09vc2vf6k12a8k5gdss6hcskwfcbyalrkhn65nidkwlm0p2svpn6"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl)))

View file

@ -931,14 +931,14 @@ simultaneously and therefore appear under the same nickname on IRC.")
(define-public python-nbxmpp
(package
(name "python-nbxmpp")
(version "1.0.2")
(version "2.0.1")
(source
(origin
(method url-fetch)
(uri
(pypi-uri "nbxmpp" version))
(sha256
(base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
(base32 "0184nklbpzriq081lghsfavw9m8jr5kc45qqy4v4rdnxn64j7njc"))))
(build-system python-build-system)
(native-inputs
`(("glib:bin" ,glib "bin")))
@ -946,6 +946,7 @@ simultaneously and therefore appear under the same nickname on IRC.")
`(("glib" ,glib)
("glib-networking" ,glib-networking)
("libsoup" ,libsoup)
("python-gssapi" ,python-gssapi)
("python-idna" ,python-idna)
("python-precis-i18n" ,python-precis-i18n)
("python-pygobject" ,python-pygobject)))
@ -962,7 +963,7 @@ of xmpppy.")
(define-public gajim
(package
(name "gajim")
(version "1.2.2")
(version "1.3.0")
(source
(origin
(method url-fetch)
@ -971,7 +972,7 @@ of xmpppy.")
(version-major+minor version)
"/gajim-" version ".tar.gz"))
(sha256
(base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))
(base32 "1v0cx8r1zr9aj17ik5apxxfpr9rv5w8p1i7hfys6wp9292gc7s25"))
(patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
(build-system python-build-system)
(arguments
@ -985,6 +986,11 @@ of xmpppy.")
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
;; https://dev.gajim.org/gajim/gajim/-/issues/10427
(delete-file "test/unit/test_gui_interface.py")
#t))
(replace 'check
(lambda _
;; Tests require a running X server.
@ -1046,7 +1052,6 @@ of xmpppy.")
("geoclue" ,geoclue)
("glib" ,glib)
("glib-networking" ,glib-networking)
("gnome-keyring" ,gnome-keyring)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gsound",gsound)
("gspell" ,gspell)
@ -1054,6 +1059,7 @@ of xmpppy.")
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+)
("gupnp-igd" ,gupnp-igd)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
("libxss" ,libxscrnsaver)
("network-manager" ,network-manager)
@ -1078,7 +1084,7 @@ and OpenPGP) and available in 29 languages.")
(define-public gajim-omemo
(package
(name "gajim-omemo")
(version "2.6.80")
(version "2.7.13")
(source
(origin
(method url-fetch/zipbomb)
@ -1087,7 +1093,7 @@ and OpenPGP) and available in 29 languages.")
"https://ftp.gajim.org/plugins_releases/omemo_"
version ".zip"))
(sha256
(base32 "179hgx091c12258335znn1540jhp4z3n3wv5ksrgqq7l3jgc93d7"))))
(base32 "1msr71rvik05wjpa2inpkadddad2rxaqbqcww5qrdrcz75pm8brn"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -1116,7 +1122,7 @@ multi-client end-to-end encryption.")
(define-public gajim-openpgp
(package
(name "gajim-openpgp")
(version "1.2.14")
(version "1.3.9")
(source
(origin
(method url-fetch/zipbomb)
@ -1125,7 +1131,7 @@ multi-client end-to-end encryption.")
"https://ftp.gajim.org/plugins_releases/openpgp_"
version ".zip"))
(sha256
(base32 "0wdjpf1i4pvl4ha4plfpywwi9aw5n2mhrpv8mmbidpawxqfbd94b"))))
(base32 "0fzvvrap1hmj4rbrcjs6cs5c9l9c0795bgw9vxxxk915n6j91m23"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -1140,7 +1146,8 @@ multi-client end-to-end encryption.")
#t))))
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
("python-gnupg" ,python-gnupg)))
("python-gnupg" ,python-gnupg)
("python-gpg" ,python-gpg)))
(synopsis "Gajim OpenPGP plugin")
(description "Gajim-OpenPGP is a plugin that adds support for the OpenPGP
Encryption to Gajim.")

View file

@ -2,6 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -45,24 +46,27 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(package
(name (string-append "mingw-w64" "-" machine
(if with-winpthreads? "-winpthreads" "")))
(version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://sourceforge.net/projects/mingw-w64/files/mingw-w64/"
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
(base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
(patches
(search-patches "mingw-w64-6.0.0-gcc.patch"
"mingw-w64-dlltool-temp-prefix.patch"
"mingw-w64-reproducible-gendef.patch"))))
(version "8.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/mingw-w64/mingw-w64/"
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
(base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4"))
(patches
(search-patches "mingw-w64-6.0.0-gcc.patch"
"mingw-w64-dlltool-temp-prefix.patch"
"mingw-w64-reproducible-gendef.patch"))))
(native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet)))
("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet)))
("xbinutils" ,(if xbinutils xbinutils
(cross-binutils triplet)))
,@(if with-winpthreads?
`(("xlibc" ,(make-mingw-w64 machine
#:xgcc xgcc
#:xbinutils xbinutils)))
`(("xlibc" ,(make-mingw-w64
machine
#:xgcc xgcc
#:xbinutils xbinutils)))
'())))
(build-system gnu-build-system)
(search-paths
@ -85,9 +89,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(add-before 'configure 'setenv
(lambda* (#:key inputs #:allow-other-keys)
(let ((xgcc-core (assoc-ref inputs "xgcc-core"))
(mingw-headers (string-append (getcwd) "/mingw-w64-headers")))
(mingw-headers (string-append
(getcwd) "/mingw-w64-headers")))
(setenv "CPP"
(string-append xgcc-core ,(string-append "/bin/" triplet "-cpp")))
(string-append
xgcc-core ,(string-append "/bin/" triplet "-cpp")))
(setenv "CROSS_C_INCLUDE_PATH"
(string-append
mingw-headers
@ -96,11 +102,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
":" mingw-headers "/defaults/include"
":" mingw-headers "/direct-x/include"))
(when ,with-winpthreads?
(let ((xlibc (assoc-ref inputs "xlibc")))
(setenv "CROSS_LIBRARY_PATH"
(string-append
xlibc "/lib" ":"
xlibc "/" ,triplet "/lib"))))))))
(let ((xlibc (assoc-ref inputs "xlibc")))
(setenv "CROSS_LIBRARY_PATH"
(string-append
xlibc "/lib" ":"
xlibc "/" ,triplet "/lib"))))))))
#:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
#:tests? #f ; compiles and includes glibc headers
#:strip-binaries? #f))
@ -133,3 +139,64 @@ several new APIs such as DirectX and DDK, and 64-bit support.")
#:with-winpthreads? #t))
(define-public mingw-w64 mingw-w64-i686)
(define-public mingw-w64-tools
(package
(name "mingw-w64-tools")
(version "8.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/mingw-w64/mingw-w64/"
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
(base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1))
#:phases
(append
(modify-phases %standard-phases
(add-after 'unpack 'cd-gendef
(lambda _
(chdir "mingw-w64-tools/gendef"))))
(modify-phases %standard-phases
(replace 'unpack
(lambda _
(chdir "../genidl"))))
(modify-phases %standard-phases
(replace 'unpack
(lambda _
(chdir "../genlib"))))
(modify-phases %standard-phases
(replace 'unpack
(lambda _
(chdir "../genpeimg"))))
(append-map
(lambda (target)
(modify-phases %standard-phases
(replace 'unpack
(lambda _
(chdir "../widl")
(false-if-exception
(delete-file-recursively "../build"))
#t))
(replace 'configure
(lambda args
(apply (assoc-ref %standard-phases 'configure)
(append args (list #:out-of-source? #t
#:configure-flags
`("--target" ,target
"--program-prefix"
,(string-append target "-")))))))))
'("i686-w64-mingw32" "x86_64-w64-mingw32")))))
(home-page "https://mingw-w64.org")
(synopsis "Tools of Minimalist GNU for Windows")
(description "This package provides the tools of Minimalist GNU for
Windows, a complete software development environment for creating native
Microsoft Windows applications.")
(license (list license:gpl3+ ;gendef, genidl, genlib, genpeimg, genstubdll
license:lgpl2.1+)))) ;widl

View file

@ -7,6 +7,7 @@
;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -46,6 +47,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages image)
#:use-module (gnu packages mail)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages libevent)
#:use-module (gnu packages pcre)
@ -243,6 +245,82 @@ solution (client-side agent)")
(description "This package provides a distributed monitoring
solution (server-side)")))
(define-public zabbix-cli
(package
(name "zabbix-cli")
(version "2.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/unioslo/zabbix-cli")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'use-absolute-ncurses
(lambda _
(substitute* "bin/zabbix-cli"
(("'clear'")
(string-append "'" (which "clear") "'")))))
(add-after 'unpack 'patch-setup.py
(lambda _
;; Install data_files to $out/share instead of /usr/share.
(substitute* "setup.py"
(("/usr/") "")))))))
(inputs
`(("clear" ,ncurses)
("python-requests" ,python-requests)))
(home-page "https://github.com/unioslo/zabbix-cli")
(synopsis "Command-line interface to Zabbix")
(description
"@command{zabbix-cli} is a command-line client for the Zabbix
monitoring system. It can configure and display various aspects of Zabbix
through a text-based interface.")
(license license:gpl3+)))
(define-public python-pyzabbix
(package
(name "python-pyzabbix")
(version "0.8.2")
(home-page "http://github.com/lukecyca/pyzabbix")
;; No tests on PyPI, use the git checkout.
(source
(origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"15rrnpkv94wx6748hh4sd120v6x25rkbd6vlz6hfrhvjwxz5lgjl"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
;; Permit newer versions of httpretty.
(substitute* "setup.py"
(("httpretty<0\\.8\\.7")
"httpretty"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "python" "setup.py" "nosetests")
(format #t "test suite not run~")))))))
(native-inputs
`(;; For tests.
("python-httpretty" ,python-httpretty)
("python-nose" ,python-nose)))
(propagated-inputs
`(("python-requests" ,python-requests)))
(synopsis "Python interface to the Zabbix API")
(description
"@code{pyzabbix} is a Python module for working with the Zabbix API.")
(license license:lgpl2.1+)))
(define-public darkstat
(package
(name "darkstat")

View file

@ -196,7 +196,7 @@ player daemon.")
(define-public ncmpc
(package
(name "ncmpc")
(version "0.42")
(version "0.44")
(source (origin
(method url-fetch)
(uri
@ -205,7 +205,7 @@ player daemon.")
"/ncmpc-" version ".tar.xz"))
(sha256
(base32
"0kfdyvqd2dfrxll5bla8mm10xvpngshlmyjf6wic4wbafqflgxx5"))))
"135m1rlhc2c2xmz03h712lg1mzhczlj4gw33x31mxmajw3whxkz9"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags

View file

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -320,6 +320,81 @@ ISO C. It is a port of LibTomMath with optional support for inline assembler
multiplies.")
(license public-domain)))
(define-public libtomcrypt
(package
(name "libtomcrypt")
(version "1.18.2")
(outputs '("out" "static"))
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/libtom/libtomcrypt"
"/releases/download/v" version
"/crypt-" version ".tar.xz"))
(sha256
(base32
"113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"))
(modules '((guix build utils)))
(snippet
'(begin
;; Patch CVE-2019-17362
;; https://github.com/libtom/libtomcrypt/commit/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94
(substitute* "src/pk/asn1/der/utf8/der_decode_utf8_string.c"
(("z > 4") "z == 1 || z > 4"))
#t))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure
(add-after 'unpack 'prepare-build
(lambda _
;; We want the shared library by default so force it to be the
;; default makefile target.
(delete-file "makefile")
(symlink "makefile.shared" "makefile")
;; We link to libtommath, so we need to add it to the pc file
(substitute* "libtomcrypt.pc.in"
(("-ltomcrypt") "-ltomcrypt -ltommath"))
#t))
(add-after 'build 'build-static
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "-f" "makefile.unix" make-flags)))
(replace 'check
(lambda* (#:key test-target make-flags #:allow-other-keys)
(apply invoke "make" "-f" "makefile.unix" test-target make-flags)
(invoke "./test")))
(add-after 'install 'install-static-library
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(static (assoc-ref outputs "static")))
(mkdir-p (string-append static "/lib"))
(mkdir-p (string-append static "/include"))
(rename-file (string-append out "/lib/libtomcrypt.a")
(string-append static "/lib/libtomcrypt.a"))
(copy-recursively (string-append out "/include")
(string-append static "/include"))
#t))))
#:test-target "test"
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CFLAGS += -DLTM_DESC -DUSE_LTM"
(string-append "EXTRALIBS=" (assoc-ref %build-inputs "libtommath")
"/lib/libtommath.so")
(string-append "CC=" ,(cc-for-target)))))
(native-inputs
`(("libtool" ,libtool)))
(inputs
`(("libtommath" ,libtommath)))
(home-page "https://www.libtom.net/LibTomCrypt/")
(synopsis "Cryptographic toolkit")
(description "LibTomCrypt is a fairly comprehensive, modular and portable
cryptographic toolkit that provides developers with a vast array of well known
published block ciphers, one-way hash functions, chaining modes, pseudo-random
number generators, public key cryptography and a plethora of other routines.")
(properties `((lint-hidden-cve . ("CVE-2019-17362"))))
(license unlicense)))
(define-public libtommath
(package
(name "libtommath")

View file

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
@ -11,7 +11,7 @@
;;; Copyright © 2017 nikita <nikita@n0.is>
;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017, 2018, 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 20172021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 nee <nee.git@hidamari.blue>
@ -337,116 +337,111 @@ and play MIDI files with a few clicks in a user-friendly interface offering
score, keyboard, guitar, drum and controller views.")
(license license:gpl3+)))
;; We don't use the latest release because it depends on Qt4. Instead we
;; download the sources from the tip of the "qt5" branch.
(define-public clementine
(let ((commit "4619a4c1ab3b17b13d4b2327ad477912917eaf36")
(revision "2"))
(package
(name "clementine")
(version (git-version "1.3.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/clementine-player/Clementine")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i"))
(modules '((guix build utils)))
(snippet
'(begin
(for-each
(lambda (dir)
(delete-file-recursively
(string-append "3rdparty/" dir)))
(list
;; TODO: The following dependencies are still bundled:
;; - "qxt": Appears to be unmaintained upstream.
;; - "qsqlite"
;; - "qtsingleapplication"
;; - "qocoa"
;; - "qtiocompressor"
;; - "gmock": The tests crash when using our googletest
;; package instead of the bundled gmock.
"SPMediaKeyTap"
"fancytabwidget"
"google-breakpad"
"libmygpo-qt"
"libmygpo-qt5"
"libprojectm"
"qtwin"
"sha2" ;; Replaced by openssl.
"taglib"
"tinysvcmdns"))
#t))
(patches (search-patches "clementine-use-openssl.patch"
"clementine-remove-crypto++-dependency.patch"
"clementine-fix-sqlite.patch"))))
(build-system cmake-build-system)
(arguments
'(#:test-target "clementine_test"
#:configure-flags
(list ;; Requires unpackaged "projectm"
"-DENABLE_VISUALISATIONS=OFF"
;; Otherwise it may try to download a non-free library at run-time.
;; TODO In an origin snippet, remove the code that performs the
;; download.
"-DHAVE_SPOTIFY_DOWNLOADER=FALSE"
"-DUSE_SYSTEM_SHA2=TRUE")
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/clementine")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
#t))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
(inputs
`(("boost" ,boost)
("chromaprint" ,chromaprint)
("fftw" ,fftw)
("glib" ,glib)
("glu" ,glu)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-libav" ,gst-libav)
("libcdio" ,libcdio)
("libmygpo-qt" ,libmygpo-qt)
;; TODO: Package libgpod.
("libmtp" ,libmtp)
("libxml2" ,libxml2)
("openssl" ,openssl)
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)
("sqlite" ,sqlite)
("sparsehash" ,sparsehash)
("taglib" ,taglib)))
(home-page "https://clementine-player.org")
(synopsis "Music player and library organizer")
(description "Clementine is a multiplatform music player. It is inspired
(package
(name "clementine")
(version "1.4.0rc1-450-g2725ef99d")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/clementine-player/Clementine")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90"))
(modules '((guix build utils)
(ice-9 regex)))
(snippet
'(begin
(use-modules ((ice-9 regex)))
(for-each
(lambda (dir)
;; TODO: The following dependencies are still bundled:
;; - "qxt": Appears to be unmaintained upstream.
;; - "qsqlite"
;; - "qtsingleapplication"
;; - "qocoa"
;; - "qtiocompressor"
(let ((bundled '("qsqlite"
"qtsingleapplication"
"qxt"
"qocoa"
"qtiocompressor")))
(if (not
(string-match
(string-append ".?*(" (string-join bundled "|") ")")
dir))
(delete-file-recursively dir))))
(find-files "3rdparty"
(lambda (file stat)
(string-match "^3rdparty/[^/]*$" file))
#:directories? #t))
#t))))
(build-system cmake-build-system)
(arguments
'(#:test-target "clementine_test"
#:configure-flags
(list ;; Requires unpackaged "projectm"
"-DENABLE_VISUALISATIONS=OFF"
;; Otherwise it may try to download a non-free library at run-time.
;; TODO In an origin snippet, remove the code that performs the
;; download.
"-DHAVE_SPOTIFY_DOWNLOADER=FALSE"
;; Clementine checks that the taglib version is higher than 1.11,
;; because of https://github.com/taglib/taglib/issues/864. Remove
;; this flag when 1.12 is released.
"-DUSE_SYSTEM_TAGLIB=TRUE")
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/clementine")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
#t))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("googletest" ,googletest)
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
(inputs
`(("boost" ,boost)
("chromaprint" ,chromaprint)
("fftw" ,fftw)
("glib" ,glib)
("glu" ,glu)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-libav" ,gst-libav)
("libcdio" ,libcdio)
("libmygpo-qt" ,libmygpo-qt)
;; TODO: Package libgpod.
("libmtp" ,libmtp)
("libxml2" ,libxml2)
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)
("sqlite" ,sqlite)
("sparsehash" ,sparsehash)
("taglib" ,taglib)))
(home-page "https://clementine-player.org")
(synopsis "Music player and library organizer")
(description "Clementine is a multiplatform music player. It is inspired
by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and
playing your music.")
(license (list
;; clementine and qtiocompressor are under GPLv3.
license:gpl3+
;; gmock is under BSD-3.
license:bsd-3
;; qxt is under CPL1.0.
license:cpl1.0
;; qsqlite and qtsingleapplication are under LGPL2.1+.
license:lgpl2.1+
;; qocoa is under MIT and CC by-sa for the icons.
license:cc-by-sa3.0)))))
(license (list
;; clementine and qtiocompressor are under GPLv3.
license:gpl3+
;; qxt is under CPL1.0.
license:cpl1.0
;; qsqlite and qtsingleapplication are under LGPL2.1+.
license:lgpl2.1+
;; qocoa is under MIT and CC by-sa for the icons.
license:cc-by-sa3.0))))
(define-public cmus
(package
@ -3487,6 +3482,7 @@ websites such as Libre.fm.")
(uri (git-reference
(url "https://github.com/beetbox/beets")
(commit commit)))
(file-name (git-file-name "beets" version))
(sha256
(base32
"092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4"))))
@ -3526,6 +3522,7 @@ websites such as Libre.fm.")
("python-mediafile" ,python-mediafile)
("python-reflink" ,python-reflink)
("python-requests-oauthlib" ,python-requests-oauthlib)
("opusfile" ,opusfile)
,@(package-inputs beets))))))
(define-public beets-bandcamp
@ -4385,7 +4382,7 @@ are a C compiler and glib. Full API documentation and examples are included.")
(define-public lmms
(package
(name "lmms")
(version "1.2.1")
(version "1.2.2")
(source
(origin
(method git-fetch)
@ -4395,7 +4392,7 @@ are a C compiler and glib. Full API documentation and examples are included.")
(file-name (git-file-name name version))
(sha256
(base32
"1gx730z361xx30iqbsm99aam1k2c8yf561gcay6sryyjksb4w1wy"))))
"11xgf461cnmq0jkgdgx5bddi87ammpik4whg1m4fcvd3i0d5i601"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
@ -4463,7 +4460,8 @@ are a C compiler and glib. Full API documentation and examples are included.")
("libxft" ,libxft)
("freetype2" ,freetype)
("fftw3f" ,fftwf)
("jack" ,jack-1)))
("jack" ,jack-1)
("carla" ,carla)))
(home-page "https://lmms.io/")
(synopsis "Music composition tool")
(description "LMMS is a digital audio workstation. It includes tools for sequencing
@ -4504,7 +4502,7 @@ standalone JACK client and an LV2 plugin is also available.")
(define-public musescore
(package
(name "musescore")
(version "3.6.1")
(version "3.6.2")
(source
(origin
(method git-fetch)
@ -4513,7 +4511,7 @@ standalone JACK client and an LV2 plugin is also available.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "087j474sdm8vcjczfqlbb1hpcvgvdghjsd132db9dlqwpgk4hmnv"))
(base32 "0szvb6mlzy9df9lrq546rrpixa480knzij1wgh6ilflxz87q048q"))
(modules '((guix build utils)))
(snippet
;; Remove unused libraries.

View file

@ -700,8 +700,16 @@ or, more generally, MAC addresses of the same category of hardware.")
"0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"))))
(build-system gnu-build-system)
(arguments
'(#:phases
'(#:configure-flags
(list "--localstatedir=/var")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'do-not-create-/run
(lambda _
(substitute* (find-files "src" "Makefile.*")
(("^.+install_sh.+/run.+$")
"\ttrue"))
#t))
(add-after 'unpack 'patch-iproute2
(lambda* (#:key inputs #:allow-other-keys)
(let* ((iproute (assoc-ref inputs "iproute"))

View file

@ -28,7 +28,7 @@
(define-public nim
(package
(name "nim")
(version "1.0.6")
(version "1.4.2")
(source
(origin
(method url-fetch)
@ -36,7 +36,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
"1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk"))))
"0q8i56343b69f1bh48a8vxkqman9i2kscyj0lf017n3xfy1pb903"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests.

View file

@ -132,8 +132,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0")
(commit "dffc918af6cf6e1ce942dd329d210271ced1205d")
(revision 12))
(commit "a53f711422f63d7e32b8639b968cf00bcc69ffea")
(revision 13))
(package
(name "guix")
@ -149,11 +149,18 @@
(commit commit)))
(sha256
(base32
"0wcwb09iy4svky5kmxwch7fymmkx78h8haam6p8ix110mm88in8k"))
"01sky036v6dh8zwvrzl08pj4r6vkz7mjadkqbrwhak4nvds5frq8"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list
;; Provide channel metadata for 'guix describe'.
;; Don't pass '--with-channel-url' and
;; '--with-channel-introduction' and instead use
;; the defaults.
,(string-append "--with-channel-commit=" commit)
"--localstatedir=/var"
"--sysconfdir=/etc"
(string-append "--with-bash-completion-dir="
@ -996,24 +1003,18 @@ written entirely in Python.")
(define-public gwl
(package
(name "gwl")
(version "0.2.1")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz"))
(sha256
(base32
"1ji5jvzni8aml9fmimlr11g3k8isrnlvnbzhmwgdjh72hils0alc"))))
"1lqif00mq7fsaknbc2gvvcv1j89k311sm44jp9jklbrv0v2lc83n"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'fix-tests
(lambda _
;; Avoid cross-device link.
(substitute* "tests/cache.scm"
(("/tmp/gwl-test-input-XXXXXX")
(string-append (getcwd) "/gwl-test-input-XXXXXX")))
#t)))))
`(#:parallel-build? #false ; for reproducibility
#:make-flags
'("GUILE_AUTO_COMPILE=0")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
@ -1021,14 +1022,17 @@ written entirely in Python.")
("texinfo" ,texinfo)
("graphviz" ,graphviz)))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(propagated-inputs
`(("guix" ,guix)
("guile-commonmark" ,guile-commonmark)
("guile-gcrypt" ,guile-gcrypt)
("guile-pfds" ,guile-pfds)
("guile-syntax-highlight" ,guile-syntax-highlight)
("guile-wisp" ,guile-wisp)))
(let ((p (package-input-rewriting
`((,guile-3.0 . ,guile-3.0-latest))
#:deep? #false)))
`(("guix" ,guix)
("guile" ,guile-3.0-latest)
("guile-commonmark" ,(p guile-commonmark))
("guile-config" ,(p guile-config))
("guile-gcrypt" ,(p guile-gcrypt))
("guile-pfds" ,(p guile-pfds))
("guile-syntax-highlight" ,(p guile-syntax-highlight))
("guile-wisp" ,(p guile-wisp)))))
(home-page "https://workflows.guix.info")
(synopsis "Workflow management extension for GNU Guix")
(description "The @dfn{Guix Workflow Language} (GWL) provides an
@ -1042,8 +1046,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
(let ((commit "b5d998c22f7d4db3e26166ada9489af363f2d47a")
(revision "15"))
(let ((commit "88fbb69264a412ca2c7e6c4de024414444bd2df8")
(revision "18"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1054,7 +1058,7 @@ environments.")
(commit commit)))
(sha256
(base32
"1jfmwfx7cvfsvryc3w70nw6mixdamjymkqh40qkv99sspkd86dkr"))
"0bjf9bibamyk1d762w4nv0n0a7azww5bks2c9627zpzs2zqwqyiv"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments

View file

@ -1,23 +0,0 @@
Patch downloaded from https://github.com/clementine-player/Clementine/pull/5669 .
diff -ruN clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp clementine-1.3.1.565.gd20c2244a/src/core/database.cpp
--- clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp 2018-07-07 23:59:24.018540126 +0200
+++ clementine-1.3.1.565.gd20c2244a/src/core/database.cpp 2018-07-08 00:04:47.991551728 +0200
@@ -265,6 +265,17 @@
StaticInit();
{
+
+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
+ // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER
+ // (generally a good idea due to security reasons) the fts3 support should be enabled explicitly.
+ QVariant v = db.driver()->handle();
+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
+ sqlite3 *handle = *static_cast<sqlite3**>(v.data());
+ if (handle) sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
+ }
+#endif
+
QSqlQuery set_fts_tokenizer(db);
set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
set_fts_tokenizer.bindValue(":name", "unicode");

View file

@ -1,19 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3202b8b..473ecb9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,14 +279,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
optional_component(VISUALISATIONS ON "Visualisations")
-if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
- "code must be compiled in")
-elseif(CRYPTOPP_FOUND)
- set(HAVE_CRYPTOPP ON)
- set(HAVE_SPOTIFY_DOWNLOADER ON)
-endif()
-
# Find DBus if it's enabled
if (HAVE_DBUS)
find_package(Qt5 COMPONENTS DBus)

View file

@ -1,67 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4022c383b..3202b8b69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ pkg_check_modules(LIBPULSE libpulse)
pkg_check_modules(LIBXML libxml-2.0)
pkg_check_modules(SPOTIFY libspotify>=12.1.45)
pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+pkg_check_modules(OPENSSL REQUIRED openssl)
if (WIN32)
find_package(ZLIB REQUIRED)
@@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS)
endif(GTEST_INCLUDE_DIRS)
endif(GMOCK_INCLUDE_DIRS)
-# Use the system's sha2 if it's available.
-find_path(SHA2_INCLUDE_DIRS sha2.h)
-find_library(SHA2_LIBRARIES sha2)
-if(SHA2_LIBRARIES AND SHA2_INCLUDE_DIRS)
- message(STATUS "Using system sha2 library")
- set(USE_SYSTEM_SHA2 ON)
-else()
- message(STATUS "Using builtin sha2 library")
- set(USE_SYSTEM_SHA2 OFF)
- add_subdirectory(3rdparty/sha2)
- set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
- set(SHA2_LIBRARIES sha2)
-endif()
-
# Use the system libmygpo-qt5 if a recent enough version was found
if(LIBMYGPO_QT5_FOUND)
set(MYGPOQT5_LIBRARIES ${LIBMYGPO_QT5_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e24c9726..104d044d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ include_directories(${LIBPROJECTM_INCLUDE_DIRS})
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
include_directories(${QXT_INCLUDE_DIRS})
-include_directories(${SHA2_INCLUDE_DIRS})
include_directories(${CHROMAPRINT_INCLUDE_DIRS})
include_directories(${MYGPOQT5_INCLUDE_DIRS})
@@ -1223,7 +1222,7 @@ target_link_libraries(clementine_lib
libclementine-common
libclementine-tagreader
libclementine-remote
- ${SHA2_LIBRARIES}
+ ${OPENSSL_LIBRARIES}
${TAGLIB_LIBRARIES}
${MYGPOQT5_LIBRARIES}
${CHROMAPRINT_LIBRARIES}
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index ce76f22da..80bf623fb 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -52,7 +52,7 @@
#include "config.h"
#include "timeconstants.h"
-#include "sha2.h"
+#include <openssl/sha.h>
#if defined(Q_OS_UNIX)
#include <sys/statvfs.h>

View file

@ -1,27 +0,0 @@
From 52bfd419bf9022726048f818d955b8ea10a16d5c Mon Sep 17 00:00:00 2001
From: Patrick Mosby <info@schreiblogade.de>
Date: Mon, 7 Sep 2015 09:05:56 +0200
Subject: [PATCH] Don't save undo file for ignored files.
This fixes #4.
---
undohist.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/undohist.el b/undohist.el
index b184a26..de60356 100644
--- a/undohist.el
+++ b/undohist.el
@@ -164,7 +164,8 @@ To use undohist, you just call this function."
undohist-ignored-files)))
(defun undohist-save-1 ()
- (when (consp buffer-undo-list)
+ (when (and (consp buffer-undo-list)
+ (undohist-recover-file-p (buffer-file-name (current-buffer))))
(let ((file (make-undohist-file-name (buffer-file-name)))
(contents `((digest . ,(md5 (current-buffer)))
(undo-list . ,(undohist-encode buffer-undo-list)))))
--
2.21.0

View file

@ -1,169 +0,0 @@
--- a/src/H5.c
+++ b/src/H5.c
@@ -138,7 +138,7 @@
if (mpi_initialized && !mpi_finalized) {
int key_val;
- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN,
+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN,
(MPI_Comm_delete_attr_function *)H5_mpi_delete_cb,
&key_val, NULL)))
HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code)
--- hdf5-1.8.19/testpar/t_cache.c
+++ hdf5-1.8.19/testpar/t_cache.c
@@ -1187,20 +1187,20 @@
struct mssg_t sample; /* used to compute displacements */
/* setup the displacements array */
- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) {
+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) {
nerrors++;
success = FALSE;
if ( verbose ) {
- HDfprintf(stdout, "%d:%s: MPI_Address() call failed.\n",
+ HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n",
world_mpi_rank, fcn_name);
}
@@ -1215,14 +1215,14 @@
if ( success ) {
- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
if ( result != MPI_SUCCESS ) {
nerrors++;
success = FALSE;
if ( verbose ) {
- HDfprintf(stdout, "%d:%s: MPI_Type_struct() call failed.\n",
+ HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n",
world_mpi_rank, fcn_name);
}
}
--- hdf5-1.8.19/testpar/t_mpi.c
+++ hdf5-1.8.19/testpar/t_mpi.c
@@ -279,7 +279,7 @@
printf("Skipped GB file range test "
"because MPI_Offset cannot support it\n");
}else{
- buf = HDmalloc(MB);
+ buf = (char *)HDmalloc(MB);
VRFY((buf!=NULL), "malloc succeed");
/* open a new file. Remove it first in case it exists. */
@@ -624,7 +624,7 @@
and this platform.
1. Details for the test:
-1) Create two derived datatypes with MPI_Type_hindexed:
+1) Create two derived datatypes with MPI_Type_create_hindexed:
datatype1:
count = 1, blocklens = 1, offsets = 0,
base type = MPI_BYTE(essentially a char)
@@ -633,7 +633,7 @@
base type = MPI_BYTE
2) Using these two derived datatypes,
- Build another derived datatype with MPI_Type_struct:
+ Build another derived datatype with MPI_Type_create_struct:
advtype: derived from datatype1 and datatype2
advtype:
count = 2, blocklens[0] = 1, blocklens[1]=1,
@@ -676,10 +676,9 @@
int mpi_err_strlen;
int mpi_err;
int i;
- int nerrors = 0; /* number of errors */
MPI_Datatype etype,filetype;
MPI_Datatype adv_filetype,bas_filetype[2];
- MPI_Datatype etypenew, filetypenew;
+ MPI_Datatype filetypenew;
MPI_Offset disp;
MPI_Status Status;
MPI_Aint adv_disp[2];
@@ -715,7 +714,7 @@
blocklens[0] = 1;
offsets[0] = 0;
- if((mpi_err= MPI_Type_hindexed(count,blocklens,offsets,MPI_BYTE,&filetype))
+ if((mpi_err= MPI_Type_create_hindexed(count,blocklens,offsets,MPI_BYTE,&filetype))
!= MPI_SUCCESS){
MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
@@ -731,7 +730,7 @@
count = 1;
blocklens[0]=1;
offsets[0] = 1;
- if((mpi_err= MPI_Type_hindexed(count,blocklens,offsets,MPI_BYTE,&filetypenew))
+ if((mpi_err= MPI_Type_create_hindexed(count,blocklens,offsets,MPI_BYTE,&filetypenew))
!= MPI_SUCCESS){
MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
@@ -752,10 +751,10 @@
bas_filetype[0] = filetype;
bas_filetype[1] = filetypenew;
- if((mpi_err= MPI_Type_struct(outcount,adv_blocklens,adv_disp,bas_filetype,&adv_filetype))
+ if((mpi_err= MPI_Type_create_struct(outcount,adv_blocklens,adv_disp,bas_filetype,&adv_filetype))
!= MPI_SUCCESS){
MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
- printf("MPI_Type_struct failed (%s)\n", mpi_err_str);
+ printf("MPI_Type_create_struct failed (%s)\n", mpi_err_str);
return 1;
}
if((mpi_err=MPI_Type_commit(&adv_filetype))!=MPI_SUCCESS){
@@ -842,7 +841,7 @@
processes are needed.
1. Details for the test:
-1) Create one derived datatype with MPI_Type_hindexed:
+1) Create one derived datatype with MPI_Type_create_hindexed:
2) Choosing at least two processes to contribute none for IO with
the buf size inside MPI_Write_at_all to 0.
@@ -898,7 +897,7 @@
offsets[1] = (mpi_size+mpi_rank)*count;
if(count !=0) {
- if((mpi_err = MPI_Type_hindexed(2,
+ if((mpi_err = MPI_Type_create_hindexed(2,
blocklens,
offsets,
etype,
@@ -914,7 +913,7 @@
return 1;
} /* end if */
- if((mpi_err = MPI_Type_hindexed(2,
+ if((mpi_err = MPI_Type_create_hindexed(2,
blocklens,
offsets,
etype,
@@ -1098,7 +1097,7 @@
* calls. By then, MPI calls may not work.
*/
if (H5dont_atexit() < 0){
- printf("Failed to turn off atexit processing. Continue.\n", mpi_rank);
+ printf("Failed to turn off atexit processing. Continue.\n");
};
H5open();
if (parse_options(argc, argv) != 0){

View file

@ -14,11 +14,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (connection.isEmpty())
con = defaultConnection();
- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
- QVariant fallback = getValue(skipUpdateCheckC(), con, false);
+ QVariant fallback = getValue(skipUpdateCheckC(), con, true);
fallback = getValue(skipUpdateCheckC(), QString(), fallback);
QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
- return value.toBool();
+ if ( !value.toBool() )
+ qDebug() << "Guix has disabled the UpdateCheck mechanism.";

View file

@ -0,0 +1,17 @@
Fix compatibility with Qt 5.15.
Patch copied from upstream source repository:
https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
--- a/sources/model.h 2017-04-19 21:01:25 +0000
+++ b/sources/model.h 2020-06-09 06:24:11 +0000
@@ -24,6 +24,7 @@
#define DOCUMENTMODEL_H
#include <QList>
+#include <QPainterPath>
#include <QtPlugin>
#include <QWidget>
#include <QVector>

View file

@ -2,22 +2,27 @@ See also [Arch] and [Gentoo] for similar patches in other distros.
[Arch] https://github.com/archlinux/svntogit-community/blob/packages/renpy/trunk/renpy-system-fribidi.patch
[Gentoo] https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch
Index: renpy-7.3.5-source/module/renpybidicore.c
Index: renpy-7.4.0-source/module/renpybidicore.c
===================================================================
--- renpy-7.3.5-source.orig/module/renpybidicore.c
+++ renpy-7.3.5-source/module/renpybidicore.c
@@ -1,5 +1,5 @@
--- renpy-7.4.0-source.orig/module/renpybidicore.c
+++ renpy-7.4.0-source/module/renpybidicore.c
@@ -1,9 +1,3 @@
#include <Python.h>
-
-#ifdef RENPY_BUILD
#include <fribidi.h>
-#else
-#include <fribidi-src/lib/fribidi.h>
+#include <fribidi.h>
-#endif
-
#include <stdlib.h>
#ifndef alloca
Index: renpy-7.3.5-source/module/setup.py
Index: renpy-7.4.0-source/module/setup.py
===================================================================
--- renpy-7.3.5-source.orig/module/setup.py
+++ renpy-7.3.5-source/module/setup.py
@@ -119,30 +119,13 @@ cython(
--- renpy-7.4.0-source.orig/module/setup.py
+++ renpy-7.4.0-source/module/setup.py
@@ -125,30 +125,13 @@ cython(
sdl + [ png, 'z', 'm' ])
FRIBIDI_SOURCES = """

View file

@ -1,83 +0,0 @@
From: Petter Reinholdtsen <pere@debian.org>
Date: Tue, 22 Sep 2015 15:14:06 +0200
Subject: oggenc: validate count of channels in the header (CVE-2014-9638 &
CVE-2014-9639)
Author: Kamil Dudka <kdudka@redhat.com>
Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html
Bug: https://trac.xiph.org/ticket/2136
Bug: https://trac.xiph.org/ticket/2137
Bug-Debian: https://bugs.debian.org/776086
Forwarded: not-needed
Reviewed-By: Petter Reinholdtsen <pere@hungry.com>
Last-Update: 2015-09-22
---
oggenc/audio.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/oggenc/audio.c b/oggenc/audio.c
index 05e42b3..1b3f179 100644
--- a/oggenc/audio.c
+++ b/oggenc/audio.c
@@ -13,6 +13,7 @@
#include <config.h>
#endif
+#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
aiff_fmt format;
aifffile *aiff = malloc(sizeof(aifffile));
int i;
+ long channels;
if(buf[11]=='C')
aifc=1;
@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
return 0;
}
- format.channels = READ_U16_BE(buffer);
+ format.channels = channels = READ_U16_BE(buffer);
format.totalframes = READ_U32_BE(buffer+2);
format.samplesize = READ_U16_BE(buffer+6);
format.rate = (int)read_IEEE80(buffer+8);
+ if(channels <= 0L || SHRT_MAX < channels)
+ {
+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
+ return 0;
+ }
aiff->bigendian = 1;
if(aifc)
@@ -412,6 +419,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
wav_fmt format;
wavfile *wav = malloc(sizeof(wavfile));
int i;
+ long channels;
/* Ok. At this point, we know we have a WAV file. Now we have to detect
* whether we support the subtype, and we have to find the actual data
@@ -449,12 +457,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
}
format.format = READ_U16_LE(buf);
- format.channels = READ_U16_LE(buf+2);
+ format.channels = channels = READ_U16_LE(buf+2);
format.samplerate = READ_U32_LE(buf+4);
format.bytespersec = READ_U32_LE(buf+8);
format.align = READ_U16_LE(buf+12);
format.samplesize = READ_U16_LE(buf+14);
+ if(channels <= 0L || SHRT_MAX < channels)
+ {
+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
+ return 0;
+ }
+
if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
{
if(len<40)

View file

@ -1,29 +0,0 @@
Index: vorbis-tools/oggenc/oggenc.c
===================================================================
--- vorbis-tools/oggenc/oggenc.c (revision 19116)
+++ vorbis-tools/oggenc/oggenc.c (revision 19117)
@@ -98,4 +98,6 @@
0,0,0.f,
0, 0, 0, 0, 0};
+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
+ N_("RAW file reader")};
int i;
@@ -240,6 +242,4 @@
if(opt.rawmode)
{
- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
- N_("RAW file reader")};
enc_opts.rate=opt.raw_samplerate;
Index: vorbis-tools/oggenc/skeleton.h
===================================================================
--- vorbis-tools/oggenc/skeleton.h (revision 19116)
+++ vorbis-tools/oggenc/skeleton.h (revision 19117)
@@ -42,5 +42,5 @@
ogg_int64_t start_granule; /* start granule value */
ogg_uint32_t preroll; /* preroll */
- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */
+ unsigned char granule_shift; /* 1 byte value holding the granule shift */
char *message_header_fields; /* holds all the message header fields */
/* current total size of the message header fields, for realloc purpose, initially zero */

View file

@ -1,44 +0,0 @@
Upstream fix for CVE-2015-6749.
https://trac.xiph.org/ticket/2212
From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.hsj@gmail.com>
Date: Sun, 30 Aug 2015 05:54:46 -0700
Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
Fixes #2212
---
oggenc/audio.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/oggenc/audio.c b/oggenc/audio.c
index 477da8c..4921fb9 100644
--- a/oggenc/audio.c
+++ b/oggenc/audio.c
@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
{
int aifc; /* AIFC or AIFF? */
- unsigned int len;
- unsigned char *buffer;
+ unsigned int len, readlen;
+ unsigned char buffer[22];
unsigned char buf2[8];
aiff_fmt format;
aifffile *aiff = malloc(sizeof(aifffile));
@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
return 0; /* Weird common chunk */
}
- buffer = alloca(len);
-
- if(fread(buffer,1,len,in) < len)
+ readlen = len < sizeof(buffer) ? len : sizeof(buffer);
+ if(fread(buffer,1,readlen,in) < readlen ||
+ (len > readlen && !seek_forward(in, len-readlen)))
{
fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
return 0;
--
2.5.0

View file

@ -396,47 +396,21 @@ reading and editing of existing PDF files.")
(define-public xpdf
(package
(name "xpdf")
(version "4.02")
(version "4.03")
(source
(origin
(method url-fetch)
(uri (string-append "https://xpdfreader-dl.s3.amazonaws.com/xpdf-"
version "4.02.tar.gz"))
(uri (string-append "https://dl.xpdfreader.com/xpdf-" version ".tar.gz"))
(sha256
(base32 "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"))))
(build-system gnu-build-system)
(inputs `(("freetype" ,freetype)
("gs-fonts" ,gs-fonts)
("lesstif" ,lesstif)
("libpaper" ,libpaper)
("libx11" ,libx11)
("libxext" ,libxext)
("libxp" ,libxp)
("libxpm" ,libxpm)
("libxt" ,libxt)
(base32 "0ip81c9vy0igjnasl9iv2lz214fb01vvvdzbvjmgwc63fi1jgr0g"))))
(build-system cmake-build-system)
(inputs `(("cups" ,cups)
("freetype" ,freetype)
("libpng" ,libpng)
("qtbase" ,qtbase)
("zlib" ,zlib)))
(arguments
`(#:tests? #f ; there is no check target
#:parallel-build? #f ; build fails randomly on 8-way machines
#:configure-flags
(list (string-append "--with-freetype2-includes="
(assoc-ref %build-inputs "freetype")
"/include/freetype2"))
#:phases
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs inputs #:allow-other-keys #:rest args)
(let* ((install (assoc-ref %standard-phases 'install))
(out (assoc-ref outputs "out"))
(xpdfrc (string-append out "/etc/xpdfrc"))
(gs-fonts (assoc-ref inputs "gs-fonts")))
(apply install args)
(substitute* xpdfrc
(("/usr/local/share/ghostscript/fonts")
(string-append gs-fonts "/share/fonts/type1/ghostscript"))
(("#fontFile") "fontFile")))
#t)))))
`(#:tests? #f)) ; there is no check target
(synopsis "Viewer for PDF files based on the Motif toolkit")
(description
"Xpdf is a viewer for Portable Document Format (PDF) files.")
@ -869,7 +843,8 @@ program capable of converting PDF into other formats.")
"trunk/" version "/+download/"
"qpdfview-" version ".tar.gz"))
(sha256
(base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"))))
(base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"))
(patches (search-patches "qpdfview-qt515-compat.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
@ -1160,7 +1160,7 @@ checks for pod coverage of all appropriate files.")
(define-public perl-test-requires
(package
(name "perl-test-requires")
(version "0.10")
(version "0.11")
(source
(origin
(method url-fetch)
@ -1168,7 +1168,7 @@ checks for pod coverage of all appropriate files.")
"Test-Requires-" version ".tar.gz"))
(sha256
(base32
"1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"))))
"03q49vi09b4n31kpnmq4v2dga5ja438a8f1wgkgwvvlpjmadx22b"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Test-Requires")
(synopsis "Checks to see if the module can be loaded")
@ -1231,7 +1231,7 @@ reported, and the tests skipped.")
(define-public perl-test-runvalgrind
(package
(name "perl-test-runvalgrind")
(version "0.2.1")
(version "0.2.2")
(source
(origin
(method url-fetch)
@ -1240,7 +1240,7 @@ reported, and the tests skipped.")
version
".tar.gz"))
(sha256
(base32 "175hlycrhgwrp7j4rwx5bk4fd6775242wjdqv107rvgsrszsi915"))))
(base32 "1vm5iw5sy0mhjjypaaviil9qgqixmkaghdbjbcyb4lf2mm6d24v9"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)))
@ -1300,14 +1300,14 @@ makes fork(2) safe to use in test cases.")
(define-public perl-test-simple
(package
(name "perl-test-simple")
(version "1.302172")
(version "1.302183")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/"
"Test-Simple-" version ".tar.gz"))
(sha256
(base32
"1z1l8dgssf0mqbgik33sc5j48iiapppkwmacwah990hj0j7pd23k"))))
"1zq6841yrwxmrmhgzmzx0njlymsv9mzl6l5njabfl2j2xjjvs0ws"))))
(build-system perl-build-system)
(synopsis "Basic utilities for writing tests")
(description
@ -1345,7 +1345,7 @@ test scripts.")
(define-public perl-test-taint
(package
(name "perl-test-taint")
(version "1.06")
(version "1.08")
(source
(origin
(method url-fetch)
@ -1353,7 +1353,7 @@ test scripts.")
version ".tar.gz"))
(sha256
(base32
"01rip5d7gdr1c7lq6yczzkqfd0500nfa977ryigylj6jj75526vj"))))
"0zd946qam0yffpciqqd9xhn92gdplyh3mii4a1w96b1max14snax"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Test-Taint")
(synopsis "Checks for taintedness of variables")
@ -1489,15 +1489,15 @@ defined, and that the version is valid.")
(define-public perl-test-warn
(package
(name "perl-test-warn")
(version "0.30")
(version "0.36")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/C/CH/CHORNY/"
(uri (string-append "mirror://cpan/authors/id/B/BI/BIGJ/"
"Test-Warn-" version ".tar.gz"))
(sha256
(base32
"0haf2ii7br5z0psmkvlvmx2z2q9qz1c70gx0969r378qjidmb5w1"))))
"1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-sub-uplevel" ,perl-sub-uplevel)))
@ -1510,7 +1510,7 @@ warning based code.")
(define-public perl-test-warnings
(package
(name "perl-test-warnings")
(version "0.026")
(version "0.030")
(source
(origin
(method url-fetch)
@ -1518,7 +1518,7 @@ warning based code.")
"Test-Warnings-" version ".tar.gz"))
(sha256
(base32
"024srkwjckp15dxkni9lb1hc8bg4xwc52zz0iich8rv1nnqnhaxf"))))
"0kz2daardmr2i5vg7g3h0cvw9xnp6d25hx92280swr0mvxyr9949"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Test-Warnings")
(synopsis "Test for warnings and the lack of them")
@ -1599,7 +1599,7 @@ support.")
(define-public perl-test-trailingspace
(package
(name "perl-test-trailingspace")
(version "0.0301")
(version "0.0600")
(source
(origin
(method url-fetch)
@ -1609,7 +1609,7 @@ support.")
".tar.gz"))
(sha256
(base32
"0w2rvsksv7cmf80v632xm2rwxrv933kzz97839yhwynvg9s7b252"))))
"04aszaw4n3sra7n7sq2cj4wjjvfghia9zqi47aj00ry0vqx2d7gh"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)

View file

@ -6,7 +6,7 @@
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2018, 2020 Roel Janssen <roel@gnu.org>
@ -10374,7 +10374,7 @@ duration strings like \"2 minutes\" and \"3 seconds\" to seconds.")
(define-public perl-time-local
(package
(name "perl-time-local")
(version "1.28")
(version "1.30")
(source
(origin
(method url-fetch)
@ -10382,7 +10382,7 @@ duration strings like \"2 minutes\" and \"3 seconds\" to seconds.")
"Time-Local-" version ".tar.gz"))
(sha256
(base32
"03p1mxk75vmmi4l0ibpd05b6hncbh8afjhvss87vpp4rrkjvjy4j"))))
"1jr0i57jqm0spdd98gp5mzdnrqdyf7rls0ygwb9ldfc655mlyx67"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Time-Local")
(synopsis "Efficiently compute time from local and GMT time")
@ -10841,7 +10841,7 @@ having to write a single line of XS.")
(define-public perl-xml-writer
(package
(name "perl-xml-writer")
(version "0.625")
(version "0.900")
(source
(origin
(method url-fetch)
@ -10851,7 +10851,7 @@ having to write a single line of XS.")
".tar.gz"))
(sha256
(base32
"1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"))))
"07qd806kcs7si7qakx3x5p68xq2jdmkxdrns987kaayg7syzbj3k"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/XML-Writer")
(synopsis "Easily generate well-formed, namespace-aware XML")
@ -10913,7 +10913,7 @@ on the YAML 1.0 specification.")
(define-public perl-yaml-libyaml
(package
(name "perl-yaml-libyaml")
(version "0.80")
(version "0.82")
(source
(origin
(method url-fetch)
@ -10921,7 +10921,7 @@ on the YAML 1.0 specification.")
"mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-"
version ".tar.gz"))
(sha256
(base32 "1nhn4w52kpq757rxl052f61h36rdzsy416k740m3fy5ih7axhq4x"))))
(base32 "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/YAML-LibYAML")
(synopsis "Perl YAML Serialization using XS and libyaml")

View file

@ -60,7 +60,7 @@
(define-public php
(package
(name "php")
(version "7.4.14")
(version "7.4.15")
(home-page "https://secure.php.net/")
(source (origin
(method url-fetch)
@ -68,7 +68,7 @@
"php-" version ".tar.xz"))
(sha256
(base32
"11i8w12kyz2lx3fs4vv4l6ccca1znmmdf7dv3mn01ngwd5ww7wzr"))
"1f1wsi2frdbr9a3hvhmk3mmd7cwzf6mwya2akpzkwyygy1jrr1cv"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "ext"
@ -183,12 +183,18 @@
"ext/calendar/tests/unixtojd_error1.phpt"
;; arm can be a lot slower, so a time-related test fails
"ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
"ext/pcntl/tests/pcntl_unshare_01.phpt"
"ext/pcre/tests/bug76514.phpt"
"ext/pcre/tests/preg_match_error3.phpt"
"ext/pcre/tests/cache_limit.phpt"
"ext/sockets/tests/socket_getopt.phpt"
"ext/sockets/tests/socket_sendrecvmsg_error.phpt"
"ext/standard/tests/general_functions/var_export-locale.phpt"
"ext/standard/tests/general_functions/var_export_basic1.phpt"
"ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
"ext/intl/tests/timezone_getOffset_error.phpt")))
"ext/intl/tests/timezone_getOffset_error.phpt"
"sapi/cli/tests/cli_process_title_unix.phpt"
"sapi/cli/tests/upload_2G.phpt")))
'())
;; Drop tests that are known to fail.

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -24,8 +24,10 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages emacs)
#:use-module (gnu packages xorg)
@ -97,40 +99,36 @@ programs for plotting scientific data.")
(license license:gpl2+)))
(define-public guile-charting
(package
(name "guile-charting")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append "http://wingolog.org/pub/guile-charting/"
"guile-charting-" version ".tar.gz"))
(sha256
(base32
"0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure"
(("2\\.2 2\\.0")
"3.0 2.2 2.0"))
;; By default, .go files would be installed to
;; $libdir/…/ccache instead of $libdir/…/site-ccache. Fix
;; that.
(substitute* (find-files "." "^Makefile\\.in$")
(("/ccache") "/site-ccache"))
#t))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-3.0)))
(propagated-inputs `(("guile-cairo" ,guile-cairo)))
(home-page "http://wingolog.org/software/guile-charting/")
(synopsis "Create charts and graphs in Guile")
(description
"Guile-Charting is a Guile Scheme library to create bar charts and graphs
;; This commit fixes a few things, including Guile 3 support, not available
;; in the latest release.
(let ((commit "75f755b691a9f712f3b956657d01805d6a8a1b98")
(revision "1"))
(package
(name "guile-charting")
(version (git-version "0.2.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/wingo/guile-charting")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"03049g7wnpyfi0r36ij4a46kc9l45jbanx02iklkjwav2n6jqnnk"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-3.0)))
(propagated-inputs `(("guile-cairo" ,guile-cairo)))
(home-page "http://wingolog.org/projects/guile-charting/")
(synopsis "Create charts and graphs in Guile")
(description
"Guile-Charting is a Guile Scheme library to create bar charts and graphs
using the Cairo drawing library.")
(license license:lgpl2.1+)))
(license license:lgpl2.1+))))
(define-public guile2.2-charting
(package

View file

@ -10,6 +10,7 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -50,13 +51,13 @@
(define-public python-scipy
(package
(name "python-scipy")
(version "1.3.2")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "scipy" version))
(sha256
(base32 "192d8dsybvhv19igkrsafbdafx198nz7pibkjgrqjhlr66s3jfd0"))))
(base32 "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb"))))
(build-system python-build-system)
(propagated-inputs
`(("python-numpy" ,python-numpy)
@ -64,7 +65,8 @@
("python-pyparsing" ,python-pyparsing)))
(inputs
`(("lapack" ,lapack)
("openblas" ,openblas)))
("openblas" ,openblas)
("pybind11" ,pybind11)))
(native-inputs
`(("python-cython" ,python-cython)
("python-pytest" ,python-pytest)
@ -77,6 +79,11 @@
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'change-home-dir
(lambda _
;; Change from /homeless-shelter to /tmp for write permission.
(setenv "HOME" "/tmp")
#t))
(add-after 'unpack 'disable-broken-tests
(lambda _
(substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py"

View file

@ -7,7 +7,7 @@
;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2020 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
@ -26,11 +26,11 @@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016, 2017, 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 20162021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
@ -1063,17 +1063,15 @@ inter-process communication.")
(define-public python-semantic-version
(package
(name "python-semantic-version")
(version "2.6.0")
(version "2.8.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "semantic_version" version))
(sha256
(base32
"1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"))))
"0m4avx8zdkzc7qglv5zlr54g8yna5vl098drg5396ql7aph2vjyj"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; PyPI tarball lacks tests
(home-page "https://github.com/rbarrois/python-semanticversion")
(synopsis "Semantic versioning module for Python")
(description
@ -1164,10 +1162,54 @@ Python 3 support.")
(license (list license:psfl ; setuptools itself
license:expat ; six, appdirs, pyparsing
license:asl2.0 ; packaging is dual ASL2/BSD-2
license:bsd-2))))
license:bsd-2))
(properties `((python2-variant . ,(delay python2-setuptools))))))
;; Newer versions of setuptools no longer support Python 2.
(define-public python2-setuptools
(package-with-python2 python-setuptools))
(package
(name "python2-setuptools")
(version "41.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "setuptools" version ".zip"))
(sha256
(base32
"04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove included binaries which are used to build self-extracting
;; installers for Windows.
;; TODO: Find some way to build them ourself so we can include them.
(for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
#t))))
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments
`(#:tests? #f))
(native-inputs
`(("unzip" ,unzip)))
(home-page "https://pypi.org/project/setuptools/")
(synopsis
"Library designed to facilitate packaging Python projects")
(description
"Setuptools is a fully-featured, stable library designed to facilitate
packaging Python projects, where packaging includes:
Python package and module definitions,
distribution package metadata,
test hooks,
project installation,
platform-specific details,
Python 3 support.")
;; TODO: setuptools now bundles the following libraries:
;; packaging, pyparsing, six and appdirs. How to unbundle?
(license (list license:psfl ; setuptools itself
license:expat ; six, appdirs, pyparsing
license:asl2.0 ; packaging is dual ASL2/BSD-2
license:bsd-2))))
;; The setuptools provided by Python 3.7.4 is too new for Tensorflow.
(define-public python-setuptools-for-tensorflow
@ -4927,10 +4969,17 @@ that client code uses to construct the grammar directly in Python code.")
"Numpy's Sphinx extensions")
(description
"Sphinx extension to support docstrings in Numpy format.")
(license license:bsd-2)))
(license license:bsd-2)
(properties `((python2-variant . ,(delay python2-numpydoc))))))
(define-public python2-numpydoc
(package-with-python2 python-numpydoc))
(let ((base (package-with-python2
(strip-python2-variant python-numpydoc))))
(package
(inherit base)
(propagated-inputs
`(("python2-jinja2" ,python2-jinja2)
,@(package-propagated-inputs base))))))
(define-public python-numexpr
(package
@ -5192,7 +5241,10 @@ toolkits.")
("python2-subprocess32" ,python2-subprocess32)
("python2-tkinter" ,python-2 "tk")
,@(fold alist-delete (package-propagated-inputs matplotlib)
'("python-pycairo" "python-pygobject" "python-tkinter")))))))
'("python-cairocffi"
"python-pycairo"
"python-pygobject"
"python-tkinter")))))))
(define-public python-matplotlib-documentation
(package
@ -11871,6 +11923,28 @@ programmatically interfacing with your system's $EDITOR.")
(define-public python2-editor
(package-with-python2 python-editor))
(define-public python-multiprocessing-logging
(package
(name "python-multiprocessing-logging")
(version "0.3.1")
(home-page "https://github.com/jruere/multiprocessing-logging")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1625wy3djlr3b2fpd3vi822f8gw6b75mnls5a4318dbi9za5pf0y"))))
(build-system python-build-system)
(synopsis "Manage logs from multiple processes")
(description
"This Python module implements a multiprocessing-aware @code{Handler}
that, when set on the root @code{Logger}, will tunnel log records to the
main process so that they are handled correctly.")
(license license:lgpl3+)))
(define-public python-vobject
(package
(name "python-vobject")
@ -14552,10 +14626,23 @@ of arguments and options for Python scripts using @code{argparse}. It's
particularly useful for programs with many options or sub-parsers that can
dynamically suggest completions; for example, when browsing resources over the
network.")
(license license:asl2.0)))
(license license:asl2.0)
(properties `((python2-variant . ,(delay python2-argcomplete))))))
(define-public python2-argcomplete
(package-with-python2 python-argcomplete))
(let ((variant (package-with-python2
(strip-python2-variant python-argcomplete))))
(package
(inherit variant)
(arguments
(substitute-keyword-arguments (package-arguments variant)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'set-my-HOME
(lambda _ (setenv "HOME" "/tmp")))))))
(native-inputs
`(("python2-importlib-metadata" ,python2-importlib-metadata)
,@(package-native-inputs variant))))))
(define-public python-csscompressor
(package
@ -17121,18 +17208,24 @@ design and layout.")
(define-public python-pkginfo
(package
(name "python-pkginfo")
(version "1.4.2")
(version "1.7.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pkginfo" version))
(sha256
(base32
"0x6lm17p1ks031mj6pajyp4rkq74vpqq8qwjb7ikgwmkli1day2q"))))
"1d1xn1xmfvz0jr3pj8irdwnwby3r13g0r2gwklr1q5y68p5p16h2"))))
(build-system python-build-system)
(arguments
;; The tests are broken upstream.
'(#:tests? #f))
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-tests
(lambda _
(substitute* "pkginfo/tests/test_installed.py"
(("test_ctor_w_package_no_PKG_INFO")
"_test_ctor_w_package_no_PKG_INFO"))
#t)))))
(home-page
"https://code.launchpad.net/~tseaver/pkginfo/trunk")
(synopsis
@ -23533,3 +23626,24 @@ implementations.")
"Pivy provides python bindings for Coin, a 3D graphics library with an
Application Programming Interface based on the Open Inventor 2.1 API.")
(license license:isc)))
(define-public python-crayons
(package
(name "python-crayons")
(version "0.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "crayons" version))
(sha256
(base32
"0gw106k4b6y8mw7pp52awxyplj2bwvwk315k4sywzwh0g1abfcxx"))))
(build-system python-build-system)
(propagated-inputs
`(("python-colorama" ,python-colorama)))
(home-page "https://github.com/MasterOdin/crayons")
(synopsis "TextUI colors for Python")
(description "This package gives you colored strings for the terminal.
Crayons automatically wraps a given string in the foreground color and
restores the original state after the string is printed.")
(license license:expat)))

View file

@ -1188,3 +1188,43 @@ NanoVNA vector network analyzers.")
(sometimes called DSSTV). It is compatible with most of MMSSTV and EasyPal.")
(license (list license:gpl2+
license:qwt1.0))))
(define-public direwolf
(package
(name "direwolf")
(version "1.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wb2osz/direwolf")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5"))))
(build-system cmake-build-system)
(inputs
`(("alsa-lib" ,alsa-lib)
("hamlib" ,hamlib)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "conf/CMakeLists.txt"
(("DESTINATION /etc")
(string-append "DESTINATION "
(assoc-ref outputs "out")
"/etc"))))))))
(home-page "https://github.com/wb2osz/direwolf")
(synopsis "TNC for Amateur Packet Radio")
(description
"Dire Wolf is a Terminal Node Controller (TNC) for Amateur Packet Radio.
It can perform as:
@itemize
@item APRS GPS tracker,
@item Digipeater,
@item Internet gateway (IGate)
@item APRStt gateway
@end itemize\n")
(license license:gpl2+)))

View file

@ -24,6 +24,8 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Holgr Peters <holger.peters@posteo.de>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 EuAndreh <eu@euandre.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -49,6 +51,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages dbm)
#:use-module (gnu packages rails)
@ -1102,6 +1105,43 @@ line of code.")
;; of the Expat license.
(license license:bsd-3)))
(define-public ruby-awesome-print
(package
(name "ruby-awesome-print")
(version "1.8.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "awesome_print" version))
(sha256
(base32
"14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"))))
(build-system ruby-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
;; Remove failing test.
(for-each delete-file
'("spec/ext/nokogiri_spec.rb"
"spec/colors_spec.rb"
"spec/formats_spec.rb"
"spec/methods_spec.rb"
"spec/misc_spec.rb"
"spec/objects_spec.rb"))
(invoke "rspec" "-c" "spec"))))))
(native-inputs
`(("ruby-nokogiri" ,ruby-nokogiri)
("ruby-rspec" ,ruby-rspec)
("ruby-simplecov" ,ruby-simplecov)))
(synopsis "Pretty print Ruby objects to visualize their structure")
(description
"Ruby dubugging companion: pretty print Ruby objects to visualize their
structure. Supports custom object formatting via plugins.")
(home-page "https://github.com/awesome-print/awesome_print")
(license license:expat)))
(define-public ruby-pandoc-ruby
(package
(name "ruby-pandoc-ruby")
@ -1165,6 +1205,31 @@ more.")
(home-page "https://github.com/xwmx/pandoc-ruby")
(license license:expat)))
(define-public ruby-patron
(package
(name "ruby-patron")
(version "0.13.3")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "patron" version))
(sha256
(base32
"0523gddx88zql2mq6655k60gy2ac8vybpzkcf90lmd9nx7wl3fi9"))))
(build-system ruby-build-system)
(inputs
`(("curl" ,curl)))
(arguments
`(#:tests? #f)) ; no included tests
(synopsis "Ruby HTTP client library based on @code{libcurl}")
(description
"Patron is a Ruby HTTP client library based on @code{libcurl}. It does
not try to expose the full power (read complexity) of @code{libcurl} but
instead tries to provide a sane API while taking advantage of @code{libcurl}
under the hood.")
(home-page "https://github.com/toland/patron")
(license license:expat)))
(define-public ruby-slim
(package
(name "ruby-slim")
@ -1441,6 +1506,30 @@ Grammar (PEG) parser generator Domain Specific Language (DSL).")
(home-page "https://github.com/cjheath/treetop")
(license license:expat)))
(define-public ruby-typhoeus
(package
(name "ruby-typhoeus")
(version "1.4.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "typhoeus" version))
(sha256
(base32
"1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ; no included tests
(propagated-inputs
`(("ruby-ethon" ,ruby-ethon)))
(synopsis "@code{libcurl} wrapper in Ruby")
(description
"Like a modern code version of the mythical beast with 100 serpent heads,
Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling
logic.")
(home-page "https://github.com/typhoeus/typhoeus")
(license license:expat)))
(define-public ruby-rubocop-performance
(package
(name "ruby-rubocop-performance")
@ -2279,6 +2368,30 @@ support.")
(home-page "http://www.kuwata-lab.com/erubis/")
(license license:expat)))
(define-public ruby-ethon
(package
(name "ruby-ethon")
(version "0.12.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "ethon" version))
(sha256
(base32
"0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"))))
(build-system ruby-build-system)
(arguments
`(#:tests? #f)) ; no included tests
(inputs
`(("curl" ,curl)))
(propagated-inputs
`(("ruby-ffi" ,ruby-ffi)))
(synopsis "Very lightweight @code{libcurl} wrapper")
(description
"Ethon is a very basic @code{libcurl} wrapper using ffi.")
(home-page "https://github.com/typhoeus/ethon")
(license license:expat)))
(define-public ruby-execjs
(package
(name "ruby-execjs")
@ -10280,14 +10393,14 @@ features that don't exist yet like variables, nesting, mixins and inheritance.")
(define-public ruby-sassc
(package
(name "ruby-sassc")
(version "2.2.1")
(version "2.4.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "sassc" version))
(sha256
(base32
"09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"))))
"0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"))))
(build-system ruby-build-system)
(arguments
'(#:modules ((guix build ruby-build-system)
@ -10366,13 +10479,13 @@ bindings to the libsass library. This enables rendering
(define-public ruby-jekyll-sass-converter
(package
(name "ruby-jekyll-sass-converter")
(version "1.5.2")
(version "2.1.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "jekyll-sass-converter" version))
(sha256
(base32
"008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"))))
"04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv"))))
(build-system ruby-build-system)
(propagated-inputs
`(("ruby-sass" ,ruby-sass)))
@ -10827,17 +10940,6 @@ is compatible with stylesheets designed for pygments.")
;; pygments is licensed under bsd-2
license:bsd-2))))
(define-public ruby-rouge-2
(package
(inherit ruby-rouge)
(version "2.2.1")
(source (origin
(method url-fetch)
(uri (rubygems-uri "rouge" version))
(sha256
(base32
"02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"))))))
(define-public ruby-hashie
(package
(name "ruby-hashie")
@ -10924,13 +11026,13 @@ YAML.load suitable for accepting user input in Ruby applications.")
(define-public ruby-mercenary
(package
(name "ruby-mercenary")
(version "0.3.6")
(version "0.4.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "mercenary" version))
(sha256
(base32
"10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"))))
"0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj"))))
(build-system ruby-build-system)
(arguments `(#:test-target "spec"))
(native-inputs
@ -11002,16 +11104,57 @@ methods for your source as @code{Forwardable::Extended}.")
Pathname.")
(license license:expat)))
(define-public ruby-terminal-table
(package
(name "ruby-terminal-table")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "terminal-table" version))
(sha256
(base32
"18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"))))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'remove-gemfile-lock
(lambda _
(delete-file "Gemfile.lock")))
(add-before 'check 'remove-unnecessary-dependencies
(lambda _
(substitute* "terminal-table.gemspec"
(("s.add_runtime_dependency.*") "\n")
(("s.add_development_dependency.*") "\n"))
(substitute* "Gemfile"
((".*tins.*") "\n"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "rspec")))))))
(build-system ruby-build-system)
(propagated-inputs
`(("ruby-unicode-display-width" ,ruby-unicode-display-width)))
(native-inputs
`(("ruby-rspec" ,ruby-rspec)))
(home-page "https://github.com/tj/terminal-table")
(synopsis "Simple, feature rich ASCII table generation library")
(description
"Terminal Table is a fast and simple, yet feature rich
table generator written in Ruby. It supports ASCII and
Unicode formatted tables.")
(license license:expat)))
(define-public jekyll
(package
(name "jekyll")
(version "3.8.6")
(version "4.2.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "jekyll" version))
(sha256
(base32
"1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"))))
"0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"))))
(build-system ruby-build-system)
(arguments
;; No rakefile, but a test subdirectory.
@ -11035,8 +11178,10 @@ Pathname.")
("ruby-liquid" ,ruby-liquid)
("ruby-mercenary" ,ruby-mercenary)
("ruby-pathutil" ,ruby-pathutil)
("ruby-rouge" ,ruby-rouge-2)
("ruby-safe-yaml" ,ruby-safe-yaml)))
("ruby-rouge" ,ruby-rouge)
("ruby-safe-yaml" ,ruby-safe-yaml)
("ruby-sassc" ,ruby-sassc)
("ruby-terminal-table" ,ruby-terminal-table)))
(home-page "https://jekyllrb.com/")
(synopsis "Static site generator")
(description "Jekyll is a simple, blog aware, static site generator.")
@ -11227,6 +11372,48 @@ characteristics.")
(home-page "https://github.com/sinatra/mustermann")
(license license:expat)))
(define-public ruby-html-proofer
(package
(name "ruby-html-proofer")
(version "3.18.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gjtorikian/html-proofer")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1pxb0fajb3l3lm7sqj548qwl7vx6sx3jy7n4cns9d4lqx7s9r9xb"))))
(build-system ruby-build-system)
(arguments
`(;; FIXME: Tests depend on rubocop-standard.
#:tests? #f))
(native-inputs
`(("ruby-awesome-print" ,ruby-awesome-print)
("ruby-redcarpet" ,ruby-redcarpet)
("ruby-rspec" ,ruby-rspec)
("ruby-rubocop" ,ruby-rubocop)
("ruby-rubocop-performance" ,ruby-rubocop-performance)
("ruby-pry-byebug" ,ruby-pry-byebug)))
(propagated-inputs
`(("ruby-addressable" ,ruby-addressable)
("ruby-mercenary" ,ruby-mercenary)
("ruby-nokogumbo" ,ruby-nokogumbo)
("ruby-parallel" ,ruby-parallel)
("ruby-rainbow" ,ruby-rainbow)
("ruby-typhoeus" ,ruby-typhoeus)
("ruby-yell" ,ruby-yell)))
(synopsis "Test your rendered HTML files to make sure they're accurate")
(description
"HTMLProofer is a set of tests to validate your HTML output. These
tests check if your image references are legitimate, if they have alt tags,
if your internal links are working, and so on. It's intended to be an
all-in-one checker for your output.")
(home-page "https://github.com/gjtorikian/html-proofer")
(license license:expat)))
(define-public ruby-htmlentities
(package
(name "ruby-htmlentities")
@ -11722,3 +11909,30 @@ defined in @file{.travis.yml} on your local machine, using @code{rvm},
you the speed and portability of libgit2 with the beauty of the Ruby
language.")
(license license:expat)))
(define-public ruby-yell
(package
(name "ruby-yell")
(version "2.2.2")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "yell" version))
(sha256
(base32
"1g16kcdhdfvczn7x81jiq6afg3bdxmb73skqjyjlkp5nqcy6y5hx"))))
(build-system ruby-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "rake" "examples")))))) ; there is no test target.
(synopsis
"Extensible logging library for Ruby")
(description
"Yell is a comprehensive logging replacement for Ruby. It defines
multiple adapters, various log level combinations and message formatting
options.")
(home-page "https://github.com/rudionrails/yell")
(license license:expat)))

View file

@ -9,6 +9,7 @@
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -159,7 +160,7 @@ Ansible syntax. Benchmark files can be written in YAML.")
("rust-libc" ,rust-libc-0.2)
("rust-locale" ,rust-locale-0.2)
("rust-log" ,rust-log-0.4)
("rust-natord" ,rust-natord-1.0)
("rust-natord" ,rust-natord-1)
("rust-num-cpus" ,rust-num-cpus-1)
("rust-number-prefix" ,rust-number-prefix-0.3)
("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
@ -247,7 +248,7 @@ also knows about symlinks, extended attributes, and Git.")
("rust-anyhow" ,rust-anyhow-1)
("rust-atty" ,rust-atty-0.2)
("rust-clap" ,rust-clap-2)
("rust-ctrlc" ,rust-ctrlc-3.1)
("rust-ctrlc" ,rust-ctrlc-3)
("rust-dirs" ,rust-dirs-2)
("rust-globset" ,rust-globset-0.4)
("rust-humantime" ,rust-humantime-2)

View file

@ -172,14 +172,14 @@ external dependencies.")
(define-public samba
(package
(name "samba")
(version "4.13.3")
(version "4.13.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/"
"samba-" version ".tar.gz"))
(sha256
(base32 "0hb5fli4kgwg376c289mcmdqszd51vs8pzzrw7j6yr9k7za8a1f1"))
(base32 "0y2wc7njhyhg055krp878xfv9c3wbhrhzn02d5ich30hyxilrcx1"))
(patches (search-patches "samba-fix-fcntl-hint-detection.patch"))
(modules '((guix build utils)))
(snippet
@ -281,14 +281,14 @@ Desktops into Active Directory environments using the winbind daemon.")
(define-public talloc
(package
(name "talloc")
(version "2.3.1")
(version "2.3.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.samba.org/ftp/talloc/talloc-"
version ".tar.gz"))
(sha256
(base32
"0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"))))
"1mvv57srpzcc1qh6vjjyjhgpdlcw4bmmsxfz4j8pfk9qkvwkx817"))))
(build-system gnu-build-system)
(arguments
'(#:phases

View file

@ -67,14 +67,14 @@
(define-public ccid
(package
(name "ccid")
(version "1.4.33")
(version "1.4.34")
(source (origin
(method url-fetch)
(uri (string-append "https://ccid.apdu.fr/files/ccid-"
version ".tar.bz2"))
(sha256
(base32
"0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj"))))
"02mlbpnsvy6jgwpz0jk5lh27y3cn2bsyz9xini7898m9b5dn9xz6"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "--enable-usbdropdir=" %output

View file

@ -524,13 +524,13 @@ ksh, and tcsh.")
(define-public xonsh
(package
(name "xonsh")
(version "0.9.24")
(version "0.9.25")
(source
(origin
(method url-fetch)
(uri (pypi-uri "xonsh" version))
(sha256
(base32 "00nwbagsl8qrs7m40lb0yi5dhvippj387bpnjg6w7r9cvfbj2h7m"))
(base32 "0q1xy0k5mvz4031p4d3y0j7ljpx32rmpk21jy148l6xcss039br0"))
(modules '((guix build utils)))
(snippet
`(begin
@ -825,14 +825,14 @@ Shell (pdksh).")
(define-public oil
(package
(name "oil")
(version "0.8.6")
(version "0.8.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.oilshell.org/download/oil-"
version ".tar.gz"))
(sha256
(base32 "1g7ij3va9rlapfyl3zd08g2iffcr6b0n8b0zrp0bnxwvvnysl95h"))))
(base32 "0yxd020jkwhhvq2l8hd9npp2vn6fvm11f0izfzwdl2npbnc976jr"))))
(build-system gnu-build-system)
(arguments
`(#:strip-binaries? #f ; strip breaks the binary

View file

@ -30,14 +30,14 @@
(define-public skalibs
(package
(name "skalibs")
(version "2.10.0.0")
(version "2.10.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://skarnet.org/software/skalibs/skalibs-"
version ".tar.gz"))
(sha256
(base32 "122xipbxh6awsfdfj37mjc8f3g8ndmmmps4gw5s43mya8wgzib61"))))
(base32 "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no tests exist
@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.")
(define-public execline
(package
(name "execline")
(version "2.7.0.0")
(version "2.7.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://skarnet.org/software/execline/execline-"
version ".tar.gz"))
(sha256
(base32 "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd"))))
(base32 "1pfwiynr3vk7ajzknjqs5mpzb78m97aqcsd3mc34lxkzz5j13xnd"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments
@ -104,14 +104,14 @@ complexity.")))
(define-public s6
(package
(name "s6")
(version "2.10.0.0")
(version "2.10.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://skarnet.org/software/s6/s6-"
version ".tar.gz"))
(sha256
(base32 "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0"))))
(base32 "1xfil1a138k7a83rqmrgmhklmasgspgdqszn8nyyn3vrnh7ny0nh"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)
("execline" ,execline)))
@ -150,14 +150,14 @@ functionality with a very small amount of code.")))
(define-public s6-dns
(package
(name "s6-dns")
(version "2.3.4.0")
(version "2.3.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-"
version ".tar.gz"))
(sha256
(base32 "03s94bc1y2yf0i3v3gh27xz3l2ycf246nb29mrf1zm4v9kdff5fn"))))
(base32 "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments

View file

@ -101,7 +101,52 @@
for Python projects or other documents consisting of multiple reStructuredText
sources.")
(license license:bsd-2)
(properties `((python2-variant . ,(delay python-sphinx))))))
(properties `((python2-variant . ,(delay python2-sphinx))))))
;; Sphinx 2 does not support Python 2, so we stick with this older version here.
(define-public python2-sphinx
(let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
(package
(inherit base)
(version "1.7.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
"0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-before 'check 'disable-broken-tests
(lambda _
(for-each delete-file
;; These tests are broken when using Python2:
;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
'("tests/test_api_translator.py"
"tests/test_setup_command.py"
;; This one fails for unknown reasons.
"tests/test_correct_year.py"))))))))
(native-inputs `(("python2-mock" ,python2-mock)
("python2-enum34" ,python2-enum34)
,@(package-native-inputs base)))
;; Sphinx 2 has some dependencies that do not support Python 2, so
;; we keep our own propagated-inputs here instead of inheriting.
(propagated-inputs
`(("python2-pytz" ,python2-pytz)
("python2-typing" ,python2-typing)
("python2-imagesize" ,python2-imagesize)
("python2-sphinx-alabaster-theme" ,python2-sphinx-alabaster-theme)
("python2-babel" ,python2-babel)
("python2-snowballstemmer" ,python2-snowballstemmer)
("python2-docutils" ,python2-docutils-0.14)
("python2-jinja2" ,python2-jinja2)
("python2-packaging" ,python2-packaging)
("python2-pygments" ,python2-pygments)
("python2-requests" ,python2-requests)
("python2-six" ,python2-six)
("python2-sphinxcontrib-websupport" ,python2-sphinxcontrib-websupport))))))
(define-public python-sphinxcontrib-applehelp
(package

View file

@ -505,13 +505,23 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.")
"https://matt.ucc.asn.au/dropbear/releases/"
"dropbear-" version ".tar.bz2"))
(sha256
(base32 "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"))))
(base32 "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "libtommath")
(delete-file-recursively "libtomcrypt")
(substitute* "configure"
(("-ltomcrypt") "-ltomcrypt -ltommath"))
#t))))
(build-system gnu-build-system)
(arguments `(#:tests? #f)) ; there is no "make check" or anything similar
;; TODO: Investigate unbundling libtommath and libtomcrypt or at least
;; cherry-picking important bug fixes from them. See <bugs.gnu.org/24674>
;; for more information.
(inputs `(("zlib" ,zlib)))
(arguments
`(#:configure-flags '("--disable-bundled-libtom")
#:tests? #f)) ; there is no "make check" or anything similar
(inputs
`(("libtomcrypt" ,libtomcrypt)
("libtommath" ,libtommath)
("zlib" ,zlib)))
(synopsis "Small SSH server and client")
(description "Dropbear is a relatively small SSH server and
client. It runs on a variety of POSIX-based platforms. Dropbear is

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