Merge branch 'master' into core-updates-frozen

This commit is contained in:
Ludovic Courtès 2021-11-17 23:24:42 +01:00
commit 3a317f7476
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
163 changed files with 5805 additions and 1929 deletions

View file

@ -94,17 +94,6 @@ if test "x$guix_build_daemon" = "xyes"; then
AC_CHECK_FUNCS([lutimes lchown posix_fallocate sched_setaffinity \
statvfs nanosleep strsignal statx])
dnl Check whether the store optimiser can optimise symlinks.
AC_MSG_CHECKING([whether it is possible to create a link to a symlink])
ln -s bla tmp_link
if ln tmp_link tmp_link2 2> /dev/null; then
AC_MSG_RESULT(yes)
AC_DEFINE(CAN_LINK_SYMLINK, 1, [Whether link() works on symlinks.])
else
AC_MSG_RESULT(no)
fi
rm -f tmp_link tmp_link2
dnl Check for <locale>.
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS([locale])

View file

@ -5654,7 +5654,7 @@ spawning a @dfn{container} isolated from the rest of the system:
guix shell --container emacs gcc-toolchain
@end example
The command above spawns an interactive shell in a container when
The command above spawns an interactive shell in a container where
nothing but @code{emacs}, @code{gcc-toolchain}, and their dependencies
is available. The container lacks network access and shares no files
other than the current working directory with the surrounding
@ -11571,7 +11571,7 @@ a container similar to the one the build daemon creates:
$ guix build -K foo
@dots{}
$ cd /tmp/guix-build-foo.drv-0
$ guix shell --no-grafts -C foo strace gdb
$ guix shell --no-grafts -C -D foo strace gdb
[env]# source ./environment-variables
[env]# cd foo-1.2
@end example
@ -11830,13 +11830,19 @@ information, including package dependencies. For maximum efficiency, it
is recommended to install the @command{unzip} utility, so that the
importer can unzip Python wheels and gather data from them.
The command below imports metadata for the @code{itsdangerous} Python
package:
The command below imports metadata for the latest version of the
@code{itsdangerous} Python package:
@example
guix import pypi itsdangerous
@end example
You can also ask for a specific version:
@example
guix import pypi itsdangerous@@1.1.0
@end example
@table @code
@item --recursive
@itemx -r
@ -11934,6 +11940,12 @@ The command command below imports metadata for the Cairo R package:
guix import cran Cairo
@end example
You can also ask for a specific version:
@example
guix import cran rasterVis@@0.50.3
@end example
When @option{--recursive} is added, the importer will traverse the
dependency graph of the given upstream package recursively and generate
package expressions for all those packages that are not yet in Guix.
@ -18859,8 +18871,7 @@ and tty8.
@lisp
(use-modules (gnu services)
(gnu services desktop)
(gnu services xorg)
(srfi srfi-1)) ;for 'remove'
(gnu services xorg))
(operating-system
;; ...
@ -19755,7 +19766,7 @@ Defaults to @samp{1048576}.
Specifies the maximum amount of time to allow between files in a
multiple file print job, in seconds.
Defaults to @samp{300}.
Defaults to @samp{900}.
@end deftypevr
@deftypevr {@code{cups-configuration} parameter} string page-log-format
@ -19966,7 +19977,7 @@ Defaults to @samp{#f}.
@deftypevr {@code{cups-configuration} parameter} non-negative-integer timeout
Specifies the HTTP request timeout, in seconds.
Defaults to @samp{300}.
Defaults to @samp{900}.
@end deftypevr
@ -26767,6 +26778,12 @@ complete example}.
@item @code{package} (default: @code{hpcguix-web})
The hpcguix-web package to use.
@item @code{address} (default: @code{"127.0.0.1"})
The IP address to listen to.
@item @code{port} (default: @code{5000})
The port number to listen to.
@end table
@end deftp
@ -30275,6 +30292,53 @@ Return the name of @var{platform}---a string such as @code{"arm"}.
@end deffn
@subsubheading QEMU Guest Agent
@cindex emulation
The QEMU guest agent provides control over the emulated system to the
host. The @code{qemu-guest-agent} service runs the agent on Guix
guests. To control the agent from the host, open a socket by invoking
QEMU with the following arguments:
@example
qemu-system-x86_64 \
-chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \
-device virtio-serial \
-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
...
@end example
This creates a socket at @file{/tmp/qga.sock} on the host. Once the
guest agent is running, you can issue commands with @code{socat}:
@example
$ guix shell socat -- socat unix-connect:/tmp/qga.sock stdio
@{"execute": "guest-get-host-name"@}
@{"return": @{"host-name": "guix"@}@}
@end example
See @url{https://wiki.qemu.org/Features/GuestAgent,QEMU guest agent
documentation} for more options and commands.
@defvr {Scheme Variable} qemu-guest-agent-service-type
Service type for the QEMU guest agent service.
@end defvr
@deftp {Data Type} qemu-guest-agent-configuration
Configuration for the @code{qemu-guest-agent} service.
@table @asis
@item @code{qemu} (default: @code{qemu-minimal})
The QEMU package to use.
@item @code{device} (default: @code{""})
File name of the device or socket the agent uses to communicate with the
host. If empty, QEMU uses a default file name.
@end table
@end deftp
@subsubheading The Hurd in a Virtual Machine
@cindex @code{hurd}
@ -36142,6 +36206,14 @@ guix home reconfigure config.scm
This ``builds'' your home environment and creates @file{~/.guix-home}
pointing to it. Voilà!
@quotation Note
Make sure the operating system has elogind, systemd, or a similar
mechanism to create the XDG run-time directory and has the
@env{XDG_RUNTIME_DIR} variable set. Failing that, the
@file{on-first-login} script will not execute anything, and processes
like user Shepherd and its descendants will not start.
@end quotation
@node Configuring the Shell
@section Configuring the Shell
This section is safe to skip if your shell or shells are managed by

View file

@ -81,7 +81,8 @@ EXTRA_DIST += \
OS_CONFIG_EXAMPLES_TEXI = \
%D%/os-config-bare-bones.texi \
%D%/os-config-desktop.texi \
%D%/os-config-lightweight-desktop.texi
%D%/os-config-lightweight-desktop.texi \
%D%/he-config-bare-bones.scm
TRANSLATED_INFO = \
$(call lang_to_texinfo,$(MANUAL_LANGUAGES),guix) \

View file

@ -94,6 +94,7 @@ (define (install-efi-loader grub-efi esp)
;; (not eliminate it).
(format port
"insmod part_msdos~@
insmod part_gpt~@
search --set=root --label Guix_image~@
configfile /boot/grub/grub.cfg~%")))
(install-efi grub-efi grub-config esp)

View file

@ -275,7 +275,7 @@ (define home-files-service-type
will be put in @file{~/.guix-home/files}.")))
(define (compute-on-first-login-script _ gexps)
(gexp->script
(program-file
"on-first-login"
#~(let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR")
(format #f "/run/user/~a" (getuid))))
@ -286,14 +286,19 @@ (define (compute-on-first-login-script _ gexps)
;; XDG_RUNTIME_DIR dissapears on logout, that means such trick
;; allows to launch on-first-login script on first login only
;; after complete logout/reboot.
(when (not (file-exists? flag-file-path))
(begin #$@gexps (touch flag-file-path))))))
(if (file-exists? xdg-runtime-dir)
(unless (file-exists? flag-file-path)
(begin #$@gexps (touch flag-file-path)))
(display "XDG_RUNTIME_DIR doesn't exists, on-first-login script
won't execute anything. You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to apropriate value and manually execute the
script by running '$HOME/.guix-home/on-first-login'")))))
(define (on-first-login-script-entry m-on-first-login)
(define (on-first-login-script-entry on-first-login)
"Return, as a monadic value, an entry for the on-first-login script
in the home environment directory."
(mlet %store-monad ((on-first-login m-on-first-login))
(return `(("on-first-login" ,on-first-login)))))
(with-monad %store-monad
(return `(("on-first-login" ,on-first-login)))))
(define home-run-on-first-login-service-type
(service-type (name 'home-run-on-first-login)
@ -346,7 +351,7 @@ (define (compute-activation-script init-gexp gexps)
(unless new-home-env (setenv "GUIX_NEW_HOME" #f))
(unless old-home-env (setenv "GUIX_OLD_HOME" #f)))
(format #t "\
Activation script was either called or loaded by file from this direcotry:
Activation script was either called or loaded by file from this directory:
~a
It doesn't seem that home environment is somewhere around.
Make sure that you call ./activate by symlink from -home store item.\n"

View file

@ -69,7 +69,7 @@ (define-configuration home-shell-profile-configuration
@code{profile} is a list of file-like objects, which will go to
@file{~/.profile}. By default @file{~/.profile} contains the
initialization code, which have to be evaluated by login shell to make
home-environment's profile avaliable to the user, but other commands
home-environment's profile available to the user, but other commands
can be added to the file if it is really necessary.
In most cases shell's configuration files are preferred places for
@ -420,9 +420,9 @@ (define* (file-if-not-empty field #:optional (extra-content #f))
(not (null? ((configuration-field-getter field-obj) config))))
`(,(object->snake-case-string file-name)
,(apply mixed-text-file
(object->snake-case-string file-name)
(cons (serialize-field field)
(if extra-content extra-content '()))))
(object->snake-case-string file-name)
(append (or extra-content '())
(list (serialize-field field)))))
'())))
(filter

View file

@ -28,7 +28,7 @@ (define-module (gnu home services utils)
list->human-readable-list))
(define (maybe-object->string object)
"Like @code{object->string} but don't do anyting if OBJECT already is
"Like @code{object->string} but don't do anything if OBJECT already is
a string."
(if (string? object)
object

View file

@ -136,7 +136,7 @@ (define home-xdg-base-directories-service-type
(description "Configure XDG base directories. This
service introduces two additional variables @env{XDG_STATE_HOME},
@env{XDG_LOG_HOME}. They are not a part of XDG specification, at
least yet, but are convinient to have, it improves the consistency
least yet, but are convenient to have, it improves the consistency
between different home services. The services of this service-type is
instantiated by default, to provide non-default value, extend the
service-type (using @code{simple-service} for example).")))

View file

@ -38,6 +38,7 @@ (define-module (gnu image)
image-platform
image-size
image-operating-system
image-partition-table-type
image-partitions
image-compression?
image-volatile-root?
@ -86,6 +87,8 @@ (define-record-type* <image>
(default 'guess))
(operating-system image-operating-system ;<operating-system>
(default #f))
(partition-table-type image-partition-table-type ; 'mbr or 'gpt
(default 'mbr))
(partitions image-partitions ;list of <partition>
(default '()))
(compression? image-compression? ;boolean

View file

@ -872,24 +872,7 @@ dist_patch_DATA = \
%D%/packages/patches/avahi-localstatedir.patch \
%D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-auth-cmake-prefix.patch \
%D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
%D%/packages/patches/aws-c-cal-cmake-prefix.patch \
%D%/packages/patches/aws-c-compression-cmake-prefix.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-c-http-cmake-prefix.patch \
%D%/packages/patches/aws-c-http-disable-networking-tests.patch\
%D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \
%D%/packages/patches/aws-c-io-cmake-prefix.patch \
%D%/packages/patches/aws-c-io-disable-networking-tests.patch \
%D%/packages/patches/aws-c-s3-cmake-prefix.patch \
%D%/packages/patches/aws-c-s3-disable-networking-tests.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/aws-crt-cpp-cmake-prefix.patch \
%D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch \
%D%/packages/patches/aws-sdk-cpp-cmake-prefix.patch \
%D%/packages/patches/aws-sdk-cpp-disable-networking-tests.patch \
%D%/packages/patches/aws-sdk-cpp-disable-werror.patch \
%D%/packages/patches/aws-c-auth-install-private-headers.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
%D%/packages/patches/bash-completion-directories.patch \
@ -1129,7 +1112,7 @@ dist_patch_DATA = \
%D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \
%D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \
%D%/packages/patches/geary-CVE-2020-24661.patch \
%D%/packages/patches/genimage-signedness.patch \
%D%/packages/patches/genimage-mke2fs-test.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
@ -1739,6 +1722,7 @@ dist_patch_DATA = \
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
%D%/packages/patches/rustc-1.39.0-src.patch \
%D%/packages/patches/rust-adblock-ignore-live-tests.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \

View file

@ -321,9 +321,6 @@ (define-public guile2.2-shepherd
`(("guile" ,guile-2.2)
("guile2.2-readline" ,guile2.2-readline)))))
(define-public guile3.0-shepherd
(deprecated-package "guile3.0-shepherd" shepherd))
(define-public guile2.0-shepherd
(package
(inherit shepherd)
@ -3224,13 +3221,13 @@ (define-public thefuck
(define-public di
(package
(name "di")
(version "4.50")
(version "4.51")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz"))
(sha256
(base32 "0aj9ldkvmj8fmrk685vd2gagz0q8lwsn2nfbx6r6mza94mn8pw42"))))
(base32 "1fv12j9b9sw6p38lcbzcw87zl5qp1aa7a4a4jn3449zz9af15ckr"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; obscure test failures
@ -3240,8 +3237,7 @@ (define-public di
(add-before 'build 'setup-environment
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" ,(cc-for-target))
(setenv "prefix" (assoc-ref outputs "out"))
#t)))
(setenv "prefix" (assoc-ref outputs "out")))))
#:make-flags (list "--environment-overrides")))
(home-page "https://gentoo.com/di/")
(synopsis "Advanced df like disk information utility")

View file

@ -109,3 +109,25 @@ (define-public c-ares/cmake
(arguments
`(;; XXX: Tests require name resolution (the normal variant runs no tests).
#:tests? #f)))))
(define-public c-ares-for-node
(hidden-package
(package
(inherit c-ares)
(name "c-ares")
(version "1.18.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://c-ares.haxx.se/download/" name "-" version
".tar.gz"))
(sha256
(base32
"1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s"))))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'filter-live-tests
(lambda _
;; Filter tests that require internet access.
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))))))))

View file

@ -6,6 +6,8 @@
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -56,6 +58,7 @@ (define-module (gnu packages astronomy)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@ -580,7 +583,7 @@ (define-public celestia
;; maybe required?
("mesa" ,mesa)
;; optional: fmtlib, Eigen3;
("fmt" ,fmt)
("fmt" ,fmt-7)
("eigen" ,eigen)
;; glut: for glut interface
("freeglut" ,freeglut)))
@ -612,6 +615,100 @@ (define-public celestia-gtk
`(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
#:tests? #f))))
(define-public python-astropy
(package
(name "python-astropy")
(version "4.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astropy" version))
(sha256
(base32 "0lfd6n7v7kas4wvacddnwgccax3ks908735dzilg7dsf7ci52f9d"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove Python bundles.
(with-directory-excursion "astropy/extern"
(for-each delete-file-recursively '("ply" "configobj")))
;; Remove cextern bundles and leave the wcslib bundle. Astropy
;; upgrades to different versions of wcslib every few releases
;; and tests break every upgrade.
;; TODO: unbundle wcslib.
(with-directory-excursion "cextern"
(for-each delete-file-recursively '("cfitsio" "expat")))
#t))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'preparations
(lambda _
;; Use our own libraries in place of bundles, with the
;; exception of wcslib.
(setenv "ASTROPY_USE_SYSTEM_CFITSIO" "1")
(setenv "ASTROPY_USE_SYSTEM_EXPAT" "1")
;; Some tests require a writable home.
(setenv "HOME" "/tmp")
;; Relax xfail tests.
(substitute* "setup.cfg"
(("xfail_strict = true") "xfail_strict = false"))
;; Replace all references to external ply.
(let ((ply-files '("coordinates/angle_formats.py"
"utils/parsing.py")))
(with-directory-excursion "astropy"
(map (lambda (file)
(substitute* file (("astropy.extern.ply")
"ply")))
ply-files)))
;; Replace reference to external configobj.
(with-directory-excursion "astropy/config"
(substitute* "configuration.py"
(("from astropy.extern.configobj ") "")))))
;; This file is opened in both install and check phases.
(add-before 'install 'writable-compiler
(lambda _ (make-file-writable "astropy/_compiler.c")))
(add-before 'check 'writable-compiler
(lambda _ (make-file-writable "astropy/_compiler.c")))
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
;; Extensions have to be rebuilt before running the tests.
(invoke "python" "setup.py" "build_ext" "--inplace")
(invoke "python" "-m" "pytest" "--pyargs" "astropy"
;; Skip tests that need remote data.
"-m" "not remote_data")))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-coverage" ,python-coverage)
("python-cython" ,python-cython)
("python-extension-helpers" ,python-extension-helpers)
("python-ipython" ,python-ipython)
("python-jplephem" ,python-jplephem)
("python-objgraph" ,python-objgraph)
("python-pytest" ,python-pytest)
("python-pytest-astropy" ,python-pytest-astropy)
("python-pytest-xdist" ,python-pytest-xdist)
("python-setuptools-scm" ,python-setuptools-scm)
("python-sgp4" ,python-sgp4)
("python-skyfield" ,python-skyfield)))
(inputs
`(("cfitsio" ,cfitsio)
("expat" ,expat)))
(propagated-inputs
`(("python-configobj" ,python-configobj)
("python-numpy" ,python-numpy)
("python-ply" ,python-ply)
("python-pyerfa" ,python-pyerfa)))
(home-page "https://www.astropy.org/")
(synopsis "Core package for Astronomy in Python")
(description
"Astropy is a single core package for Astronomy in Python. It contains
much of the core functionality and some common tools needed for performing
astronomy and astrophysics.")
(license license:bsd-3)))
(define-public libnova
(package
(name "libnova")
@ -952,13 +1049,13 @@ (define-public indi
(define-public python-jplephem
(package
(name "python-jplephem")
(version "2.15")
(version "2.16")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jplephem" version))
(sha256
(base32 "1ca3dswsslij79qg6dcijjz4l0fj6nzmxld8z93v45ahlkhps0g0"))))
(base32 "1xvivnsywjaf5lxn3kyg2jhhq393gcwkjrl634m8dn52ypidrcdb"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1006,12 +1103,13 @@ (define-public python-pyerfa
(setenv "PYERFA_USE_SYSTEM_LIBERFA" "1")
#t)))))
(native-inputs
`(("pytest" ,python-pytest)
("setuptools-scm" ,python-setuptools-scm)
("pytest-doctestplus" ,python-pytest-doctestplus)))
`(("pytest-doctestplus" ,python-pytest-doctestplus)
("python-pytest" ,python-pytest)
("python-setuptools-scm" ,python-setuptools-scm)))
(inputs
`(("liberfa" ,erfa)
("numpy" ,python-numpy)))
`(("liberfa" ,erfa)))
(propagated-inputs
`(("python-numpy" ,python-numpy)))
(home-page "https://github.com/liberfa/pyerfa")
(synopsis "Python bindings for ERFA")
(description

View file

@ -2840,7 +2840,7 @@ (define-public freealut
(define-public patchage
(package
(name "patchage")
(version "1.0.2")
(version "1.0.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/patchage-"
@ -2848,11 +2848,10 @@ (define-public patchage
".tar.bz2"))
(sha256
(base32
"0dk3fiac10m83mwss3026yz7ygc47c2iw924cwwnh2fyydc9bsy6"))))
"0gbakiw3mikgbvy3pssrmqmn7z5c7kp4vyaxj5rs4jnkscxgw9vw"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no check target
#:python ,python-2))
`(#:tests? #f)) ; no check target
(inputs
`(("alsa-lib" ,alsa-lib)
("boost" ,boost)
@ -2863,7 +2862,7 @@ (define-public patchage
("dbus-glib" ,dbus-glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://drobilla.net/software/patchage/")
(home-page "https://drobilla.net/software/patchage.html")
(synopsis "Modular patch bay for audio and MIDI systems")
(description
"Patchage is a modular patch bay for audio and MIDI systems based on JACK
@ -2906,14 +2905,14 @@ (define-public pcaudiolib
(define-public qjackctl
(package
(name "qjackctl")
(version "0.9.4")
(version "0.9.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
version "/qjackctl-" version ".tar.gz"))
(sha256
(base32
"186rg3j67rac9ds1r7gnrib2d0smgv15cmr5gwb7v83mywcp1gzy"))))
"1g61xwsxsndwlnh4547vl7jfcf4kqlbb4394jq2m8qbbzk51b6rv"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no check target

View file

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 20172021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
@ -80,6 +80,7 @@ (define-module (gnu packages backup)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages rsync)
#:use-module (gnu packages serialization)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
@ -88,7 +89,7 @@ (define-module (gnu packages backup)
(define-public duplicity
(package
(name "duplicity")
(version "0.8.20")
(version "0.8.21")
(source
(origin
(method url-fetch)
@ -97,7 +98,7 @@ (define-public duplicity
"-series/" version "/+download/duplicity-"
version ".tar.gz"))
(sha256
(base32 "0d125mxknpn44xwgqzzak9y5ydigscrpjv9d63126mfc6yfngr5v"))))
(base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp"))))
(build-system python-build-system)
(native-inputs
`(("gettext" ,gettext-minimal) ; for msgfmt
@ -138,8 +139,7 @@ (define-public duplicity
"/bin/dbus-launch']")))
(substitute* '("testing/functional/__init__.py"
"testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
#t))
(("/bin/sh") (which "sh")))))
(add-before 'check 'set-up-tests
(lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" (getcwd)) ; gpg needs to write to $HOME
@ -147,8 +147,7 @@ (define-public duplicity
(search-input-directory inputs "share/zoneinfo"))
;; Some things respect TMPDIR, others hard-code /tmp, and the
;; defaults don't match up, breaking test_restart. Fix it.
(setenv "TMPDIR" "/tmp")
#t)))))
(setenv "TMPDIR" "/tmp"))))))
(home-page "https://duplicity.gitlab.io/duplicity-web/")
(synopsis "Encrypted backup using rsync algorithm")
(description
@ -1170,3 +1169,51 @@ (define-public disarchive
Gzip will need to describe the order of files in the tarball and the
compression parameters used by Gzip.")
(license license:gpl3+)))
(define-public borgmatic
(package
(name "borgmatic")
(version "1.5.20")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgmatic" version))
(sha256
(base32 "1rdpj1mii4fbyprg56krf5k0xsd97ghybaabr7zdhsrcsxf719ha"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
;; Set absolute store path to borg.
(substitute* "borgmatic/commands/borgmatic.py"
(("location\\.get\\('local_path', 'borg'\\)")
(string-append "location.get('local_path', '"
(assoc-ref inputs "borg") "/bin/borg"
"')")))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
;; Tests require the installed executable.
(setenv "PATH" (string-append (assoc-ref outputs "out") "/bin"
":" (getenv "PATH")))
(invoke "pytest")))))))
(inputs
`(("borg" ,borg)
("python-colorama" ,python-colorama)
("python-jsonschema" ,python-jsonschema)
("python-requests" ,python-requests)
("python-ruamel.yaml" ,python-ruamel.yaml)))
(native-inputs
`(("python-flexmock" ,python-flexmock)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)))
(home-page "https://torsion.org/borgmatic/")
(synopsis "Simple, configuration-driven backup software")
(description
"borgmatic is simple, configuration-driven backup software for servers
and workstations. Protect your files with client-side encryption. Backup
your databases too. Monitor it all with integrated third-party services.
borgmatic is powered by borg.")
(license license:gpl3+)))

View file

@ -172,9 +172,6 @@ (define (benchmark? file stat)
@end itemize")
(license license:cpl1.0)))
(define-public imb-openmpi
(deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi))
(define-public multitime
(package
(name "multitime")

View file

@ -13123,7 +13123,7 @@ (define-public r-msfeatures
"The MsFeature package defines functionality for Mass Spectrometry
features. This includes functions to group (LC-MS) features based on some of
their properties, such as retention time (coeluting features), or correlation
of signals across samples. This packge hence allows to group features, and
of signals across samples. This package hence allows to group features, and
its results can be used as an input for the @code{QFeatures} package which
allows to aggregate abundance levels of features within each group. This
package defines concepts and functions for base and common data types,

View file

@ -48,6 +48,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (guix hg-download)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system go)
#:use-module (guix build-system haskell)
@ -77,6 +78,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpio)
#:use-module (gnu packages cran)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages databases)
@ -141,6 +143,7 @@ (define-module (gnu packages bioinformatics)
#:use-module (gnu packages serialization)
#:use-module (gnu packages shells)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages statistics)
#:use-module (gnu packages swig)
#:use-module (gnu packages tbb)
@ -1295,6 +1298,128 @@ (define-public python-fastalite
(define-public python2-fastalite
(package-with-python2 python-fastalite))
(define-public biosoup
(package
(name "biosoup")
(version "0.10.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rvaser/biosoup")
;; Corresponds to version 0.10.0
(commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6")))
(file-name (git-file-name name version))
(sha256
(base32
"02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./bin/biosoup_test")))))))
(native-inputs
`(("googletest" ,googletest)))
(home-page "https://github.com/rvaser/biosoup")
(synopsis "C++ support library for bioinformatics tools")
(description "Biosoup is a C++ collection of header-only data structures
used for storage and logging in bioinformatics tools.")
(license license:expat)))
(define-public bioparser
(package
(name "bioparser")
(version "3.0.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rvaser/bioparser")
;; Corresponds to tag 3.0.13
(commit "13341e6e0855c6b358ffcea6dad216e1009e1287")))
(file-name (git-file-name name version))
(sha256
(base32
"0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "./bin/bioparser_test")))))))
(inputs
`(("biosoup" ,biosoup)))
(propagated-inputs
`(("zlib" ,zlib)))
(native-inputs
`(("googletest" ,googletest)))
(home-page "https://github.com/rvaser/bioparser")
(synopsis "C++ library for parsing several formats in bioinformatics")
(description "Bioparser is a C++ header only parsing library for several
bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib
compressed files.")
(license license:expat)))
(define-public circtools
(package
(name "circtools")
(version "1.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Kevinzjy/circtools")
;; Corresponds to tag v1.0.0
(commit "79380de59013601021ca3b1352d6f64d2fb89646")
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32
"0wg1s927g32k25j967kfr8l30nmr4c0p4zvy5igvy7cs6chd60lh"))))
(build-system cargo-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-writable
(lambda _
(for-each make-file-writable (find-files "."))))
(add-after 'unpack 'prepare-spoa-dependencies
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "vendor/spoa/CMakeLists.txt"
(("find_package\\(bioparser 3.0.13 QUIET\\)")
"find_package(bioparser 3.0.13 CONFIG)")
(("find_package\\(biosoup 0.10.0 QUIET\\)")
"find_package(biosoup 0.10.0 CONFIG)")
(("GTest_FOUND") "TRUE")))))
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-bio" ,rust-bio-0.33)
("rust-chrono" ,rust-chrono-0.4)
("rust-docopt" ,rust-docopt-1)
("rust-flate2" ,rust-flate2-1)
("rust-indicatif" ,rust-indicatif-0.15)
("rust-libc" ,rust-libc-0.2)
("rust-serde" ,rust-serde-1)
("rust-seq-io" ,rust-seq-io-0.3))))
(inputs
`(("bioparser" ,bioparser)
("biosoup" ,biosoup)))
(native-inputs
`(("cmake" ,cmake)
("pkg-config" ,pkg-config)
("googletest" ,googletest)))
(home-page "https://github.com/Kevinzjy/circtools")
(synopsis "Accelerating functions in CIRI toolkit")
(description "This package provides accelerated functions for the CIRI
toolkit. It also provides the @code{ccs} executable to scan for circular
consensus sequences.")
(license license:expat)))
(define-public ciri-long
(package
(name "ciri-long")
@ -1323,11 +1448,21 @@ (define-public ciri-long
(add-before 'build 'build-libssw
(lambda _
(with-directory-excursion "libs/striped_smith_waterman"
(invoke "make" "libssw.so")))))))
(invoke "make" "libssw.so"))))
(add-before 'build 'fix-reference-to-ccs
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CIRI_long/pipeline.py"
(("'ccs -i")
(string-append "'"
(assoc-ref inputs "circtools") "/bin/ccs"
" -i")))
;; yuck!
(substitute* "CIRI_long/main.py"
(("os.chmod\\(lib_path.*") "")))))))
(inputs
`(("python-biopython" ,python-biopython)
`(("circtools" ,circtools)
("python-biopython" ,python-biopython)
("python-bwapy" ,python-bwapy)
("python-cython" ,python-cython)
("python-levenshtein" ,python-levenshtein)
("python-mappy" ,python-mappy)
("python-numpy" ,python-numpy)
@ -1337,7 +1472,8 @@ (define-public ciri-long
("python-scikit-learn" ,python-scikit-learn)
("python-scipy" ,python-scipy)))
(native-inputs
`(("python-nose" ,python-nose)
`(("python-cython" ,python-cython)
("python-nose" ,python-nose)
("python-setuptools" ,python-setuptools)))
(home-page "https://ciri-cookbook.readthedocs.io/")
(synopsis "Circular RNA identification for Nanopore sequencing")
@ -11794,47 +11930,48 @@ (define-public python-scanpy
wheel (string-append "--prefix=" out)))
(find-files "dist" "\\.whl$")))))
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
;; These tests require Internet access.
(delete-file-recursively "scanpy/tests/notebooks")
(delete-file "scanpy/tests/test_clustering.py")
(delete-file "scanpy/tests/test_datasets.py")
(delete-file "scanpy/tests/test_score_genes.py")
(delete-file "scanpy/tests/test_highly_variable_genes.py")
(lambda* (#:key tests? inputs #:allow-other-keys)
(when tests?
;; These tests require Internet access.
(delete-file-recursively "scanpy/tests/notebooks")
(delete-file "scanpy/tests/test_clustering.py")
(delete-file "scanpy/tests/test_datasets.py")
(delete-file "scanpy/tests/test_score_genes.py")
(delete-file "scanpy/tests/test_highly_variable_genes.py")
;; TODO: I can't get the plotting tests to work, even with Xvfb.
(delete-file "scanpy/tests/test_embedding_plots.py")
(delete-file "scanpy/tests/test_preprocessing.py")
(delete-file "scanpy/tests/test_read_10x.py")
;; TODO: I can't get the plotting tests to work, even with Xvfb.
(delete-file "scanpy/tests/test_embedding_plots.py")
(delete-file "scanpy/tests/test_preprocessing.py")
(delete-file "scanpy/tests/test_read_10x.py")
;; TODO: these fail with TypingError and "Use of unsupported
;; NumPy function 'numpy.split'".
(delete-file "scanpy/tests/test_metrics.py")
;; TODO: these fail with TypingError and "Use of unsupported
;; NumPy function 'numpy.split'".
(delete-file "scanpy/tests/test_metrics.py")
;; The following tests requires 'scanorama', which isn't
;; packaged yet.
(delete-file "scanpy/tests/external/test_scanorama_integrate.py")
;; The following tests requires 'scanorama', which isn't
;; packaged yet.
(delete-file "scanpy/tests/external/test_scanorama_integrate.py")
(setenv "PYTHONPATH"
(string-append (getcwd) ":"
(assoc-ref inputs "python-anndata:source") ":"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv"
"-k"
;; Plot tests that fail.
(string-append "not test_dotplot_matrixplot_stacked_violin"
" and not test_violin_without_raw"
" and not test_correlation"
" and not test_scatterplots"
" and not test_scatter_embedding_add_outline_vmin_vmax_norm"
" and not test_paga"
" and not test_paga_compare"
(setenv "PYTHONPATH"
(string-append (getcwd) ":"
(assoc-ref inputs "python-anndata:source") ":"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv"
"-k"
;; Plot tests that fail.
(string-append "not test_dotplot_matrixplot_stacked_violin"
" and not test_violin_without_raw"
" and not test_correlation"
" and not test_scatterplots"
" and not test_scatter_embedding_add_outline_vmin_vmax_norm"
" and not test_paga"
" and not test_paga_compare"
;; These try to connect to the network
" and not test_plot_rank_genes_groups_gene_symbols"
" and not test_pca_chunked"
" and not test_pca_sparse"
" and not test_pca_reproducible")))))))
;; These try to connect to the network
" and not test_plot_rank_genes_groups_gene_symbols"
" and not test_pca_chunked"
" and not test_pca_sparse"
" and not test_pca_reproducible"))))))))
(propagated-inputs
`(("python-anndata" ,python-anndata)
("python-h5py" ,python-h5py)
@ -13470,7 +13607,8 @@ (define-public pplacer
("ocaml-sqlite3" ,(package-with-ocaml4.07 ocaml-sqlite3))
("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm))
("ocaml-mcl" ,(package-with-ocaml4.07 ocaml-mcl))
("ocaml-gsl" ,ocaml4.07-gsl-1)))
("ocaml-gsl" ,ocaml4.07-gsl-1)
("sqlite:static" ,sqlite "static")))
(native-inputs
`(("cddlib-src" ,(package-source cddlib))
("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))

View file

@ -280,6 +280,13 @@ (define-public boost-for-irods
(define-public boost-with-python3
(deprecated-package "boost-with-python3" boost))
(define-public boost-with-python2
(package/inherit boost
(name "boost-python2")
(native-inputs
`(("python" ,python-2)
,@(alist-delete "python" (package-native-inputs boost))))))
(define-public boost-static
(package
(inherit boost)

View file

@ -540,7 +540,7 @@ (define u-boot
(build-system gnu-build-system)
(home-page "https://www.denx.de/wiki/U-Boot/")
(synopsis "ARM bootloader")
(description "U-Boot is a bootloader used mostly for ARM boards. It
(description "U-Boot is a bootloader used mostly for ARM boards. It
also initializes the boards (RAM etc).")
(license license:gpl2+)))
@ -739,7 +739,7 @@ (define-public u-boot-am335x-boneblack
(package
(inherit base)
(name "u-boot-am335x-boneblack")
(description "U-Boot is a bootloader used mostly for ARM boards. It
(description "U-Boot is a bootloader used mostly for ARM boards. It
also initializes the boards (RAM etc).
This U-Boot is built for the BeagleBone Black, which was removed upstream,
@ -859,7 +859,7 @@ (define-public u-boot-novena
(let ((base (make-u-boot-package "novena" "arm-linux-gnueabihf")))
(package
(inherit base)
(description "U-Boot is a bootloader used mostly for ARM boards. It
(description "U-Boot is a bootloader used mostly for ARM boards. It
also initializes the boards (RAM etc).
This U-Boot is built for Novena. Be advised that this version, contrary

View file

@ -103,7 +103,7 @@ (define-public bam
(define-public bear
(package
(name "bear")
(version "3.0.4")
(version "3.0.16")
(source (origin
(method git-fetch)
(uri (git-reference
@ -114,7 +114,7 @@ (define-public bear
"bear-disable-preinstall-tests.patch"))
(sha256
(base32
"15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn"))))
"01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases

View file

@ -252,14 +252,14 @@ (define-public libfixposix
(define-public libhx
(package
(name "libhx")
(version "4.1")
(version "4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://inai.de/files/libhx/"
"libHX-" version ".tar.xz"))
(sha256
(base32 "1mifpzxr5kma7gawhv1vbga8j5qi8jgka0axr48v08bdpb83pya2"))))
(base32 "1ri3sxiw5a8br27j7f20s40kihfvq6mmxzcrx68zydiwyxjvf5jj"))))
(build-system gnu-build-system)
(home-page "https://inai.de/projects/libhx/")
(synopsis "C library with common data structures and functions")
@ -553,7 +553,8 @@ (define-public unifdef
(define-public aws-c-common
(package
(name "aws-c-common")
(version "0.6.2")
; Update only when updating aws-crt-cpp.
(version "0.6.11")
(source (origin
(method git-fetch)
(uri (git-reference
@ -562,7 +563,7 @@ (define-public aws-c-common
(file-name (git-file-name name version))
(sha256
(base32
"17iknzqs6dl0ixajplc47ylkyynwpi3x2dxh56wa8ylhgy53d09x"))))
"1v4dhygiynl75y3702lbp9j8kph88j4f2sq39s4lkhn6lmbz5f0f"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
@ -577,6 +578,7 @@ (define-public aws-c-common
(define-public aws-checksums
(package
(name "aws-checksums")
; Update only when updating aws-crt-cpp.
(version "0.1.12")
(source (origin
(method git-fetch)
@ -586,12 +588,13 @@ (define-public aws-checksums
(file-name (git-file-name name version))
(sha256
(base32
"054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))
(patches (search-patches "aws-checksums-cmake-prefix.patch"))))
"054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(inputs
`(("aws-c-common" ,aws-c-common)))
(synopsis "Amazon Web Services checksum library")
@ -604,6 +607,7 @@ (define-public aws-checksums
(define-public aws-c-event-stream
(package
(name "aws-c-event-stream")
; Update only when updating aws-crt-cpp.
(version "0.2.7")
(source (origin
(method git-fetch)
@ -613,12 +617,13 @@ (define-public aws-c-event-stream
(file-name (git-file-name name version))
(sha256
(base32
"0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))
(patches (search-patches "aws-c-event-stream-cmake-prefix.patch"))))
"0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)
("aws-c-io" ,aws-c-io)
@ -637,7 +642,8 @@ (define-public aws-c-event-stream
(define-public aws-c-io
(package
(name "aws-c-io")
(version "0.10.5")
; Update only when updating aws-crt-cpp.
(version "0.10.9")
(source (origin
(method git-fetch)
(uri (git-reference
@ -646,15 +652,14 @@ (define-public aws-c-io
(file-name (git-file-name name version))
(sha256
(base32
"1jrnzs803jqprnvbw6rqr834qld5sd7flaqzgssp3099m189szpq"))
(patches
(search-patches
"aws-c-io-cmake-prefix.patch"
"aws-c-io-disable-networking-tests.patch"))))
"14rxa3k842fgk43702nz7z9y3clfhvax8j0k93i0c5vg14wj38yp"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-cal" ,aws-c-cal)
("aws-c-common" ,aws-c-common)
@ -668,7 +673,8 @@ (define-public aws-c-io
(define-public aws-c-cal
(package
(name "aws-c-cal")
(version "0.5.11")
; Update only when updating aws-crt-cpp.
(version "0.5.12")
(source (origin
(method git-fetch)
(uri (git-reference
@ -677,12 +683,13 @@ (define-public aws-c-cal
(file-name (git-file-name name version))
(sha256
(base32
"0rqqk4n56h8sf4q070rhgjwas04j8h0vq4wl1alq5l1rqq72qqdf"))
(patches (search-patches "aws-c-cal-cmake-prefix.patch"))))
"09zqf610x4g2mcjcaf9nh88k6dkw14pi721yr8hxb5rmsx7rlfrb"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)))
(inputs
@ -716,7 +723,8 @@ (define-public pcl
(define-public aws-c-http
(package
(name "aws-c-http")
(version "0.6.4")
; Update only when updating aws-crt-cpp.
(version "0.6.7")
(source (origin
(method git-fetch)
(uri (git-reference
@ -725,15 +733,14 @@ (define-public aws-c-http
(file-name (git-file-name name version))
(sha256
(base32
"18xlgz68zizkcp784bs6hkyx0gvp0f1p076i46z653bcd3qa87b4"))
(patches
(search-patches
"aws-c-http-cmake-prefix.patch"
"aws-c-http-disable-networking-tests.patch"))))
"1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-compression" ,aws-c-compression)
("aws-c-io" ,aws-c-io)))
@ -747,7 +754,8 @@ (define-public aws-c-http
(define-public aws-c-compression
(package
(name "aws-c-compression")
(version "0.2.13")
; Update only when updating aws-crt-cpp.
(version "0.2.14")
(source (origin
(method git-fetch)
(uri (git-reference
@ -756,12 +764,13 @@ (define-public aws-c-compression
(file-name (git-file-name name version))
(sha256
(base32
"0zqfxi0fdgapfsfgvsindv63pq7vyl1s376qkpv4jgflyb1v6gp5"))
(patches (search-patches "aws-c-compression-cmake-prefix.patch"))))
"0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)))
(synopsis "Amazon Web Services compression library")
@ -774,7 +783,8 @@ (define-public aws-c-compression
(define-public aws-c-auth
(package
(name "aws-c-auth")
(version "0.6.0")
; Update only when updating aws-crt-cpp.
(version "0.6.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -783,15 +793,17 @@ (define-public aws-c-auth
(file-name (git-file-name name version))
(sha256
(base32
"0yh9s6q3ahq39xgvihp2a5cn9h39qlq8wfjc32m0ayi9x739rbqg"))
"120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"))
(patches
(search-patches
"aws-c-auth-cmake-prefix.patch"
"aws-c-auth-disable-networking-tests.patch"))))
"aws-c-auth-install-private-headers.patch"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-cal" ,aws-c-cal)
("aws-c-common" ,aws-c-common)
@ -807,7 +819,8 @@ (define-public aws-c-auth
(define-public aws-c-s3
(package
(name "aws-c-s3")
(version "0.1.19")
; Update only when updating aws-crt-cpp.
(version "0.1.26")
(source (origin
(method git-fetch)
(uri (git-reference
@ -816,15 +829,14 @@ (define-public aws-c-s3
(file-name (git-file-name name version))
(sha256
(base32
"1vkjd8dh99d8qsl7irnbkcdf9vjmcznx0jz186la0472z4h48wjj"))
(patches
(search-patches
"aws-c-s3-cmake-prefix.patch"
"aws-c-s3-disable-networking-tests.patch"))))
"0gaxnwwk0jbvkgjnxcgchq13xmn7jk5vjvjsps6b0vaz6bf12wv8"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-auth" ,aws-c-auth)
("aws-c-http" ,aws-c-http)))
@ -838,6 +850,7 @@ (define-public aws-c-s3
(define-public aws-c-mqtt
(package
(name "aws-c-mqtt")
; Update only when updating aws-crt-cpp.
(version "0.7.8")
(source (origin
(method git-fetch)
@ -847,12 +860,13 @@ (define-public aws-c-mqtt
(file-name (git-file-name name version))
(sha256
(base32
"19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))
(patches (search-patches "aws-c-mqtt-cmake-prefix.patch"))))
"19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON")))
(list "-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
`(("aws-c-http" ,aws-c-http)
("aws-c-io" ,aws-c-io)))

View file

@ -73,8 +73,8 @@ (define-public guile-squee-dev
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass
(let ((commit "60190401ce4ccc890629ec3cb22a84a8ab8c2645")
(revision "4"))
(let ((commit "ea09658f13b3f440c2c755882fdfc7459a5d90fa")
(revision "5"))
(package
(name "cuirass")
(version (git-version "1.1.0" revision commit))
@ -87,7 +87,7 @@ (define-public cuirass
(file-name (git-file-name name version))
(sha256
(base32
"0b0bs32lzk5ck7lw8ac9dj2h70sqc5y430vhi7rcnwj48mdrchma"))))
"18w46v46rbibrkhp4ias1ns636f1dds0vv143x7fcchrw01hk71y"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build utils)

View file

@ -77,6 +77,7 @@ (define-module (gnu packages cpp)
#:use-module (gnu packages popt)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
@ -458,9 +459,6 @@ (define-public json-modern-cxx
intuitive syntax and trivial integration.")
(license license:expat)))
(define-public nlohmann-json-cpp
(deprecated-package "nlohmann-json-cpp" json-modern-cxx))
(define-public xtl
(package
(name "xtl")
@ -931,11 +929,14 @@ (define-public folly
(license license:asl2.0)))
(define-public aws-crt-cpp
(let* ((commit "c2d6ffa5597825111cc76ad71ffc6aef664d0f25")
(let* ((commit "b6d311d76b504bf8ace5134d3fca0e672c36c9c3")
(revision "1"))
(package
(name "aws-crt-cpp")
(version (git-version "0.14.2" revision commit))
; Update only when updating aws-sdk-cpp, and when updating also update
; versions of library dependencies linked from from
; https://github.com/awslabs/aws-crt-cpp/tree/{aws-crt-cpp commit}/crt
(version (git-version "0.17.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -944,16 +945,15 @@ (define-public aws-crt-cpp
(file-name (git-file-name name version))
(sha256
(base32
"0l7iwynk2rgzjnr1hi1raazghmk4m7pj47vdq2kf2cfz0b6v9jf5"))
(patches
(search-patches
"aws-crt-cpp-cmake-prefix.patch"
"aws-crt-cpp-disable-networking-tests.patch"))))
"1n0nlbz91j3ycwwrh9652f0h5qr2sj5b1l0i5sg40ajzs7wvzd32"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"
"-DBUILD_DEPS=OFF")))
(list "-DBUILD_DEPS=OFF"
"-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common"))
"-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-auth" ,aws-c-auth)
("aws-c-cal" ,aws-c-cal)
@ -972,7 +972,9 @@ (define-public aws-crt-cpp
(define-public aws-sdk-cpp
(package
(name "aws-sdk-cpp")
(version "1.9.92")
; When updating also check for a tagged update to aws-crt-cpp from
; https://github.com/aws/aws-sdk-cpp/tree/main/crt
(version "1.9.136")
(source (origin
(method git-fetch)
(uri (git-reference
@ -981,24 +983,22 @@ (define-public aws-sdk-cpp
(file-name (git-file-name name version))
(sha256
(base32
"0nbq1qivykfg8jmrn8d0k6fcfa5dw9s90wnwddh7ia4zafmby7pd"))
(patches
(search-patches
"aws-sdk-cpp-cmake-prefix.patch"
"aws-sdk-cpp-disable-networking-tests.patch"
"aws-sdk-cpp-disable-werror.patch"))))
"0ap7g7nmbnrcajy3b788bnpqd87dwmg83dhll1q8qzli04bcg47i"))))
(build-system cmake-build-system)
(arguments
'(;; Tests are run during the build phase.
#:tests? #f
#:configure-flags
'("-DBUILD_SHARED_LIBS=ON"
"-DBUILD_DEPS=OFF")))
(list "-DBUILD_DEPS=OFF"
"-DBUILD_SHARED_LIBS=ON"
(string-append "-DCMAKE_PREFIX_PATH="
(assoc-ref %build-inputs "aws-c-common")))))
(propagated-inputs
`(("aws-crt-cpp" ,aws-crt-cpp)))
(inputs
`(("curl" ,curl)
("openssl" ,openssl)
("pulseaudio" ,pulseaudio)
("zlib" ,zlib)))
(synopsis "Amazon Web Services SDK for C++")
(description

File diff suppressed because it is too large Load diff

View file

@ -1538,3 +1538,86 @@ (define-public cryfs
additional security and privacy measures such as hiding file sizes and directory
structure. However CryFS is not considered stable yet by the developers.")
(license license:lgpl3+)))
(define-public rust-blake3-0.3
(package
(name "rust-blake3")
;; Version 1 requires Rust >= 1.51.
;; <https://github.com/BLAKE3-team/BLAKE3/releases/tag/1.0.0>
(version "0.3.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "blake3" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1cr5l5szgxm632px41kavl6cgils8h6yhdfkm6jsc5jgiivqai5n"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-arrayref" ,rust-arrayref-0.3)
("rust-arrayvec" ,rust-arrayvec-0.5)
("rust-cc" ,rust-cc-1)
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
("rust-crypto-mac" ,rust-crypto-mac-0.8)
("rust-digest" ,rust-digest-0.9)
("rust-rayon" ,rust-rayon-1))))
(home-page "https://github.com/BLAKE3-team/BLAKE3")
(synopsis "BLAKE3 hash function Rust implementation")
(description "This crate provides the official Rust implementation of the
BLAKE3 cryptographic hash function. BLAKE3 is faster than MD5, SHA-1, SHA-2,
SHA-3, and BLAKE2.")
;; Users may choose between these two licenses when redistributing the
;; program provided by this package.
(license (list license:cc0 license:asl2.0))))
(define-public b3sum
(package
(name "b3sum")
;; Version 1 requires Rust >= 1.51.
;; <https://github.com/BLAKE3-team/BLAKE3/releases/tag/1.0.0>
(version "0.3.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "b3sum" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0h3fz16q5lk6mg7r8kjkjrq5hd4injngn5m7pswjbf2pyzjmg4b4"))))
(build-system cargo-build-system)
(arguments
`(;; Install the source so that Cargo.toml is installed, because that is
;; the only reference to the license information.
#:install-source? #t
#:phases
(modify-phases %standard-phases
(add-before 'check 'patch-tests
(lambda _
(substitute* "tests/cli_tests.rs"
(("/bin/sh") (which "sh")))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-"
,(package-version this-package))))
(install-file "README.md" doc)))))
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-blake3" ,rust-blake3-0.3)
("rust-clap" ,rust-clap-2)
("rust-hex" ,rust-hex-0.4)
("rust-memmap" ,rust-memmap-0.7)
("rust-rayon" ,rust-rayon-1)
("rust-wild" ,rust-wild-2))
#:cargo-development-inputs
(("rust-duct" ,rust-duct-0.13)
("rust-tempfile" ,rust-tempfile-3))))
(home-page "https://github.com/BLAKE3-team/BLAKE3")
(synopsis "Command line BLAKE3 checksum tool")
(description "This package provides @code{b3sum}, a command line
checksum tool based on the BLAKE3 cryptographic hash function.")
;; Users may choose between these two licenses when redistributing the
;; program provided by this package.
(license (list license:cc0 license:asl2.0))))

View file

@ -934,9 +934,6 @@ (define-public epson-inkjet-printer-escpr
(home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX")
(license license:gpl2+)))
(define-public escpr
(deprecated-package "escpr" epson-inkjet-printer-escpr))
(define-public splix
;; Last released in 2009 <https://sourceforge.net/projects/splix/files/>.
;; Last SVN commit was 2013 <https://svn.code.sf.net/p/splix/code/splix/>.

View file

@ -3049,13 +3049,13 @@ (define-public python2-pysqlite
(define-public python-sqlalchemy
(package
(name "python-sqlalchemy")
(version "1.4.26")
(version "1.4.27")
(source
(origin
(method url-fetch)
(uri (pypi-uri "SQLAlchemy" version))
(sha256
(base32 "06imr96jirwmkc8mkxrl9bi413yd3638lc5idn65xx8fv7bzkivb"))))
(base32 "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython) ; for C extensions
@ -3164,9 +3164,6 @@ (define-public python-sqlalchemy-utils
")
(license license:bsd-3)))
(define-public python2-sqlalchemy-utils
(package-with-python2 python-sqlalchemy-utils))
(define-public python-alchemy-mock
(package
(name "python-alchemy-mock")
@ -3401,13 +3398,13 @@ (define-public python2-py2neo
(define-public python-psycopg2
(package
(name "python-psycopg2")
(version "2.8.6")
(version "2.9.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "psycopg2" version))
(sha256
(base32 "0hzmk6b1hb5riqkljr5xics6p4zbvmis6knbczb7zhq7273zc8zv"))))
(base32 "1smvvs1ngqy0ymlp1d7f85j09j9v0z5dq14f1qky0j0qi7xajkd8"))))
(build-system python-build-system)
(arguments
;; Tests would require a postgresql database "psycopg2_test"
@ -3422,9 +3419,6 @@ (define-public python-psycopg2
2.0.")
(license license:lgpl3+)))
(define-public python2-psycopg2
(package-with-python2 python-psycopg2))
(define-public python-sadisplay
(package
(name "python-sadisplay")

View file

@ -190,7 +190,7 @@ (define-public ubuntu-keyring
(define-public debootstrap
(package
(name "debootstrap")
(version "1.0.124")
(version "1.0.126")
(source
(origin
(method git-fetch)
@ -199,7 +199,7 @@ (define-public debootstrap
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0pbvrp7gb87pwmjika5hy97342mdfvm0gmy23ag8xz1nnpmn160j"))))
(base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -271,7 +271,7 @@ (define-public debootstrap
(define-public debianutils
(package
(name "debianutils")
(version "4.11.1")
(version "5.5-1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -280,15 +280,8 @@ (define-public debianutils
(file-name (git-file-name "debianutils" version))
(sha256
(base32
"18ypb7fivch53wwrdf73yhf1fhkwn9kvw1kfdc1m450241d6191w"))))
"1sbdjcb44g2s1zxjf9kxrp9drf9mmh6b49a9z3k428gmc6zsci4r"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'bootstrap 'create-translations
(lambda _
(with-directory-excursion "po4a"
(invoke "po4a" "--no-backups" "po4a.conf"))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)

View file

@ -73,7 +73,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
(version "190")
(version "192")
(source
(origin
(method git-fetch)
@ -82,7 +82,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "10q93qybwqf2nzj3iakw1pxhccq10ixm9fn7xgdr4p88qb0wchb5"))
(base32 "1anj90r7nvdd7vscx27xnh7vivhq16gxg9cffpwb4w7i02ij5w6b"))
(patches
(search-patches "diffoscope-fix-llvm-test.patch"))))
(build-system python-build-system)

View file

@ -647,10 +647,6 @@ (define-public python-django-jinja
example, explicit calls to callables from templates and better performance.")
(license license:bsd-3)))
;; JSONField is now built-in to Django, obsoleting this package.
(define-public python-django-jsonfield
(deprecated-package "python-django-jsonfield" python-django))
(define-public python-dj-database-url
(package
(name "python-dj-database-url")

View file

@ -4,6 +4,7 @@
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,7 +39,7 @@ (define-module (gnu packages dunst)
(define-public dunst
(package
(name "dunst")
(version "1.7.0")
(version "1.7.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -47,7 +48,7 @@ (define-public dunst
(file-name (git-file-name name version))
(sha256
(base32
"0bc8f8h7qvxfx742jb8ggycw3z0il3pgln7lgkdjap2pxccyyrh5"))))
"0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target

View file

@ -941,7 +941,7 @@ (define-public emacs-magit-annex
(define-public emacs-minions
(package
(name "emacs-minions")
(version "0.3.6")
(version "0.3.7")
(source
(origin
(method git-fetch)
@ -950,7 +950,7 @@ (define-public emacs-minions
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8"))))
(base32 "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
@ -1584,6 +1584,27 @@ (define-public emacs-flycheck
provides an optional IDE-like error list.")
(license license:gpl3+)))) ;+GFDLv1.3+ for the manual
(define-public emacs-flymake-flycheck
(package
(name "emacs-flymake-flycheck")
(version "20210404.2128")
(source
(origin
(method url-fetch)
(uri (string-append "https://melpa.org/packages/flymake-flycheck-"
version ".el"))
(sha256
(base32 "1m59ahd5gjlfwf328labwdlpcxh8ywywkwgfrlsy5jyxfc9ss4nv"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-flycheck" ,emacs-flycheck)))
(home-page "https://github.com/purcell/flymake-flycheck")
(synopsis "Use Flycheck checkers as Flymake backends")
(description
"This package provides support for running any Flycheck checker as a
Flymake diagnostic backend. The effect is that Flymake will control when the
checker runs, and Flymake will receive its errors.")
(license license:gpl3+)))
(define-public emacs-flymake-quickdef
;; This particular commit includes bug fixes on top of 1.0.0 release.
(let ((version "1.0.0")
@ -1610,25 +1631,26 @@ (define-public emacs-flymake-quickdef
(license license:gpl3+))))
(define-public emacs-flymake-kondor
(package
(name "emacs-flymake-kondor")
(version "0.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/turbo-cafe/flymake-kondor")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-flymake-quickdef" ,emacs-flymake-quickdef)))
(home-page "https://github.com/turbo-cafe/flymake-kondor")
(synopsis "Linter with clj-kondo")
(description "This package adds Clojure syntax checker clj-kondo.")
(license license:gpl3+)))
;; No tag, version grabbed from source .el file.
(let ((commit "389b513c7287ede7a996a3d0db2e84b00772fef5")
(revision "0"))
(package
(name "emacs-flymake-kondor")
(version (git-version "0.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/turbo-cafe/flymake-kondor")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1by6p1j091xk5bfdpbqp7fifjn4rknrbm8r3xjfvpb4xcb19nmig"))))
(build-system emacs-build-system)
(home-page "https://github.com/turbo-cafe/flymake-kondor")
(synopsis "Linter with clj-kondo")
(description "This package adds Clojure syntax checker clj-kondo.")
(license license:gpl3+))))
(define-public emacs-flymake-shellcheck
;; No tag, version grabbed from source .el file.
@ -2918,7 +2940,7 @@ (define-public emacs-citeproc-el
(define-public emacs-corfu
(package
(name "emacs-corfu")
(version "0.13")
(version "0.14")
(source
(origin
(method git-fetch)
@ -2927,7 +2949,7 @@ (define-public emacs-corfu
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0b1mv6pbcawwfsn3f3hqmy6s8p9frp2320jvlk2z4dp6aw5qyx2j"))))
(base32 "0y40vnd227xjzds6zh85gplkiqa387b9y0925g5l01gz7hk2z17r"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/corfu")
(synopsis "Completion overlay region function")
@ -8343,7 +8365,7 @@ (define-public emacs-orderless
(define-public emacs-consult
(package
(name "emacs-consult")
(version "0.12")
(version "0.13")
(source
(origin
(method git-fetch)
@ -8351,7 +8373,7 @@ (define-public emacs-consult
(url "https://github.com/minad/consult")
(commit version)))
(sha256
(base32 "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic"))
(base32 "0ik5j4i4vb9hz629cjwnzhimskpv0fc8wca37z4ak0q1d898ayph"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
@ -8389,27 +8411,30 @@ (define-public emacs-consult-notmuch
(license license:gpl3+)))
(define-public emacs-marginalia
(package
(name "emacs-marginalia")
(version "0.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/marginalia")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/marginalia")
(synopsis "Marginalia in the minibuffer completions")
(description
"This package provides Marginalia mode which adds marginalia to the
;; Upstream did not tag latest release. The commit below matches version
;; bump.
(let ((commit "2dbad0b166d6dc76862697bb25b95d34c1703acc"))
(package
(name "emacs-marginalia")
(version "0.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minad/marginalia")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0xb0w7fxbmwbq2mdhs7xrf8z6x6qmkq68p1fv08wb4ksvphyvz5h"))))
(build-system emacs-build-system)
(home-page "https://github.com/minad/marginalia")
(synopsis "Marginalia in the minibuffer completions")
(description
"This package provides Marginalia mode which adds marginalia to the
minibuffer completions. Marginalia are marks or annotations placed at the
margin of the page of a book or in this case helpful colorful annotations
placed at the margin of the minibuffer for your completion candidates.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-smartparens
(package
@ -8765,9 +8790,9 @@ (define-public emacs-rmsbolt
(define-public emacs-request
;; We prefer a more recent commit that has support for auth-source,
;; which makes authentication more convenient for users and maintainers.
(let ((commit "d02d1347ffdf138cffd380cbeac62ac8732036ef")
(revision "0"))
;; and has some bug fixes for Emacs 28.
(let ((commit "3336eaa97de923f74b90dda3e35985e122d40805")
(revision "1"))
(package
(name "emacs-request")
(version (git-version "0.3.2" revision commit))
@ -8779,7 +8804,7 @@ (define-public emacs-request
(file-name (git-file-name name version))
(sha256
(base32
"1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"))))
"0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f)) ; requires network access.
@ -11045,7 +11070,7 @@ (define-public emacs-wgrep
(define-public emacs-helm
(package
(name "emacs-helm")
(version "3.8.0")
(version "3.8.1")
(source
(origin
(method git-fetch)
@ -11054,7 +11079,7 @@ (define-public emacs-helm
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv"))))
(base32 "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)
@ -12339,7 +12364,7 @@ (define-public emacs-org-contrib
(synopsis "Unmaintained add-ons for Org mode")
(description
"This package contains add-ons to Org. Be warned that these libraries
receive little if no maintainance and there is no guaranty that they are
receive little if no maintenance and there is no guaranty that they are
compatible with the Org stable version.")
(license license:gpl3+)))
@ -12367,6 +12392,27 @@ (define-public emacs-org-contacts
in your Org Agenda, and more.")
(license license:gpl3+))))
(define-public emacs-org-vcard
(package
(name "emacs-org-vcard")
(version "0.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/flexibeast/org-vcard")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7"))))
(build-system emacs-build-system)
(home-page "https://github.com/flexibeast/org-vcard")
(synopsis "Org mode support for vCard export and import")
(description
"This package exports and imports vCard files from within GNU Emacs' Org
mode.")
(license license:gpl3+)))
(define-public emacs-org-pretty-table
;; There is no release yet.
(let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef")
@ -13941,14 +13987,14 @@ (define-public emacs-reverse-im
(define-public emacs-posframe
(package
(name "emacs-posframe")
(version "1.1.0")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"posframe-" version ".tar"))
(sha256
(base32 "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg"))))
(base32 "13bx8vd3dw4jvwrys1vyq3a65rjjsbsvi6jxiffp647aclwwfcjs"))))
(build-system emacs-build-system)
;; emacs-minimal does not include the function font-info.
(arguments
@ -14096,7 +14142,7 @@ (define-public emacs-xelb
(define-public emacs-exwm
(package
(name "emacs-exwm")
(version "0.25")
(version "0.26")
(synopsis "Emacs X window manager")
(source
(origin
@ -14104,7 +14150,7 @@ (define-public emacs-exwm
(uri (string-append "https://elpa.gnu.org/packages/"
"exwm-" version ".tar"))
(sha256
(base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"))))
(base32 "03pg0r8a5vb1wc5grmjgzql74p47fniv47x39gdll5s3cq0haf6q"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-xelb" ,emacs-xelb)))
@ -15071,6 +15117,57 @@ (define-public emacs-emamux
multiplexer.")
(license license:gpl3+)))
(define-public emacs-plz
(let ((commit "7e456638a651bab3a814e3ea81742dd917509cbb")
(revision "1"))
(package
(name "emacs-plz")
(version (git-version "0.1-pre" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/plz.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "05kgxrps1s20im5hhq799nrs3615bvssm4r0ysgmwm203mmzsjgj"))))
(build-system emacs-build-system)
(inputs `(("curl" ,curl)))
(home-page "https://github.com/alphapapa/plz.el")
(synopsis "HTTP library for Emacs")
(description
"This package provides HTTP library for Emacs. It uses curl as
a backend, which avoids some of the issues with using Emacss built-in url
library.")
(license license:gpl3+))))
(define-public emacs-ement
(let ((commit "c951737dc855604aba389166bb0e7366afadc533")
(revision "1"))
(package
(name "emacs-ement")
(version (git-version "0.1-pre" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/ement.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "00iwwz4hzg4g59wrb5df6snqz3ppvrsadhfp61w1pa8gvg2z9bvy"))))
(build-system emacs-build-system)
(arguments
`(#:emacs ,emacs)) ;need libxml support
(inputs
`(("emacs-plz" ,emacs-plz)
("emacs-ts" ,emacs-ts)))
(home-page "https://github.com/alphapapa/ement.el")
(synopsis "Matrix client for Emacs")
(description "Ement.el is a Matrix client for Emacs.")
(license license:gpl3+))))
(define-public emacs-rpm-spec-mode
(package
(name "emacs-rpm-spec-mode")
@ -21788,7 +21885,7 @@ (define-public emacs-rust-mode
(define-public emacs-rustic
(package
(name "emacs-rustic")
(version "2.0")
(version "2.1")
(source
(origin
(method git-fetch)
@ -21797,7 +21894,7 @@ (define-public emacs-rustic
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2"))))
(base32 "0nklqpd24s83ng34xrm4rp80sbylajikj6svz1c6j721pz9crxg9"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
@ -26652,12 +26749,6 @@ (define-public emacs-modus-themes
computing environment.")
(license license:gpl3+)))
(define-public emacs-modus-operandi-theme
(deprecated-package "emacs-modus-operandi-theme" emacs-modus-themes))
(define-public emacs-modus-vivendi-theme
(deprecated-package "emacs-modus-vivendi-theme" emacs-modus-themes))
(define-public emacs-punpun-theme
(let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65")
(revision "0"))
@ -27087,16 +27178,16 @@ (define-public emacs-telega-contrib
(define-public emacs-doom-modeline
(package
(name "emacs-doom-modeline")
(version "3.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/seagle0128/doom-modeline")
(commit (string-append "v" version))))
(sha256
(base32
"1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0"))
(file-name (git-file-name name version))))
(version "3.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/seagle0128/doom-modeline")
(commit (string-append "v" version))))
(sha256
(base32 "1ji15n2rdp7bjg5iq9im6c4m12k24kqp85i3n1m9npihrb4arh54"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
`(#:test-command '("ert-runner")))
@ -29631,7 +29722,7 @@ (define-public emacs-ivy-avy
(define-public emacs-vertico
(package
(name "emacs-vertico")
(version "0.14")
(version "0.15")
(source
(origin
(method git-fetch)
@ -29640,7 +29731,7 @@ (define-public emacs-vertico
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0rddk76ih44b574lsr6d6r9wa2l7c9zlb9kcyw5xvly17ciiq16h"))))
(base32 "059mj7x9iisjl2cdc1ggqd3racfs42yf0qqk0va9c857qgscrn26"))))
(build-system emacs-build-system)
(arguments
`(#:phases

View file

@ -1030,9 +1030,6 @@ (define kicad-i18n
translations for KiCad.")
(license license:gpl3+)))
(define-public kicad-i18l
(deprecated-package "kicad-i18l" kicad-i18n))
(define-public kicad-doc
(package
(name "kicad-doc")

View file

@ -201,7 +201,7 @@ (define-public efl
(define-public terminology
(package
(name "terminology")
(version "1.10.0")
(version "1.11.0")
(source (origin
(method url-fetch)
(uri
@ -209,7 +209,7 @@ (define-public terminology
"terminology/terminology-" version ".tar.xz"))
(sha256
(base32
"0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz"))
"0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g"))
(modules '((guix build utils)))
;; Remove the bundled fonts.
(snippet
@ -386,9 +386,6 @@ (define-public enlightenment
embedded systems.")
(license license:bsd-2)))
(define-public enlightenment-wayland
(deprecated-package "enlightenment-wayland" enlightenment))
(define-public python-efl
(package
(name "python-efl")

View file

@ -87,7 +87,7 @@ (define-public xcb-imdkit
(define-public fcitx5
(package
(name "fcitx5")
(version "5.0.8")
(version "5.0.10")
(source
(origin
(method url-fetch)
@ -95,7 +95,7 @@ (define-public fcitx5
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
(base32 "0536sjpgjlg0bf8imz4jf9bdsp7fhm09bkssddji56cc9mgdxx82"))))
(base32 "0i23skr49n6b30ybm66bkv07dcr0dan5mzxch7x83znfnrpk8z3h"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -198,7 +198,7 @@ (define-public libime
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
(version "5.0.7")
(version "5.0.9")
(source
(origin
(method url-fetch)
@ -206,7 +206,7 @@ (define-public fcitx5-gtk
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
(base32 "0x9xwyb3hnb2xl47jkj8zs34fhyf7gshy3bv3jxd66sfkjrscr5v"))))
(base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
@ -252,7 +252,7 @@ (define-public fcitx5-gtk
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
(version "5.0.6")
(version "5.0.7")
(source
(origin
(method url-fetch)
@ -260,7 +260,7 @@ (define-public fcitx5-qt
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
(base32 "0wp88cmy0gn15gkfzl5z4q4qd9j1ssdmgp1rfsbw0cp3qh5x4m69"))))
(base32 "1gspj3s1nz6mqbp3z6js5zf7mqicwm32isxlqh6whhwawr9w7vrk"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -348,7 +348,7 @@ (define-public fcitx5-chinese-addons
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
(version "5.0.5")
(version "5.0.8")
(source
(origin
(method url-fetch)
@ -356,7 +356,7 @@ (define-public fcitx5-configtool
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
(base32 "1diwiniqvsvcdwzcx1dqxbvwsr6ajbxs67my0cpn8n22asd5mx8i"))))
(base32 "0rajrw914mbl0x7h08cal0sszwyvqg6v3w0vs0c9acs6m438xbw4"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags

View file

@ -99,6 +99,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@ -194,7 +195,7 @@ (define-public bitcoin-core-0.21
(define-public bitcoin-core-0.20
(package
(inherit bitcoin-core-0.21)
(version "0.20.1")
(version "0.20.2")
(source (origin
(method url-fetch)
(uri
@ -202,7 +203,7 @@ (define-public bitcoin-core-0.20
version "/bitcoin-" version ".tar.gz"))
(sha256
(base32
"0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab"))))))
"14smp5vmh7baabl856wlg7w7y5910jhx6c02mlkm4hkywf3yylky"))))))
;; The support lifetimes for bitcoin-core versions can be found in
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
@ -1257,7 +1258,7 @@ (define-public silkaj
(define-public grisbi
(package
(name "grisbi")
(version "1.2.2")
(version "2.0.5")
(source
(origin
(method url-fetch)
@ -1267,7 +1268,7 @@ (define-public grisbi
"/grisbi-" version ".tar.bz2"))
(sha256
(base32
"1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"))))
"0gvsqw1z5wkakyi3bkq71pqb094a8lv2nbgnxw2zqkabzjmxnfmx"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list "--without-ofx")))
@ -1773,6 +1774,32 @@ (define-public hledger-web
editing on the Web.")
(license license:gpl3)))
(define-public python-ta-lib
(package
(name "python-ta-lib")
(version "0.4.21")
(source
(origin
(method url-fetch)
(uri (pypi-uri "TA-Lib" version))
(sha256
(base32 "17sf222mq2vx924f15qlz5czkkq5vsnsjy9ibwkrk8lalr6g5lkl"))))
(build-system python-build-system)
(inputs
`(("ta-lib" ,ta-lib)))
(propagated-inputs
`(("python-numpy" ,python-numpy)))
(native-inputs
`(("python-cython" ,python-cython)
("python-nose" ,python-nose)
("python-pandas" ,python-pandas)))
(home-page "https://github.com/mrjbq7/ta-lib")
(synopsis "Python wrapper for TA-Lib")
(description
"This is a Python wrapper for TA-Lib based on Cython. TA-Lib is a library
providing common functions for the technical analysis of financial market data.")
(license license:bsd-2)))
(define-public ta-lib
(package
(name "ta-lib")

View file

@ -245,17 +245,9 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64"))
(define-public opensbi-qemu-generic
(make-opensbi-package "generic" "opensbi-qemu-generic"))
(define-public opensbi-qemu-virt
(deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic))
(define-public opensbi-sifive-fu540
(make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540"))
(define-public opensbi-qemu-sifive-u
;; Dropped upstream, as all functionality is present in the sifive-fu540
;; target for recent versions of qemu, u-boot and linux.
(deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540))
(define-public seabios
(package
(name "seabios")

View file

@ -331,9 +331,6 @@ (define-public font-gnu-freefont
(properties '((upstream-name . "freefont")
(ftp-directory . "/gnu/freefont")))))
(define-public font-gnu-freefont-ttf
(deprecated-package "font-gnu-freefont-ttf" font-gnu-freefont))
(define-public font-liberation
(package
(name "font-liberation")
@ -1593,9 +1590,6 @@ (define-public font-opendyslexic
emphasis while still being readable.")
(license license:silofl1.1)))
(define-public font-open-dyslexic
(deprecated-package "font-open-dyslexic" font-opendyslexic))
(define-public font-openmoji
(package
(name "font-openmoji")

View file

@ -375,9 +375,6 @@ (define-public python-sge
possible, and it also makes the SGE easy to learn.")
(license license:lgpl3+)))
(define-public python-sge-pygame
(deprecated-package "python-sge-pygame" python-sge))
(define-public python-tmx
(package
(name "python-tmx")
@ -2071,9 +2068,6 @@ (define-public guile-chickadee
@end enumerate\n")
(license license:gpl3+)))
(define-public guile3.0-chickadee
(deprecated-package "guile3.0-chickadee" guile-chickadee))
(define-public bennu-game-development
(package
(name "bennu-game-development")

View file

@ -2255,7 +2255,7 @@ (define-public retux
(native-inputs
`(("unzip" ,unzip)))
(inputs
`(("python-sge-pygame" ,python-sge-pygame)
`(("python-sge" ,python-sge)
("python-six" ,python-six)
("python-xsge" ,python-xsge)))
(home-page "https://retux-game.github.io/")
@ -4621,10 +4621,10 @@ (define-public openrct2
("freetype" ,freetype)
("icu4c" ,icu4c)
("jansson" ,jansson)
("json-modern-cxx" ,json-modern-cxx)
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
("nlohmann-json-cpp" ,nlohmann-json-cpp)
("openrct2-objects" ,openrct2-objects)
("openrct2-title-sequences" ,openrct2-title-sequences)
("openssl" ,openssl)
@ -12064,10 +12064,10 @@ (define-public chessx
(license license:gpl2+)))
(define-public stockfish
(let ((neural-network-revision "3475407dc199")) ; also update hash below
(let ((neural-network-revision "13406b1dcbe0")) ; also update hash below
(package
(name "stockfish")
(version "14")
(version "14.1")
(source
(origin
(method git-fetch)
@ -12076,7 +12076,7 @@ (define-public stockfish
(commit (string-append "sf_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "046b3rq9w8lzgk07q5zazzkl93ai99ab18hr9d8n73mabjpi6zbx"))))
(base32 "0apqqcgpcflm3c6mcl13ln2y04f6zksnljmk4ys7naf7xk4vdgkd"))))
(build-system gnu-build-system)
(inputs
`(("neural-network"
@ -12086,7 +12086,7 @@ (define-public stockfish
neural-network-revision ".nnue"))
(sha256
(base32
"11zci5kgwdw9rh8w2w4p84764g82rr666y3n8r2flwwrq5yl0x9l"))))))
"0vr3hcmlqqm74pn7hc54gmfs9drqvgc53nh7bvy6v8z0rcfnnh0k"))))))
(arguments
`(#:tests? #f
#:make-flags (list "-C" "src"
@ -12631,7 +12631,7 @@ (define-public sdlpop
"1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests provided
`(#:tests? #f ; no tests provided
#:phases
(modify-phases %standard-phases
(delete 'configure)
@ -12655,6 +12655,8 @@ (define-public sdlpop
(chdir "..")
(install-file "prince" bin)
(substitute* template (("\\$ROOT") out))
(substitute* "src/seg009.c"
(("g_argv[0]") (string-append "\"" out "\"")))
(install-file template app)
(rename-file (string-append app "/SDLPoP.desktop.template")
(string-append app "/SDLPoP.desktop"))

View file

@ -43,7 +43,7 @@ (define-module (gnu packages genimage)
(define-public genimage
(package
(name "genimage")
(version "11")
(version "14")
(source (origin
(method git-fetch)
(uri (git-reference
@ -52,9 +52,9 @@ (define-public genimage
(file-name (git-file-name name version))
(sha256
(base32
"15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54"))
;; will be shipped with release 14
(patches (search-patches "genimage-signedness.patch"))))
"1l45djpbaffhyw0allq3mgzwrdilk05iyj0nvp8l3s47vnp5bnbs"))
(patches
(search-patches "genimage-mke2fs-test.patch"))))
(build-system gnu-build-system)
(arguments
`(#:modules

View file

@ -92,6 +92,7 @@ (define-module (gnu packages geo)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
@ -1458,6 +1459,42 @@ (define-public libspatialindex
")
(license license:expat)))
(define-public python-rtree
(package
(name "python-rtree")
(version "0.9.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Rtree" version))
(sha256
(base32 "0gna530vy6rh76035cqh7i2lx199cvxjrzjczg9rm6k96k5751xy"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'find-libspatialindex
(lambda* (#:key inputs #:allow-other-keys)
(setenv "SPATIALINDEX_C_LIBRARY"
(string-append (assoc-ref inputs "libspatialindex")
"/lib/libspatialindex.so"))))
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest")))))))
(native-inputs
`(("python-numpy" ,python-numpy)
("python-pytest" ,python-pytest)
("python-wheel" ,python-wheel)))
(inputs
`(("libspatialindex" ,libspatialindex)))
(home-page "https://github.com/Toblerity/rtree")
(synopsis "R-Tree spatial index for Python GIS")
(description
"RTree is a Python package with bindings for @code{libspatialindex}.")
(license license:expat)))
(define-public java-jmapviewer
(package
(name "java-jmapviewer")

View file

@ -775,9 +775,6 @@ (define-public numix-gtk-theme
(home-page "https://numixproject.github.io")
(license license:gpl3+)))
(define-public numix-theme
(deprecated-package "numix-theme" numix-gtk-theme))
(define-public orchis-theme
(package
(name "orchis-theme")

View file

@ -510,9 +510,6 @@ (define-public guile2.2-gcrypt
`(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
(define-public guile3.0-gcrypt
(deprecated-package "guile3.0-gcrypt" guile-gcrypt))
(define-public python-gpg
(package
(name "python-gpg")
@ -810,14 +807,14 @@ (define-public signing-party
(define-public pinentry-tty
(package
(name "pinentry-tty")
(version "1.1.1")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/pinentry/pinentry-"
version ".tar.bz2"))
(sha256
(base32
"0zx5vg6wws2sp2yxwi01b8i1pnsqkydncpj7x0p8xl9y05ja04nd"))))
"0w34c4x5hkxaxnnkcrm1azlzwzxcziv5dkci3xcd0hz0ld2j01qh"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-pinentry-tty")))

View file

@ -1069,13 +1069,6 @@ (define-public gst-plugins/selection
(("'auto'") "'disabled'"))
#t)))))))))
(define-public gst-transcoder
(deprecated-package
"gst-transcoder"
(gst-plugins/selection gst-plugins-bad
#:plugins '("transcoder")
#:configure-flags '("-Dintrospection=enabled"))))
(define-public python-gst
(package
(name "python-gst")

View file

@ -1351,9 +1351,6 @@ (define-public guile2.2-cairo
,@(fold alist-delete (package-inputs guile-cairo)
'("guile" "guile-lib"))))))
(define-public guile3.0-cairo
(deprecated-package "guile3.0-cairo" guile-cairo))
(define-public guile-rsvg
;; Use a recent snapshot that supports Guile 2.2 and beyond.
(let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
@ -1438,9 +1435,6 @@ (define-public guile2.2-rsvg
'("guile" "guile-lib"))))
(propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
(define-public guile3.0-rsvg
(deprecated-package "guile3.0-rsvg" guile-rsvg))
(define-public guile-present
(package
(name "guile-present")
@ -1511,9 +1505,6 @@ (define-public guile2.2-present
("guile-cairo" ,guile2.2-cairo)
("guile-rsvg" ,guile2.2-rsvg)))))
(define-public guile3.0-present
(deprecated-package "guile3.0-present" guile-present))
(define-public guile-gnome
(package
(name "guile-gnome")

View file

@ -706,9 +706,6 @@ (define-public guile2.0-fibers
(name "guile2.2-fibers")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-fibers
(deprecated-package "guile3.0-fibers" guile-fibers))
(define-public guile-filesystem
(package
(name "guile-filesystem")
@ -811,9 +808,6 @@ (define-public guile2.2-syntax-highlight
(name "guile2.2-syntax-highlight")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-syntax-highlight
(deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight))
(define-public guile-sjson
(package
(name "guile-sjson")
@ -899,9 +893,6 @@ (define-public guile2.2-squee
,@(alist-delete "guile"
(package-native-inputs guile-squee))))))
(define-public guile3.0-squee
(deprecated-package "guile3.0-squee" guile-squee))
(define-public guile-colorized
(package
(name "guile-colorized")
@ -930,9 +921,6 @@ (define-public guile2.2-colorized
(name "guile2.2-colorized")
(native-inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-colorized
(deprecated-package "guile3.0-colorized" guile-colorized))
(define-public guile-pfds
(package
(name "guile-pfds")
@ -1094,9 +1082,6 @@ (define-public guile2.2-pfds
(find-files "." "\\.sls$"))
#t))))))))
(define-public guile3.0-pfds
(deprecated-package "guile3.0-pfds" guile-pfds))
(define-public guile-aa-tree
(package
(name "guile-aa-tree")
@ -1162,9 +1147,6 @@ (define-public guile2.2-simple-zmq
(name "guile2.2-simple-zmq")
(native-inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-simple-zmq
(deprecated-package "guile3.0-simple-zmq" guile-simple-zmq))
(define-public jupyter-guile-kernel
(let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304")
(revision "2"))
@ -1361,9 +1343,6 @@ (define-public guile2.2-email
(inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-email))))))
(define-public guile3.0-email
(deprecated-package "guile3.0-email" guile-email))
(define-public guile-newt
(package
(name "guile-newt")
@ -1403,9 +1382,6 @@ (define-public guile2.2-newt
(inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-newt))))))
(define-public guile3.0-newt
(deprecated-package "guile3.0-newt" guile-newt))
(define-public guile-mastodon
(let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392")
(revision "1"))
@ -1483,9 +1459,6 @@ (define-public guile2.2-parted
(propagated-inputs
`(("guile-bytestructures" ,guile2.2-bytestructures)))))
(define-public guile3.0-parted
(deprecated-package "guile3.0-parted" guile-parted))
(define-public guile-xosd
(package
(name "guile-xosd")
@ -1706,9 +1679,6 @@ (define-public guile2.2-config
(inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-config))))))
(define-public guile3.0-config
(deprecated-package "guile3.0-config" guile-config))
(define-public guile-hall
(package
(name "guile-hall")
@ -1798,9 +1768,6 @@ (define-public guile2.2-hall
,@(alist-delete "guile-config"
(package-propagated-inputs guile-hall))))))
(define-public guile3.0-hall
(deprecated-package "guile3.0-hall" guile-hall))
(define-public guile-ics
(package
(name "guile-ics")
@ -1852,9 +1819,6 @@ (define-public guile2.2-ics
,@(alist-delete "guile" (package-inputs guile-ics))))
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
(define-public guile3.0-ics
(deprecated-package "guile3.0-ics" guile-ics))
(define-public guile-imanifest
(let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0")
(revision "0"))
@ -1972,9 +1936,6 @@ (define-public guile2.2-wisp
(name "guile2.2-wisp")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-wisp
(deprecated-package "guile3.0-wisp" guile-wisp))
(define-public guile-udev
(package
(name "guile-udev")
@ -2338,9 +2299,6 @@ (define-public guile2.2-ncurses
(inputs `(("ncurses" ,ncurses)
("guile" ,guile-2.2)))))
(define-public guile3.0-ncurses
(deprecated-package "guile3.0-ncurses" guile-ncurses))
(define-public guile-ncurses/gpm
(package
(inherit guile-ncurses)
@ -2348,13 +2306,6 @@ (define-public guile-ncurses/gpm
(inputs `(("ncurses" ,ncurses/gpm)
("guile" ,guile-3.0)))))
(define-public guile3.0-ncurses/gpm
(package
(inherit guile3.0-ncurses)
(name "guile3.0-ncurses-with-gpm")
(inputs `(("ncurses" ,ncurses/gpm)
("guile" ,guile-3.0)))))
(define-public guile-lib
(package
(name "guile-lib")
@ -2450,9 +2401,6 @@ (define-public guile2.2-lib
(alist-replace "guile" (list guile-2.2)
(package-inputs guile-lib)))))
(define-public guile3.0-lib
(deprecated-package "guile3.0-lib" guile-lib))
(define-public guile-minikanren
(package
(name "guile-minikanren")
@ -2495,9 +2443,6 @@ (define-public guile2.2-minikanren
(name "guile2.2-minikanren")
(native-inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-minikanren
(deprecated-package "guile3.0-minikanren" guile-minikanren))
(define-public guile-irregex
(package
(name "guile-irregex")
@ -2550,9 +2495,6 @@ (define-public guile2.2-irregex
(name "guile2.2-irregex")
(native-inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-irregex
(deprecated-package "guile3.0-irregex" guile-irregex))
(define-public haunt
(package
(name "haunt")
@ -2637,9 +2579,6 @@ (define-public guile2.0-haunt
(name "guile2.0-haunt")
(inputs `(("guile" ,guile-2.0)))))
(define-public guile3.0-haunt
(deprecated-package "guile3.0-haunt" haunt))
(define-public guile-redis
(package
(name "guile-redis")
@ -2755,9 +2694,6 @@ (define-public guile2.0-commonmark
(name "guile2.0-commonmark")
(inputs `(("guile" ,guile-2.0)))))
(define-public guile3.0-commonmark
(deprecated-package "guile3.0-commonmark" guile-commonmark))
(define-public mcron
(package
(name "mcron")
@ -2808,9 +2744,6 @@ (define-public guile2.2-mcron
(name "guile2.2-mcron")
(inputs `(("guile" ,guile-2.2)))))
(define-public guile3.0-mcron
(deprecated-package "guile3.0-mcron" mcron))
(define-public guile-picture-language
(let ((commit "a1322bf11945465241ca5b742a70893f24156d12")
(revision "5"))
@ -2856,10 +2789,6 @@ (define-public guile2.2-picture-language
`(("guile-cairo" ,guile2.2-cairo)
("guile-rsvg" ,guile2.2-rsvg)))))
(define-public guile3.0-picture-language
(deprecated-package "guile3.0-picture-language"
guile-picture-language))
(define-public guile-studio
(let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842")
(revision "1"))
@ -3211,9 +3140,6 @@ (define-public guile2.2-gi
`(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-gi))))))
(define-public guile3.0-gi
(deprecated-package "guile3.0-gi" guile-gi))
(define-public guile-srfi-89
(package
(name "guile-srfi-89")
@ -3797,9 +3723,6 @@ (define-public guile-semver
the style of the Node Package Manager (NPM).")
(license license:gpl3+)))
(define-public guile3.0-semver
(deprecated-package "guile3.0-semver" guile-semver))
(define-public guile2.2-semver
(package
(inherit guile-semver)
@ -3865,9 +3788,6 @@ (define-public guile2.2-hashing
(native-inputs
`(("guile" ,guile-2.2)))))
(define-public guile3.0-hashing
(deprecated-package "guile3.0-hashing" guile-hashing))
(define-public guile-packrat
(package
(name "guile-packrat")
@ -4117,9 +4037,6 @@ (define-public guile2.2-xapian
`(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs guile-xapian))))))
(define-public guile3.0-xapian
(deprecated-package "guile3.0-xapian" guile-xapian))
(define-public guile-torrent
(package
(name "guile-torrent")
@ -4214,9 +4131,6 @@ (define-public guile-websocket
(home-page "https://git.dthompson.us/guile-websocket.git")
(license license:lgpl3+))))
(define-public guile3.0-websocket
(deprecated-package "guile3.0-websocket" guile-websocket))
(define-public guile-rdf
(package
(name "guile-rdf")
@ -4861,7 +4775,7 @@ (define-public guile-fslib
(define-public guile-netlink
(package
(name "guile-netlink")
(version "1.0.1")
(version "1.1")
(source
(origin
(method git-fetch)
@ -4871,7 +4785,7 @@ (define-public guile-netlink
(file-name (git-file-name name version))
(sha256
(base32
"03zmsha2d7whlwb52gna83jdas9bqi18rq3sss7kkicv814qb35g"))))
"1x1rx6agjdah56r50cfs41vyvycydyjdq0plq3jxgvl1q2dar1gw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)); no tests

View file

@ -530,39 +530,6 @@ (define package-for-guile-2.2
(guile-variant-package-name "guile2.2")
#:deep? #f))
(define-syntax define-deprecated-guile3.0-package
(lambda (s)
"Define a deprecated package alias for \"guile3.0-something\"."
(syntax-case s ()
((_ name)
(and (identifier? #'name)
(string-prefix? "guile3.0-" (symbol->string (syntax->datum
#'name))))
(let ((->guile (lambda (str)
(let ((base (string-drop str
(string-length "guile3.0-"))))
(string-append "guile-" base)))))
(with-syntax ((package-name (symbol->string (syntax->datum #'name)))
(package
(datum->syntax
#'name
(string->symbol
(->guile (symbol->string (syntax->datum
#'name))))))
(old-name
;; XXX: This is the name generated by
;; 'define-deprecated'.
(datum->syntax
#'name
(symbol-append '% (syntax->datum #'name)
'/deprecated))))
#'(begin
(define-deprecated name package
(deprecated-package package-name package))
(export old-name))))))))
(define-deprecated-guile3.0-package guile3.0-readline)
(define-public guile-for-guile-emacs
(let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
(revision "1"))
@ -671,9 +638,6 @@ (define-public guile-json-3
(native-inputs (list pkg-config guile-3.0))
(inputs (list guile-3.0))))
(define-public guile3.0-json
(deprecated-package "guile3.0-json" guile-json-3))
(define-public guile-json-4
(package
(inherit guile-json-3)
@ -743,8 +707,6 @@ (define-public guile2.0-gdbm-ffi
(define-public guile2.2-gdbm-ffi
(package-for-guile-2.2 guile-gdbm-ffi))
(define-deprecated-guile3.0-package guile3.0-gdbm-ffi)
(define-public guile-sqlite3
(package
(name "guile-sqlite3")
@ -773,8 +735,6 @@ (define-public guile2.0-sqlite3
(define-public guile2.2-sqlite3
(package-for-guile-2.2 guile-sqlite3))
(define-deprecated-guile3.0-package guile3.0-sqlite3)
(define-public guile-bytestructures
(package
(name "guile-bytestructures")
@ -819,8 +779,6 @@ (define-public guile2.0-bytestructures
(define-public guile2.2-bytestructures
(package-for-guile-2.2 guile-bytestructures))
(define-deprecated-guile3.0-package guile3.0-bytestructures)
(define-public guile-git
(package
(name "guile-git")
@ -856,8 +814,6 @@ (define-public guile2.2-git
(define-public guile2.0-git
(package-for-guile-2.0 guile-git))
(define-deprecated-guile3.0-package guile3.0-git)
(define-public guile-zlib
(package
(name "guile-zlib")

View file

@ -982,6 +982,3 @@ (define-public stylish-haskell
default)
@end itemize")
(license license:bsd-3)))
(define-public ghc-stylish-haskell
(deprecated-package "ghc-stylish-haskell" stylish-haskell))

View file

@ -1120,7 +1120,7 @@ (define-public ghc-quickcheck-classes-base
(home-page "https://github.com/andrewthad/quickcheck-classes#readme")
(synopsis "QuickCheck common typeclasses from `base`")
(description
"This libary is a minimal variant of `quickcheck-classes`
"This library is a minimal variant of `quickcheck-classes`
that only provides laws for typeclasses from `base`. The main
purpose of splitting this out is so that `primitive` can depend
on `quickcheck-classes-base` in its test suite, avoiding the

View file

@ -434,6 +434,63 @@ (define-public sxiv
it and customize it for your needs.")
(license license:gpl2+)))
(define-public nsxiv
(package
(name "nsxiv")
(version "27.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nsxiv/nsxiv")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1na7f0hpc9g04nm7991gzaqr5gkj08n2azx833hgxcm2w1pnn1bk"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no check target
#:make-flags
(list (string-append "PREFIX=" %output)
(string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configure script
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
;; Xft.h #includes <ft2build.h> without freetype2/. The
;; Makefile works around this by hard-coding /usr/include &
;; $PREFIX.
(let ((freetype (string-append (assoc-ref inputs "freetype")
"/include/freetype2")))
(substitute* "Makefile"
(("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2")
(string-append "-I" freetype))))))
(add-after 'install 'install-desktop-file
(lambda* (#:key outputs #:allow-other-keys)
(install-file "nsxiv.desktop"
(string-append (assoc-ref outputs "out")
"/share/applications"))))
(add-after 'install 'install-icons
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "-C" "icon" "install" make-flags))))))
(inputs
`(("freetype" ,freetype)
("giflib" ,giflib)
("imlib2" ,imlib2)
("libexif" ,libexif)
("libx11" ,libx11)
("libxft" ,libxft)))
(home-page "https://github.com/nsxiv/nsxiv")
(synopsis "Neo Simple X Image Viewer")
(description
"nsxiv is a fork of sxiv. Its primary goal is to provide the most basic
features required for fast image viewing. It has vi key bindings and works
nicely with tiling window managers. Its code base should be kept small and
clean to make it easy for you to dig into it and customize it for your
needs.")
(license license:gpl2+)))
(define-public viewnior
(package
(name "viewnior")

View file

@ -2200,7 +2200,11 @@ (define-public libavif
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
"-DAVIF_CODEC_RAV1E=ON"
,@(if (string-prefix? "x86_64"
(or (%current-target-system)
(%current-system)))
'("-DAVIF_CODEC_RAV1E=ON")
'())
"-DAVIF_BUILD_TESTS=ON")
#:phases
(modify-phases %standard-phases
@ -2211,12 +2215,16 @@ (define-public libavif
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/libavif-" ,version)))
(install-file "../source/README.md" doc)
#t))))))
(install-file "../source/README.md" doc)))))))
(inputs
`(("dav1d" ,dav1d)
("libaom" ,libaom)
("rav1e" ,rav1e)))
;; XXX: rav1e depends on rust, which currently only works on x86_64.
;; See also the related configure flag when changing this.
,@(if (string-prefix? "x86_64" (or (%current-target-system)
(%current-system)))
`(("rav1e" ,rav1e))
'())))
(synopsis "Encode and decode AVIF files")
(description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image
File Format}. It can encode and decode all YUV formats and bit depths supported

View file

@ -2,6 +2,7 @@
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -77,7 +78,7 @@ (define-public julia-bzip2-jll
'(#:tests? #f ; No runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -117,7 +118,7 @@ (define-public julia-cairo-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -163,7 +164,7 @@ (define-public julia-compilersupportlibraries-jll
`(#:tests? #f ; no runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -205,7 +206,7 @@ (define-public julia-expat-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -243,7 +244,7 @@ (define-public julia-ffmpeg-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -292,7 +293,7 @@ (define-public julia-fontconfig-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -335,7 +336,7 @@ (define-public julia-freetype2-jll
'(#:tests? #f ; No runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -377,7 +378,7 @@ (define-public julia-fribidi-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -413,7 +414,7 @@ (define-public julia-gettext-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -454,7 +455,7 @@ (define-public julia-glfw-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -497,7 +498,7 @@ (define-public julia-glib-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -541,7 +542,7 @@ (define-public julia-gr-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -590,7 +591,7 @@ (define-public julia-gumbo-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((gumbo (string-append (assoc-ref inputs "gumbo-parser"))))
(for-each
@ -630,7 +631,7 @@ (define-public julia-imagemagick-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -672,7 +673,7 @@ (define-public julia-jllwrappers
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'custom-override-path
(add-after 'link-depot 'custom-override-path
(lambda* (#:key inputs #:allow-other-keys)
;; Make @generate_wrapper_header take an optional argument that
;; guix packagers can pass to override the default "override"
@ -718,7 +719,7 @@ (define-public julia-jpegturbo-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -754,7 +755,7 @@ (define-public julia-lame-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -790,7 +791,7 @@ (define-public julia-libass-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -830,7 +831,7 @@ (define-public julia-libfdk-aac-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -866,7 +867,7 @@ (define-public julia-libffi-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -903,7 +904,7 @@ (define-public julia-libgcrypt-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -942,7 +943,7 @@ (define-public julia-libglvnd-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -980,7 +981,7 @@ (define-public julia-libgpg-error-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1018,7 +1019,7 @@ (define-public julia-libiconv-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1056,7 +1057,7 @@ (define-public julia-libmount-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1095,7 +1096,7 @@ (define-public julia-libpng-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1133,7 +1134,7 @@ (define-public julia-libsass-jll
`(#:tests? #f ; no runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1175,7 +1176,7 @@ (define-public julia-libtiff-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1214,7 +1215,7 @@ (define-public julia-libuuid-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1252,7 +1253,7 @@ (define-public julia-libvorbis-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1290,7 +1291,7 @@ (define-public julia-lzo-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1328,7 +1329,7 @@ (define-public julia-mbedtls-jll
'(#:tests? #f ; No runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1366,7 +1367,7 @@ (define-public julia-ogg-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1403,7 +1404,7 @@ (define-public julia-openspecfun-jll
`(#:tests? #f ; no runtests.jl
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1446,7 +1447,7 @@ (define-public julia-openssl-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1482,7 +1483,7 @@ (define-public julia-opus-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1518,7 +1519,7 @@ (define-public julia-pcre-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1556,7 +1557,7 @@ (define-public julia-pixman-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1594,7 +1595,7 @@ (define-public julia-qt5base-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1645,7 +1646,7 @@ (define-public julia-wayland-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1684,7 +1685,7 @@ (define-public julia-wayland-protocols-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1721,7 +1722,7 @@ (define-public julia-x264-jll
`(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((libx264 (assoc-ref inputs "libx264")))
(map
@ -1762,7 +1763,7 @@ (define-public julia-x265-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1798,7 +1799,7 @@ (define-public julia-xkbcommon-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1838,7 +1839,7 @@ (define-public julia-xml2-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1878,7 +1879,7 @@ (define-public julia-xorg-libpthread-stubs-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1915,7 +1916,7 @@ (define-public julia-xorg-libx11-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1953,7 +1954,7 @@ (define-public julia-xorg-libxau-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -1989,7 +1990,7 @@ (define-public julia-xorg-libxcb-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2029,7 +2030,7 @@ (define-public julia-xorg-libxcursor-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2067,7 +2068,7 @@ (define-public julia-xorg-libxdmcp-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2103,7 +2104,7 @@ (define-public julia-xorg-libxext-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2140,7 +2141,7 @@ (define-public julia-xorg-libxfixes-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2177,7 +2178,7 @@ (define-public julia-xorg-libxi-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2215,7 +2216,7 @@ (define-public julia-xorg-libxinerama-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2252,7 +2253,7 @@ (define-public julia-xorg-libxkbfile-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2289,7 +2290,7 @@ (define-public julia-xorg-libxrandr-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2327,7 +2328,7 @@ (define-public julia-xorg-libxrender-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2364,7 +2365,7 @@ (define-public julia-xorg-xcb-util-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2401,7 +2402,7 @@ (define-public julia-xorg-xcb-util-image-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2438,7 +2439,7 @@ (define-public julia-xorg-xcb-util-keysyms-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2475,7 +2476,7 @@ (define-public julia-xorg-xcb-util-renderutil-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2512,7 +2513,7 @@ (define-public julia-xorg-xcb-util-wm-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2549,7 +2550,7 @@ (define-public julia-xorg-xkbcomp-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2586,7 +2587,7 @@ (define-public julia-xorg-xkeyboard-config-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2623,7 +2624,7 @@ (define-public julia-xorg-xtrans-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2659,7 +2660,7 @@ (define-public julia-xslt-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2702,7 +2703,7 @@ (define-public julia-zlib-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2740,7 +2741,7 @@ (define-public julia-zstd-jll
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'override-binary-path
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
@ -2759,3 +2760,41 @@ (define-public julia-zstd-jll
(synopsis "Zstd library wrappers")
(description "This package provides a wrapper for the zstd library.")
(license license:expat)))
(define-public julia-sundials-jll
(package
(name "julia-sundials-jll")
(version "5.2.1+0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/JuliaBinaryWrappers/Sundials_jll.jl")
(commit (string-append "Sundials-v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0cijb9frq8gj8bjpqf2lr5d0jxlj262y6h6xi4z3536dingrvffc"))))
(build-system julia-build-system)
(arguments
'(#:tests? #f ; no runtests
#:phases
(modify-phases %standard-phases
(add-after 'link-depot 'override-binary-path
(lambda* (#:key inputs #:allow-other-keys)
(map
(lambda (wrapper)
(substitute* wrapper
(("global artifact_dir.*")
(string-append
"global artifact_dir = \""
(assoc-ref inputs "sundials") "\"\n"))))
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")))))))
(inputs
`(("sundials" ,sundials-julia)))
(propagated-inputs
`(("julia-jllwrappers" ,julia-jllwrappers)))
(home-page "https://github.com/JuliaBinaryWrappers/Sundials_jll.jl")
(synopsis "SUndials library wrappers")
(description "This package provides a wrapper for the sundials library.")
(license license:expat)))

View file

@ -410,7 +410,8 @@ (define-public julia-bufferedstreams
;; https://travis-ci.org/BioJulia/BufferedStreams.jl/jobs/491050182
(arguments
'(#:tests? #f
#:julia-package-name "BufferedStreams"))
#:julia-package-name "BufferedStreams"
#:julia-package-uuid "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"))
(propagated-inputs `(("julia-compat" ,julia-compat)))
(home-page "https://github.com/BioJulia/BufferedStreams.jl")
(synopsis "Fast composable IO streams")
@ -778,12 +779,12 @@ (define-public julia-configurations
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(add-after 'link-depot 'fix-tests
(lambda _
(substitute* "test/runtests.jl"
(("option.toml") "test/option.toml"))
#t))
(add-after 'unpack 'dont-use-exproniconlite
(add-after 'link-depot 'dont-use-exproniconlite
(lambda _
(substitute* '("Project.toml"
"src/Configurations.jl"
@ -919,7 +920,7 @@ (define-public julia-dataframes
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-failing-test
(add-after 'link-depot 'skip-failing-test
(lambda _
;; Tests with non-standard colors.
(substitute* "test/show.jl"
@ -1022,7 +1023,7 @@ (define-public julia-datavalues
`(#:tests? #f ; Tests need upgrading with newer Julia version.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-known-failing-tests
(add-after 'link-depot 'skip-known-failing-tests
(lambda _
;; See upstream report:
;; https://github.com/queryverse/DataValues.jl/issues/83
@ -1100,7 +1101,7 @@ (define-public julia-distances
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-flakey-tests
(add-after 'link-depot 'skip-flakey-tests
(lambda _
;; Some combination of these tests fail nondeterministically
;; each of the times this package is built.
@ -1166,14 +1167,14 @@ (define-public julia-documenter
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(add-after 'link-depot 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/Deps.jl"
(("pip install")
(string-append (assoc-ref inputs "python")
"/bin/pip install")))
#t))
(add-after 'unpack 'remove-javascript-downloads
(add-after 'link-depot 'remove-javascript-downloads
(lambda _
(substitute* "src/Writers/HTMLWriter.jl"
(("cdnjs.cloudflare.com") "example.com"))
@ -1352,7 +1353,7 @@ (define-public julia-dualnumbers
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-suite
(add-after 'link-depot 'adjust-test-suite
(lambda _
(substitute* "test/runtests.jl"
;; Seems to not play nicely with SpecialFunctions
@ -1386,7 +1387,7 @@ (define-public julia-ellipsisnotation
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-suite
(add-after 'link-depot 'adjust-test-suite
(lambda _
(substitute* "test/runtests.jl"
;; Seems to not play nicely with Julia-1.6.
@ -1438,7 +1439,7 @@ (define-public julia-expronicon
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-network-tests
(add-after 'link-depot 'skip-network-tests
(lambda _
(substitute* "test/runtests.jl"
;; This test tries to access the Julia package registry.
@ -1517,7 +1518,7 @@ (define-public julia-fileio
`(#:phases
(modify-phases %standard-phases
(delete 'reset-gzip-timestamps)
(add-after 'unpack 'skip-network-tests
(add-after 'link-depot 'skip-network-tests
(lambda _
;; These tests try to download audio/video files.
(substitute* "test/query.jl"
@ -1677,7 +1678,7 @@ (define-public julia-fixedpointnumbers
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-test
(add-after 'link-depot 'disable-failing-test
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "test/fixed.jl"
;; A deprecation warning is not thrown
@ -1764,7 +1765,7 @@ (define-public julia-functionwrappers
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-tests
(add-after 'link-depot 'adjust-tests
(lambda _
(substitute* "test/runtests.jl"
(("testset \\\"Abstract.*" all)
@ -1817,7 +1818,7 @@ (define-public julia-fuzzycompletions
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-failing-test
(add-after 'link-depot 'skip-failing-test
(lambda _
(substitute* "test/runtests.jl"
((".*RPLE.*") "")))))))
@ -1844,7 +1845,7 @@ (define-public julia-genericlinearalgebra
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-suite
(add-after 'link-depot 'adjust-test-suite
(lambda _
(substitute* "test/runtests.jl"
((".*lapack.*") "")))))))
@ -1875,7 +1876,7 @@ (define-public julia-genericschur
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-test-suite
(add-after 'link-depot 'adjust-test-suite
(lambda _
(substitute* "test/complex.jl"
;; expected Array{Int32,1}, got a value of type Array{Int64,1}
@ -1912,13 +1913,13 @@ (define-public julia-geometrybasics
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-earcut
(add-after 'link-depot 'remove-earcut
(lambda _
(substitute* '("Project.toml"
"src/GeometryBasics.jl")
((".*EarCut.*") ""))
#t))
(add-after 'unpack 'skip-incompatible-test
(add-after 'link-depot 'skip-incompatible-test
(lambda _
(substitute* "test/runtests.jl"
(("@testset.*MetaT and heterogeneous data.*" all)
@ -2268,7 +2269,7 @@ (define-public julia-imagemagick
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-failing-test
(add-after 'link-depot 'skip-failing-test
(lambda _
;; These tests try to download from the imagemagick.org
(substitute* "test/runtests.jl"
@ -2465,7 +2466,7 @@ (define-public julia-infinity
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-timezones.jl
(add-after 'link-depot 'remove-timezones.jl
(lambda _
(substitute* "test/runtests.jl"
(("using TimeZones.*") "")
@ -2864,7 +2865,7 @@ (define-public julia-matrixfactorizations
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-failing-test
(add-after 'link-depot 'skip-failing-test
(lambda _
;; Tests with math functions are hard.
(substitute* "test/test_ul.jl"
@ -2981,7 +2982,8 @@ (define-public julia-media
(build-system julia-build-system)
;; Package without Project.toml
(arguments
'(#:julia-package-name "Media"))
'(#:julia-package-name "Media"
#:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27"))
(propagated-inputs
`(("julia-macrotools" ,julia-macrotools)))
(home-page "https://github.com/JunoLab/Media.jl")
@ -3202,7 +3204,7 @@ (define-public julia-nnlib
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-cuda-tests
(add-after 'link-depot 'skip-cuda-tests
(lambda _
(substitute* "test/runtests.jl"
(("using CUDA") "")
@ -3238,7 +3240,8 @@ (define-public julia-optimtestproblems
(base32 "10h47x5ws42pkqjccimaz0yxfvz41w0yazq6inamfk4lg5g2g3d9"))))
(build-system julia-build-system)
(arguments
`(#:julia-package-name "OptimTestProblems"))
`(#:julia-package-name "OptimTestProblems"
#:julia-package-uuid "cec144fc-5a64-5bc6-99fb-dde8f63e154c"))
(home-page "https://github.com/JuliaNLSolvers/OptimTestProblems.jl")
(synopsis "Collection of optimization test problems")
(description "The purpose of this package is to provide test problems for
@ -3528,7 +3531,7 @@ (define-public julia-prettytables
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-color-tests
(add-after 'link-depot 'skip-color-tests
(lambda _
(substitute* "test/text_backend.jl"
((".*colors\\.jl.*") ""))
@ -3547,7 +3550,7 @@ (define-public julia-prettytables
(define-public julia-pycall
(package
(name "julia-pycall")
(version "1.92.3")
(version "1.92.5")
(source
(origin
(method git-fetch)
@ -3557,7 +3560,7 @@ (define-public julia-pycall
(file-name (git-file-name name version))
(sha256
(base32
"07r99ni6nkxpyrp3wsb5qg4jxz7i2r08dyqbiffy2zm3g0bn88jq"))))
"1fj5d1ihnhnm0pl4hbx6hcd2bpdyhm8jiaqah2axsbd069j70saf"))))
(build-system julia-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
@ -3567,7 +3570,7 @@ (define-public julia-pycall
((guix build python-build-system) #:prefix python:))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-conda
(add-after 'link-depot 'remove-conda
(lambda _
(substitute* "Project.toml"
((".*Conda.*") ""))
@ -3577,7 +3580,7 @@ (define-public julia-pycall
(substitute* "deps/depsutils.jl"
(("Conda.PYTHONDIR") "\"/\""))
#t))
(add-after 'unpack 'set-python
(add-after 'link-depot 'set-python
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python")))
(setenv "PYCALL_JL_RUNTIME_PYTHON"
@ -3690,7 +3693,7 @@ (define-public julia-quadmath
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'hardcode-libmath-location
(add-after 'link-depot 'hardcode-libmath-location
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcclib (assoc-ref inputs "gcc:lib")))
(substitute* "src/Quadmath.jl"
@ -4082,7 +4085,8 @@ (define-public julia-safetestsets
(base32 "1fb1dfdmiw2ggx60hf70954xlps0r48fcb3k3dvxynlz7ylphp96"))))
(build-system julia-build-system)
(arguments
`(#:julia-package-name "SafeTestsets"))
`(#:julia-package-name "SafeTestsets"
#:julia-package-uuid "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"))
(native-inputs
`(("julia-staticarrays" ,julia-staticarrays)))
(home-page "https://github.com/YingboMa/SafeTestsets.jl")
@ -4308,7 +4312,7 @@ (define-public julia-stackviews
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-doctest
(add-after 'link-depot 'skip-doctest
(lambda _
(substitute* "test/runtests.jl"
((".*doctest.*") ""))
@ -4811,6 +4815,7 @@ (define-public julia-uris
(build-system julia-build-system)
(arguments
'(#:julia-package-name "URIs" ;required to run tests
#:julia-package-uuid "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
#:phases
(modify-phases %standard-phases
(add-before 'check 'change-dir
@ -4818,7 +4823,7 @@ (define-public julia-uris
(lambda* (#:key source outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(chdir
(string-append out "/share/julia/packages/URIs/test")))
(string-append out "/share/julia/loadpath/URIs/test")))
#t)))))
;; required for tests
(inputs `(("julia-json" ,julia-json)))

View file

@ -131,6 +131,8 @@ (define llvm-julia
"19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602")
'("llvm-7.0-D44650"
"1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir")
'("llvm7-symver-jlprefix"
"00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm")
'("llvm-6.0-DISABLE_ABI_CHECKS"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg")
'("llvm9-D50010-VNCoercion-ni"
@ -211,7 +213,8 @@ (define llvm-julia
;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"))))
"-DLLVM_LINK_LLVM_DYLIB=ON"
"-DLLVM_VERSION_SUFFIX:STRING=jl"))))
(inputs
(append
(package-inputs llvm-11)
@ -272,7 +275,7 @@ (define-public libwhich
(define-public julia
(package
(name "julia")
(version "1.6.2")
(version "1.6.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -280,7 +283,7 @@ (define-public julia
version "/julia-" version ".tar.gz"))
(sha256
(base32
"0plbj4laifzz8ppk889iv3gaxj1mdddzv7yad6ghml6bfnn24r6m"))
"1515x8fs25l3f9csbmd1v4nm041zvjnvigy6s5iidy4yrkwdx4r5"))
(patches
(search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"))))
(build-system gnu-build-system)
@ -552,7 +555,7 @@ (define-public julia
(basename file)))))
(find-files (string-append (assoc-ref inputs pkgname)
"/lib") pred)))))
(link "llvm" "libLLVM-11\\.so")
(link "llvm" "libLLVM-11jl\\.so")
(link "utf8proc" "libutf8proc\\.so")
#t)))
(add-after 'install 'make-wrapper
@ -672,7 +675,7 @@ (define-public julia
(native-search-paths
(list (search-path-specification
(variable "JULIA_LOAD_PATH")
(files (list "share/julia/packages/")))
(files (list "share/julia/loadpath/")))
(search-path-specification
(variable "JULIA_DEPOT_PATH")
(files (list "share/julia/")))))

View file

@ -5,6 +5,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -403,7 +404,7 @@ (define-public kodi
("ffmpeg" ,ffmpeg)
("flac" ,flac)
("flatbuffers" ,flatbuffers)
("fmt" ,fmt)
("fmt" ,fmt-7)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("fribidi" ,fribidi)

View file

@ -140,14 +140,14 @@ (define-public libuv-for-node
(package
(inherit libuv)
(name "libuv")
(version "1.40.0")
(version "1.42.0")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v" version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
"1551k3ab27vbg9517l9b4iqbramwxdkwgpf53knas05cbfwhvab1"))))
"0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3"))))
(properties '((hidden? . #t)))))
(define-public perl-anyevent

View file

@ -353,7 +353,7 @@ (define (%upstream-linux-source version hash)
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-5.14-version "5.14.16")
(define-public linux-libre-5.14-version "5.14.18")
(define-public linux-libre-5.14-gnu-revision "gnu")
(define deblob-scripts-5.14
(linux-libre-deblob-scripts
@ -363,7 +363,7 @@ (define deblob-scripts-5.14
(base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7")))
(define-public linux-libre-5.14-pristine-source
(let ((version linux-libre-5.14-version)
(hash (base32 "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3")))
(hash (base32 "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.14)))
@ -371,7 +371,7 @@ (define-public linux-libre-5.14-pristine-source
;; 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.10-version "5.10.77")
(define-public linux-libre-5.10-version "5.10.79")
(define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
@ -381,12 +381,12 @@ (define deblob-scripts-5.10
(base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk")))
(hash (base32 "1bd86ywff2mv73sybjdjlvvvhnmsv891jlm17h5nvqifdbhmb6g4")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.157")
(define-public linux-libre-5.4-version "5.4.159")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
@ -396,12 +396,12 @@ (define deblob-scripts-5.4
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz")))
(hash (base32 "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.215")
(define-public linux-libre-4.19-version "4.19.217")
(define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
@ -411,12 +411,12 @@ (define deblob-scripts-4.19
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y")))
(hash (base32 "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.254")
(define-public linux-libre-4.14-version "4.14.255")
(define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
@ -426,12 +426,12 @@ (define deblob-scripts-4.14
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz")))
(hash (base32 "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.289")
(define-public linux-libre-4.9-version "4.9.290")
(define-public linux-libre-4.9-gnu-revision "gnu1")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
@ -441,12 +441,12 @@ (define deblob-scripts-4.9
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "19kz74qgw5yzfinnsvljmn2zm855lr4cxgfpn8gwljmkspyx1hm5")))
(hash (base32 "1ns0xbcgv0ix4b3xkcws8g3ks1a31kzc5whmkf9arz1k8si5mpnd")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.291")
(define-public linux-libre-4.4-version "4.4.292")
(define-public linux-libre-4.4-gnu-revision "gnu1")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
@ -456,7 +456,7 @@ (define deblob-scripts-4.4
(base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "0lbbvv3ha4d8nwzjh8bdk0aqyd12w6gw0nsxsdnp8pbmnndgb9vh")))
(hash (base32 "0v5rz8na1d458grc49x3j1951mhvxvqzjq5g9rv1hi0p9rjala97")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -1002,9 +1002,6 @@ (define-public linux-libre-arm-generic
("CONFIG_RTC_DRV_RK808" . #t))
%default-extra-linux-options)))
(define-public linux-libre-arm-veyron
(deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic))
(define-public linux-libre-arm-generic-5.10
(make-linux-libre* linux-libre-5.10-version
linux-libre-5.10-gnu-revision
@ -6597,7 +6594,7 @@ (define-public mtd-utils
(define-public libseccomp
(package
(name "libseccomp")
(version "2.5.2")
(version "2.5.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/"
@ -6605,7 +6602,7 @@ (define-public libseccomp
"/libseccomp-" version ".tar.gz"))
(sha256
(base32
"1pw7rd4gwqpmraipgdqkdkhnx4ql35wrn3lnjgl6pncinkgm59hp"))))
"0xhan73zn4p0n7s8vx6s47wjmidvk4x8r90vfbljairn6f3mq1jr"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")

View file

@ -298,8 +298,8 @@ (define-public ecl-eos
(sbcl-package->ecl-package sbcl-eos))
(define-public sbcl-fiasco
(let ((commit "d62f7558b21addc89f87e306f65d7f760632655f")
(revision "1"))
(let ((commit "bb47d2fef4eb24cc16badc1c9a73d73c3a7e18f5")
(revision "2"))
(package
(name "sbcl-fiasco")
(version (git-version "0.0.1" revision commit))
@ -312,7 +312,7 @@ (define-public sbcl-fiasco
(file-name (git-file-name "fiasco" version))
(sha256
(base32
"1zwxs3d6iswayavcmb49z2892xhym7n556d8dnmvalc32pm9bkjh"))))
"1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
@ -396,6 +396,47 @@ (define-public cl-hu.dwim.stefil
(define-public ecl-hu.dwim.stefil
(sbcl-package->ecl-package sbcl-hu.dwim.stefil))
(define-public sbcl-kaputt
(let ((commit "f26c9b0f8219fe61d86249198ef85174eecafc10")
(revision "1"))
(package
(name "sbcl-kaputt")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/foretspaisibles/cl-kaputt")
(commit commit)))
(file-name (git-file-name "kaputt" version))
(sha256
(base32 "10a78032vnf12kjjpfmq9ign38cad237ycyq37dwnx922nxjjaj4"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cl-ppcre" ,sbcl-cl-ppcre)))
(home-page "https://github.com/foretspaisibles/cl-kaputt")
(synopsis "Simple interactive test framework for Common Lisp")
(description
"KAPUTT is a test framework for Common Lisp that focuses on the
following features:
@itemize
@item KAPUTT is simple, it only defines three abstractions testcase, assertion
and protocol and does not add any artefact on the backtrace when errors occur.
@item KAPUTT is extensible, it is possible to add problem-specific assertions
to make test code more informative.
@item KAPUTT fits well interactive development.
@end itemize\n")
(license license:cecill-b))))
(define-public ecl-kaputt
(sbcl-package->ecl-package sbcl-kaputt))
(define-public cl-kaputt
(sbcl-package->cl-source-package sbcl-kaputt))
(define-public sbcl-lift
(let ((commit "2594160d6ca3a77d8750110dfa63214256aab852")
(revision "2"))

View file

@ -3230,7 +3230,7 @@ (define-public ecl-cl-cffi-gtk
(define-public sbcl-cl-webkit
(package
(name "sbcl-cl-webkit")
(version "3.0.0")
(version "3.2.0")
(source
(origin
(method git-fetch)
@ -3240,7 +3240,7 @@ (define-public sbcl-cl-webkit
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
"015xry1cvbgspfzz35ifz2qscz946ljhj2z8rzjscy9v8fgnjsdk"))))
"1c0kas8k02167v5f1gjbhy3741b7ky91x7lkc5bh5429jmbpiapf"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)
@ -5775,6 +5775,46 @@ (define-public cl-cxml
(define-public ecl-cxml
(sbcl-package->ecl-package sbcl-cxml))
(define-public sbcl-cxml-rng
(let ((commit "bdcfeb92798694b2935a8321e641d8803e814b7b")
(revision "1"))
(package
(name "sbcl-cxml-rng")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "http://www.lichteblau.com/git/cxml-rng.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1rld038hmvm0whaffkszd5ks7mg44z1vfbgddal434df8sgspzql"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cxml" ,sbcl-cxml)
("cl-ppcre" ,sbcl-cl-ppcre)
("yacc" ,sbcl-cl-yacc)
("parse-number" ,sbcl-parse-number)
("cl-base64" ,sbcl-cl-base64)))
(synopsis "Relax NG for Closure XML (CXML)")
(description "An implementation of Relax NG schema validation written in
Common Lisp, including support for compact syntax, DTD Compatibility, and the
XSD type library.")
(home-page "http://www.lichteblau.com/cxml-rng/")
(license license:x11-style))))
(define-public cl-cxml-rng
(sbcl-package->cl-source-package sbcl-cxml-rng))
;; FIXME: Fails on ECL with
;; In function STRUCTURE-SET, the value of the first argument is
;; #<empty 0x7fffeb0fd440>
;; which is not of the expected type %TYPED-PATTERN.
;; (define-public ecl-cxml-rng
;; (sbcl-package->ecl-package sbcl-cxml-rng))
(define-public sbcl-cl-reexport
(let ((commit "312f3661bbe187b5f28536cd7ec2956e91366c3b")
(revision "1"))
@ -14123,10 +14163,10 @@ (define-public cl-shlex
(sbcl-package->cl-source-package sbcl-shlex))
(define-public sbcl-cmd
(let ((commit "8ace7fb45f2ecf0eefae28583ee36c941d142179"))
(let ((commit "b0b79adf1214dbec082f3dd2274a72a0ff58efd7"))
(package
(name "sbcl-cmd")
(version (git-version "0.0.1" "4" commit))
(version (git-version "0.0.1" "5" commit))
(source
(origin
(method git-fetch)
@ -14135,7 +14175,7 @@ (define-public sbcl-cmd
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1da8sa0fsvsdivnx2s9m6jbb7yszrnkqqcxrn1sszp7k6iwnnkgi"))))
(base32 "0kk29vydmi1fyhpbwy3mrsg3bhvx0478r6r7jcsfkr3ci2h8w8a1"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
@ -17561,6 +17601,44 @@ (define-public ecl-trial
(define-public cl-trial
(sbcl-package->cl-source-package sbcl-trial))
(define-public sbcl-alloy
(let ((commit "e86e22c2887836ec31cd97e039f0bca5248d8f1c")
(revision "1"))
(package
(name "sbcl-alloy")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Shirakumo/alloy")
(commit commit)))
(file-name (git-file-name "alloy" version))
(sha256
(base32 "1jsqjr6sf86hcdvnjp4gd10qv0r7kfkr9hmda85irb5lha4q9n7w"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("alexandria" ,sbcl-alexandria)
("parachute" ,sbcl-parachute)))
(inputs
`(("array-utils" ,sbcl-array-utils)
("closer-mop" ,sbcl-closer-mop)
("documentation-utils" ,sbcl-documentation-utils)))
(home-page "https://shirakumo.github.io/alloy/")
(synopsis
"Common Lisp user interface protocol and toolkit implementation")
(description
"Alloy is a user interface toolkit. It is defined through a set of
protocols that allow for a clear interface, as well as a standardised way to
integrate Alloy into a target backend.")
(license license:zlib))))
(define-public ecl-alloy
(sbcl-package->ecl-package sbcl-alloy))
(define-public cl-alloy
(sbcl-package->cl-source-package sbcl-alloy))
(define-public sbcl-org-sampler
(let ((commit "ee135a417750e5b1d810bb9574eb85223cb3038a")
(revision "1"))
@ -18627,6 +18705,124 @@ (define-public cl-clinenoise
(define-public ecl-clinenoise
(sbcl-package->ecl-package sbcl-clinenoise))
(define-public sbcl-periodic-table
(package
(name "sbcl-periodic-table")
(version "1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://common-lisp.net/project/chemboy/periodic-table-"
version ".tar.gz"))
(sha256
(base32 "1ircvqm3q93ma4rxbxprb1i9rcax10ld6xmdzdhfnigr27sh5jvg"))))
(build-system asdf-build-system/sbcl)
(home-page "https://common-lisp.net/project/chemboy/")
(synopsis "Periodic table for Common Lisp")
(description
"This package defines a Common Lisp package, @code{:elements}, with an
@code{ELEMENT} structure and a number of functions to search the periodic
table.")
(license license:llgpl)))
(define-public cl-periodic-table
(sbcl-package->cl-source-package sbcl-periodic-table))
(define-public ecl-periodic-table
(sbcl-package->ecl-package sbcl-periodic-table))
(define-public sbcl-chemical-compounds
(package
(name "sbcl-chemical-compounds")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://common-lisp.net/project/chemboy/chemical-compounds-"
version ".tar.gz"))
(sha256
(base32 "12fd8a6ay5qlsq4givzgh9d55mbg4ci2vvmymig6pjl2ms64v0pf"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("periodic-table" ,sbcl-periodic-table)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-files
(lambda _
;; Fix incorrect version number.
(substitute* "chemical-compounds.asd"
((":version \"1.0.1\"")
(string-append ":version \"" ,version "\"")))
;; Remove incorrect declaration of string type.
(substitute* "parsing.lisp"
(("\\(declare \\(simple-base-string string\\)")
"(declare")))))))
(home-page "https://common-lisp.net/project/chemboy/")
(synopsis "Chemical formula parser and pretty-printer for Common Lisp")
(description
"It can sometimes be useful to be able to parse chemical compounds in a
user-friendly syntax into easy-to-manipulate s-expressions. You also want to
be able to go in reverse. You could probably write your own parser or you
could just install the chemical-compounds package.")
(license license:llgpl)))
(define-public cl-chemical-compounds
(sbcl-package->cl-source-package sbcl-chemical-compounds))
(define-public ecl-chemical-compounds
(sbcl-package->ecl-package sbcl-chemical-compounds))
(define-public sbcl-chemboy
(package
(name "sbcl-chemboy")
(version "0.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://common-lisp.net/project/chemboy/chemboy-"
version ".tar.gz"))
(sha256
(base32 "0lr134l16mjcgdj3fm2yff4chlfbihn1sji7q80y7lnr176zgs7d"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("chemical-compounds" ,sbcl-chemical-compounds)
("periodic-table" ,sbcl-periodic-table)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-files
(lambda _
;; Fix incorrect version number.
(substitute* "chemboy.asd"
((":version \"0.2\"")
(string-append ":version \"" ,version "\"")))
;; Remove incorrect declaration of string type.
(substitute* "query-parsing.lisp"
(("\\(declare \\(simple-base-string string\\)")
"(declare"))
;; Fix incorrect function calls.
(substitute* "conversions.lisp"
(("\\(pprint-compound element s\\)")
"(pprint-compound element :stream s)")
(("\\(pprint-compound parsed-compound s\\)")
"(pprint-compound parsed-compound :stream s)")))))))
(home-page "https://common-lisp.net/project/chemboy/")
(synopsis "Common Lisp program for doing basic chemistry calculations")
(description
"Chemboy is a Common Lisp program for doing basic chemistry calculations.
This package provides the text-based interface for Chemboy.")
(license license:llgpl)))
(define-public cl-chemboy
(sbcl-package->cl-source-package sbcl-chemboy))
(define-public ecl-chemboy
(sbcl-package->ecl-package sbcl-chemboy))
(define-public sbcl-cl-pass
(let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34")
(revision "1"))
@ -18660,3 +18856,397 @@ (define-public cl-pass
(define-public ecl-cl-pass
(sbcl-package->ecl-package sbcl-cl-pass))
(define-public sbcl-cl-tld
;; No release.
(let ((commit "6529c70042cf6e82be39bc522e87ad87da08f1c9"))
(package
(name "sbcl-cl-tld")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lu4nx/cl-tld")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1l6f0sak90pqjzkrjg0cyk7gv9h8gwpfvc0964z98dw2nj3hakqb"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/lu4nx/cl-tld/")
(synopsis "Extract the Top Level Domain from domains, in Common Lisp")
(description
"This library extracts the TLD (Top Level Domain) from domains. The
information is taken from @url{https://publicsuffix.org}.")
(license license:public-domain))))
(define-public cl-tld
(sbcl-package->cl-source-package sbcl-cl-tld))
(define-public ecl-cl-tld
(sbcl-package->ecl-package sbcl-cl-tld))
(define-public sbcl-cl-strftime
;; No release.
(let ((commit "21cb57f2595faa26d687893963f24ec41822b63c"))
(package
(name "sbcl-cl-strftime")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/cl-strftime/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("local-time" ,sbcl-local-time)
("ppcre" ,sbcl-cl-ppcre)
("serapeum" ,sbcl-serapeum)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)
("cffi" ,sbcl-cffi)))
(home-page "https://github.com/ruricolist/cl-strftime")
(synopsis "Common Lisp compiler for the strftime language")
(description
"CL-STRFTIME is a Common Lisp compiler for the strftime “language.”")
(license license:expat))))
(define-public cl-strftime
(sbcl-package->cl-source-package sbcl-cl-strftime))
(define-public ecl-cl-strftime
(sbcl-package->ecl-package sbcl-cl-strftime))
(define-public sbcl-exit-hooks
;; No release.
(let ((commit "78050f4f55c138fcea86a9d720928782021b6012"))
(package
(name "sbcl-exit-hooks")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ailisp/exit-hooks/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/ailisp/exit-hooks")
(synopsis "Call functions automatically when Common Lisp exits")
(description
"@code{exit-hooks} provides a portable way to automatically call some
user-defined function when exiting Common Lisp (both @code{quit} from the REPL
or a kill in a shell). Like @code{atexit} in C and Python or Javas
@code{Runtime.addShutdownHook()}. It currently supports SBCL, CCL, ECL, ABCL,
Allegro CL, clisp and CMUCL. Before exit-hooks, there was no portable way of
doing so and no staightforward way to use an exit hook on ABCL. It can be used
for tasks like parmenantly save something when exiting Lisp.")
(license license:bsd-2))))
(define-public cl-exit-hooks
(sbcl-package->cl-source-package sbcl-exit-hooks))
(define-public ecl-exit-hooks
(sbcl-package->ecl-package sbcl-exit-hooks))
(define-public sbcl-cl-base58
(let ((commit "f446835b4104896e0eed6a61d2ceb4ad22f589d8")
(revision "1"))
(package
(name "sbcl-cl-base58")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/eudoxia0/cl-base58/")
(commit commit)))
(file-name (git-file-name "cl-base58" version))
(sha256
(base32 "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"))))
(build-system asdf-build-system/sbcl)
(arguments
'(#:asd-systems '("cl-base58-test" "cl-base58")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "cl-base58-test.asd"
(("cl-test-more")
"prove"))
#t)))))
(native-inputs
`(("prove" ,sbcl-prove)))
(home-page "https://github.com/eudoxia0/cl-base58")
(synopsis "Implementation of base58 for Common Lisp")
(description
"This library implements the @code{base58} encoding algorithm. It's
basically @code{base64} but with a smaller alphabet (58, as in the name) that
doesn't include similar looking characters, among other things. See
@url{https://github.com/bitcoin/bitcoin/blob/master/src/base58.h} for a full
reference.")
(license license:expat))))
(define-public cl-base58
(sbcl-package->cl-source-package sbcl-cl-base58))
(define-public ecl-cl-base58
(sbcl-package->ecl-package sbcl-cl-base58))
(define-public sbcl-bit-smasher
;; No release.
(let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9"))
(package
(name "sbcl-bit-smasher")
(version (git-version "1.0.2" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/thephoeron/bit-smasher/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0wjmwn06fjpw0rlpaksf3ab727p8fnzj58z7jajl3m0wqd4ii74w"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cl-base64" ,sbcl-cl-base64)
("cl-base58" ,sbcl-cl-base58)))
;; Load order matters for tests, both for file reading and evaluation.
(arguments
`(#:asd-systems '("bit-smasher-test" "bit-smasher")
#:asd-files '("bit-smasher.asd" "bit-smasher-test.asd")))
(home-page "https://github.com/thephoeron/bit-smasher/")
(synopsis "Handle bit vectors, bit vector arithmetic, and type conversions")
(description
"Utility library for handling bit vectors, bit vector arithmetic, and
universal integer type conversions between bit-vectors, byte-vectors, octals,
decimals, and hexadecimal notation.")
(license license:expat))))
(define-public cl-bit-smasher
(sbcl-package->cl-source-package sbcl-bit-smasher))
(define-public ecl-bit-smasher
(sbcl-package->ecl-package sbcl-bit-smasher))
(define-public sbcl-overlord
;; No release.
(let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763"))
(package
(name "sbcl-overlord")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/overlord/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1maqm53yhlhaa3cka8xcc4sq24ifrr4y3y0s5dyyn682xsh14hb4"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("babel" ,sbcl-babel)
("bit-smasher" ,sbcl-bit-smasher)
("bordeaux-threads" ,sbcl-bordeaux-threads)
("cl-strftime" ,sbcl-cl-strftime)
("cmd" ,sbcl-cmd)
("drakma" ,sbcl-drakma)
("exit-hooks" ,sbcl-exit-hooks)
("fset" ,sbcl-fset)
("local-time" ,sbcl-local-time)
("lparallel" ,sbcl-lparallel)
("md5" ,sbcl-md5)
("murmurhash" ,sbcl-cl-murmurhash)
("named-readtables" ,sbcl-named-readtables)
("ppcre" ,sbcl-cl-ppcre)
("serapeum" ,sbcl-serapeum)
("trivia" ,sbcl-trivia)
("trivial-file-size" ,sbcl-trivial-file-size)))
(propagated-inputs
`(("quickproject" ,sbcl-quickproject)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
`(#:asd-files '("overlord.asd")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'include-overlord/net
(lambda _
(substitute* "all.lisp"
(("\\(:import-from :overlord/kernel :nproc\\)")
(string-append
"(:import-from :overlord/kernel :nproc)"
"\n"
"(:import-from :overlord/net)")))
#t)))))
(home-page "https://github.com/ruricolist/overlord")
(synopsis "Build system in Common Lisp")
(description
"Overlord is a build system in Common Lisp. It is a real build system,
with all the modern features: rules with multiple outputs, parallel builds,
immunity to clock issues, and dynamic dependencies.
But Overlord is more than another build system. Overlord is a uniform
approach to dependencies inside or outside of a Lisp image. Overlord is to
Make what Lisp macros are to C macros.
Overlord is designed to be used from the Lisp REPL. A command line interface
is available in a separate repository. See
@url{https://github.com/ruricolist/overlord-cli}.")
(license license:expat))))
(define-public cl-overlord
(sbcl-package->cl-source-package sbcl-overlord))
;; FIXME: Broken on ECL? https://github.com/ruricolist/overlord/issues/25
;; (define-public ecl-overlord
;; (sbcl-package->ecl-package sbcl-overlord))
(define-public sbcl-xpath
;; No release.
(let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3"))
(package
(name "sbcl-xpath")
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sharplispers/xpath/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cxml" ,sbcl-cxml)
("parse-number" ,sbcl-parse-number)
("cl-ppcre" ,sbcl-cl-ppcre)
("yacc" ,sbcl-cl-yacc)))
(home-page "https://github.com/sharplispers/xpath/")
(synopsis "Implementation of the XML Path Language (XPath) Version 1.0")
(description
"This library is an implementation of the XML Path Language (XPath)
Version 1.0.")
(license license:bsd-2))))
;; According to
;; https://github.com/sharplispers/xpath/blob/master/doc/index.xml ECL is not
;; supported.
(define-public cl-xpath
(sbcl-package->cl-source-package sbcl-xpath))
(define-public sbcl-fxml
;; No release.
(let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1"))
(package
(name "sbcl-fxml")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/fxml/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("babel" ,sbcl-babel)
("named-readtables" ,sbcl-named-readtables)
("serapeum" ,sbcl-serapeum)
("quri" ,sbcl-quri)
("flexi-streams" ,sbcl-flexi-streams)
("split-sequence" ,sbcl-split-sequence)
("alexandria" ,sbcl-alexandria)
("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)
("cxml" ,sbcl-cxml)
("cxml-rng" ,sbcl-cxml-rng)
("xpath" ,sbcl-xpath)))
(home-page "https://github.com/ruricolist/fxml")
(synopsis "XML parser and serializer in Common Lisp")
(description
"FXML is a secure-by-default, error-recovering XML parser and serializer.
It is a fork of CXML.
You should use FXML instead of CXML if:
@itemize
@item You are parsing potentially ill-formed XML.
@item You are parsing potentially malicious XML.
@item You need to use Klacks with namespaces.
@end itemize
FXMLs API is very close to CXML's, and for the most part you can refer to the
CXML documentation for usage.")
(license license:llgpl))))
(define-public cl-fxml
(sbcl-package->cl-source-package sbcl-fxml))
(define-public sbcl-vernacular
;; No release.
(let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f"))
(package
(name "sbcl-vernacular")
(version (git-version "0.8.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ruricolist/vernacular/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745"))
(modules '((guix build utils)))
(snippet
'(begin
;; The demo depends on cl-js, which we don't have at this point.
(delete-file-recursively "demo")
#t))))
(build-system asdf-build-system/sbcl)
(inputs
`(("overlord" ,sbcl-overlord)
("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all)
("local-time" ,sbcl-local-time)
("parse-js" ,sbcl-parse-js)
("trivia" ,sbcl-trivia)
("trivial-garbage" ,sbcl-trivial-garbage)
("named-readtables" ,sbcl-named-readtables)
("alexandria" ,sbcl-alexandria)
("serapeum" ,sbcl-serapeum)
("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
(arguments
;; Circular dependency: Tests depend on core-lisp
;; (http://github.com/ruricolist/core-lisp) which depends on
;; Vernacular.
'(#:tests? #f))
(home-page "https://github.com/ruricolist/vernacular")
(synopsis "Module system for languages that compile to Common Lisp")
(description
"Vernacular is a build and module system for languages that compile to
Common Lisp. It allows languages to compile to Lisp while remaining part of
the Common Lisp ecosystem. Vernacular languages interoperate with Common Lisp
and one another.
Vernacular handles locating files, compiling files into FASLs, tracking
dependencies and rebuilding, and export and import between your new language,
Lisp, and any other language Vernacular supports.
Vernacular builds on Overlord and is inspired by Racket.")
(license license:expat))))
(define-public cl-vernacular
(sbcl-package->cl-source-package sbcl-vernacular))

View file

@ -477,6 +477,7 @@ (define (make-clang-toolchain clang)
(inputs `(("clang" ,clang)
("ld-wrapper" ,(car (assoc-ref (%final-inputs) "ld-wrapper")))
("binutils" ,binutils)
("libomp" ,libomp) ;used when linking with '-fopenmp'
("libc" ,glibc)
("libc-debug" ,glibc "debug")
("libc-static" ,glibc "static")))))

View file

@ -181,7 +181,7 @@ (define-public multitail
(define-public spdlog
(package
(name "spdlog")
(version "1.8.5")
(version "1.9.2")
(source
(origin
(method git-fetch)
@ -190,7 +190,7 @@ (define-public spdlog
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg"))))
(base32 "1img03ka63hf3sb62v5f02ax5jc9mlpz5cijr38xxzymvcg1s98r"))))
(build-system cmake-build-system)
;; TODO run benchmark. Currently not possible, as adding
;; (gnu packages benchmark) forms a dependency cycle

View file

@ -14,6 +14,7 @@
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2020 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1140,7 +1141,7 @@ (define-public emilua
(inputs
`(("boost" ,boost)
("boost-static" ,boost-static)
("fmt" ,fmt)
("fmt" ,fmt-7)
;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty
;; fork. Emilua is severely affected by this limit, so the upstream package
;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT
@ -1169,7 +1170,7 @@ (define-public emilua
(define-public fennel
(package
(name "fennel")
(version "0.9.1")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1178,11 +1179,7 @@ (define-public fennel
(file-name (git-file-name name version))
(sha256
(base32
"07qgycf5cxm9zcc4fgpgvplg95ndavh3ynpdjpvzkikzbnyj7xia"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file "fennelview.lua") #t))))
"0d4rpf0f2aqxlca3kxrbhjjhf1knhiz8ccwlx8xid05mc16la70y"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
@ -1191,28 +1188,14 @@ (define-public fennel
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'patch-lua-calls
(lambda* (#:key inputs #:allow-other-keys)
(let ((lua (search-input-file inputs "/bin/lua")))
(setenv "LUA" lua)
(substitute* "old/launcher.lua"
(("/usr/bin/env lua") lua))
#t)))
(add-after 'build 'patch-fennel
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "fennel"
(("/usr/bin/env .*lua")
(search-input-file inputs "/bin/lua")))
#t))
(search-input-file inputs "/bin/lua")))))
(delete 'check)
(add-after 'install 'check
(assoc-ref %standard-phases 'check))
(add-after 'install 'install-manpage
(lambda* (#:key outputs #:allow-other-keys)
(install-file "fennel.1"
(string-append (assoc-ref outputs "out")
"/share/man/man1"))
#t)))))
(assoc-ref %standard-phases 'check)))))
(inputs `(("lua" ,lua)))
(home-page "https://fennel-lang.org/")
(synopsis "Lisp that compiles to Lua")

View file

@ -2750,7 +2750,7 @@ (define-public xnnpack
(define-public python-pytorch
(package
(name "python-pytorch")
(version "1.9.0")
(version "1.10.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2760,7 +2760,7 @@ (define-public python-pytorch
(file-name (git-file-name name version))
(sha256
(base32
"0cznsh68hwk5761gv7iijb4g6jgjpvs3bbixwpzzmkbkbn2q96c1"))
"1ihsjw48qqbikmhxxn17bcdvk2zsjabvkq61q6pvj7dzvrdpkb60"))
(patches (search-patches "python-pytorch-system-libraries.patch"
"python-pytorch-runpath.patch"))
(modules '((guix build utils)))

View file

@ -43,6 +43,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -435,9 +436,6 @@ (define-public guile2.2-mailutils
`(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs mailutils))))))
(define-public guile3.0-mailutils
(deprecated-package "guile3.0-mailutils" mailutils))
(define-public nullmailer
(package
(name "nullmailer")
@ -1169,15 +1167,15 @@ (define-public emacs-mew
(define-public mu
(package
(name "mu")
(version "1.6.9")
(version "1.6.10")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/"
"download/" version "-signed/"
"download/" version "/"
"mu-" version ".tar.xz"))
(sha256
(base32
"0n5gvdz6vn6y69f5gx0gndjdl328qjbvi2q048qynhk99w5476cd"))))
"1dh0x4lqnjflb0k8fybr5clqjxv35scf055g1590pr5znam29hhb"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -1272,6 +1270,10 @@ (define-public alot
(substitute* "tests/commands/test_global.py"
(("def test_no_spawn_no_stdin_attached")
"def _test_no_spawn_no_stdin_attached"))
;; FIXME: Investigate why this test hangs.
(substitute* "tests/db/test_manager.py"
(("def test_save_named_query")
"def _test_save_named_query"))
#t)))))
(native-inputs
`(("procps" ,procps)
@ -4486,6 +4488,41 @@ (define-public libpst
databases, and other tools to process Outlook email archives.")
(license license:gpl2+)))
(define-public neatmail
(package
(name "neatmail")
(version "02")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/aligrudi/neatmail")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "00d453d57d3v6ja2gpmjd8vch804c72g38pc1nr5shmz3hkgd52d"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no tests
#:make-flags `((string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configure script
(replace 'install ;no install target in the Makefile
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(rename-file "mail" "neatmail")
(install-file "neatmail" bin)))))))
(home-page "https://litcave.rudi.ir/")
(synopsis "Text-mode mail client")
(description
"@command{neatmail} is a noninteractive mail client. It generates
a listing of the messages in a mailbox in mbox format and executes a list of
ex-like commands on it.")
(license license:isc)))
(define-public crm114
(package
(name "crm114")
@ -4563,3 +4600,41 @@ (define-public crm114
Bigrams, WINNOW, Correlation, KNN/Hyperspace, or Bit Entropy (or by other
means--it's all programmable).")
(license license:gpl3)))
(define-public rss2email
(package
(name "rss2email")
(version "3.13.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rss2email/rss2email")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0g1yr3v3ibdh2jqil64fbdbplx5m2yzxr893fqfkwcc5c7fbwl4d"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "test"
;; Skip networking tests
(substitute* "test.py"
(("( *)class (:?TestSend|TestFetch).*" match indent)
(string-append indent "@unittest.skip(\"Networking stuff skipped\")\n"
indent match)))
(invoke "python" "-m" "unittest"))))))))
(inputs
`(("python-feedparser" ,python-feedparser)
("python-html2text" ,python-html2text)))
(home-page "https://github.com/rss2email/rss2email")
(synopsis "Converts RSS/Atom newsfeeds to email")
(description "The RSS2email program (@command{r2e}) fetches RSS/Atom news
feeds, converts them into emails, and sends them.")
;; GPL version 2 or 3. NOT 2+.
(license (list license:gpl2
license:gpl3))))

View file

@ -6203,6 +6203,31 @@ (define-public sundials-openmpi
,%openmpi-setup)))))
(synopsis "SUNDIALS with OpenMPI support")))
(define-public sundials-julia
(package
(inherit sundials)
(name "sundials-julia")
(version "5.2.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/LLNL/sundials")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0nx4sqhmi126m14myzm7syv2053harav9snl0a247wnkcgs5rxrv"))))
(inputs
`(("lapack" ,lapack)
,@(package-inputs sundials)))
(arguments
(substitute-keyword-arguments (package-arguments sundials)
((#:configure-flags flags '())
`(cons* "-DLAPACK_ENABLE:BOOL=ON"
,flags))))
(synopsis "SUNDIALS with lapack support as required by julia-sundials-jll")))
(define-public combinatorial-blas
(package
(name "combinatorial-blas")

View file

@ -542,6 +542,82 @@ (define-public libsignal-protocol-c
end-to-end encryption.")
(license license:gpl3+)))
(define-public axc
(package
(name "axc")
(version "0.3.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gkdr/axc")
(commit (string-append "v" version))))
(modules '((guix build utils)))
(snippet
`(begin
;; Submodules
(delete-file-recursively "lib")))
(file-name
(git-file-name name version))
(sha256
(base32 "05sv7l6lk0xk4wb2bspc2sdpygrb1f0szzi82a1kyfm0fjz887b3"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "CC" "gcc")
(setenv "PREFIX" out)))))
#:parallel-tests? #f))
(native-inputs `(("cmocka" ,cmocka)
("pkg-config" ,pkg-config)))
(inputs `(("glib" ,glib)
("libgcrypt" ,libgcrypt)
("libsignal-protocol-c" ,libsignal-protocol-c)
("sqlite" ,sqlite)))
(synopsis "Client library for libsignal-protocol-c")
(description "This is a client library for @code{libsignal-protocol-c}.
It implements the necessary interfaces using @code{libgcrypt} and
@code{sqlite}.")
(home-page "https://github.com/gkdr/axc")
(license license:gpl3))) ;GPLv3-only, per license headers
(define-public libomemo
(package
(name "libomemo")
(version "0.7.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gkdr/libomemo")
(commit (string-append "v" version))))
(file-name
(git-file-name name version))
(sha256
(base32 "1q3vyj8zk3vm0a4v6w8qya5dhk2yw04bga8799a0zl6907nf122k"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "CC" "gcc")
(setenv "PREFIX" out)))))
#:parallel-tests? #f))
(native-inputs `(("cmocka" ,cmocka)
("pkg-config" ,pkg-config)))
(inputs `(("glib" ,glib)
("libgcrypt" ,libgcrypt)
("minixml" ,minixml)
("sqlite" ,sqlite)))
(synopsis "OMEMO C library")
(description "This library implements @acronym{OMEMO, OMEMO Multi-End
Message and Object Encryption} of XMPP (XEP-0384) in C.")
(home-page "https://github.com/gkdr/libomemo")
(license license:expat)))
(define-public bitlbee
(package
(name "bitlbee")
@ -2048,7 +2124,7 @@ (define-public libstrophe
(define-public profanity
(package
(name "profanity")
(version "0.10.0")
(version "0.11.1")
(source
(origin
(method url-fetch)
@ -2057,7 +2133,7 @@ (define-public profanity
version ".tar.gz"))
(sha256
(base32
"137z77514fgj2dk13d12g4jrn6gs5k85nwrk1r1kiv7rj0jy61aa"))))
"0idx0a5g077a57q462w01m0h8i4vyvabzlj87p8527wpqbv4s6vg"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
@ -2609,6 +2685,58 @@ (define-public purple-mm-sms
(home-page "https://source.puri.sm/Librem5/purple-mm-sms")
(license license:gpl2+)))
(define-public purple-lurch
(package
(name "purple-lurch")
(version "0.7.0")
(source
(origin
(method git-fetch)
(uri (git-reference (url "https://github.com/gkdr/lurch")
(commit (string-append "v" version))))
(modules '((guix build utils)))
(snippet
`(begin
;; Submodules
(delete-file-recursively "lib")))
(file-name
(git-file-name name version))
(sha256
(base32 "1ipd9gwh04wbqv6c10yxi02lc2yjsr02hwjycgxhl4r9x8b33psd"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "Makefile"
(("^PURPLE_PLUGIN_DIR = .*")
(string-append "PURPLE_PLUGIN_DIR = " out
"/lib/purple-2\n")))
(setenv "CC" "gcc")))))
#:parallel-tests? #f))
(native-inputs `(("cmocka" ,cmocka)
("pkg-config" ,pkg-config)))
(inputs `(("axc" ,axc)
("glib" ,glib)
("libgcrypt" ,libgcrypt)
("libomemo" ,libomemo)
("libsignal-protocol-c" ,libsignal-protocol-c)
("libxml2" ,libxml2)
("minixml" ,minixml)
("pidgin" ,pidgin)
("sqlite" ,sqlite)))
(synopsis "OMEMO Encryption for libpurple")
(description "Purple-lurch plugin adds end-to-end encryption support
through the Double Ratchet (Axolotl) algorithm, to @code{libpurple}
applications using @acronym{XMPP, Extensible Messaging and Presence Protocol},
through its standard XEP-0384: @acronym{OMEMO, OMEMO Multi-End Message and
Object Encryption} Encryption. It provides confidentiality, (weak) forward
secrecy, break-in recovery, authentication, integrity, deniability, and
asynchronicity.")
(home-page "https://github.com/gkdr/lurch")
(license license:gpl3+)))
(define-public chatty
(package
(name "chatty")

View file

@ -452,9 +452,6 @@ (define-public graphite-web
demand.")
(license license:asl2.0)))
(define-public python2-graphite-web
(deprecated-package "python2-graphite-web" graphite-web))
(define-public python-prometheus-client
(package
(name "python-prometheus-client")

View file

@ -42,8 +42,10 @@ (define-module (gnu packages mpd)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages base)
#:use-module (gnu packages build-tools) ;meson-next
#:use-module (gnu packages boost)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages cmake) ;for MPD
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
@ -61,6 +63,7 @@ (define-module (gnu packages mpd)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages pulseaudio)
@ -105,7 +108,7 @@ (define-public libmpdclient
(define-public mpd
(package
(name "mpd")
(version "0.22.11")
(version "0.23.4")
(source (origin
(method url-fetch)
(uri
@ -114,7 +117,7 @@ (define-public mpd
"/mpd-" version ".tar.xz"))
(sha256
(base32
"1850ii8vnv5l8b561fai4q2mcrnym94mvlrxiy48fvpfm8s7ygql"))))
"0m67wibxc6n6438h2va59n51wwwbwhbdj9635cnpc3wqvlq9sd9g"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=enabled")))
@ -125,6 +128,7 @@ (define-public mpd
("curl" ,curl)
("ffmpeg" ,ffmpeg)
("flac" ,flac)
("fmt" ,fmt)
("glib" ,glib)
("icu4c" ,icu4c)
;; The LAME decoder comes from FFmpeg, but is added here so that
@ -139,7 +143,8 @@ (define-public mpd
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(native-inputs `(("pkg-config" ,pkg-config)
(native-inputs `(("cmake" ,cmake)
("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)))
;; Missing optional inputs:
;; libyajl
@ -167,6 +172,7 @@ (define-public mpd
can play a variety of sound files while being controlled by its network
protocol.")
(home-page "https://www.musicpd.org/")
(properties `((release-monitoring-url . "https://musicpd.org")))
(license license:gpl2)))
(define-public mpd-mpc

View file

@ -1524,6 +1524,39 @@ (define-public lilypond
;; more than an hour of silence, so double the max silent time.
(properties `((max-silent-time . 7200)))))
(define-public music21
(package
(name "music21")
(version "7.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "music21" version))
(sha256
(base32 "17v2id8qm99xqymqsdczq173fmbdha4w109ahh8j1d9l5a7mqc86"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
;; See: https://github.com/cuthbertLab/music21/issues/1164
(invoke "python" "-m" "music21.stream.tests")))))))
(propagated-inputs
`(("python-chardet" ,python-chardet)
("python-joblib" ,python-joblib)
("python-more-itertools" ,python-more-itertools)
("python-webcolors" ,python-webcolors)))
(home-page "https://web.mit.edu/music21/")
(synopsis "Toolkit for Computational Musicology")
(description
"Music21 is a set of tools for helping scholars and other active
listeners answer questions about music quickly and simply.")
;; Software is dual-licensed.
(license (list license:bsd-3 license:lgpl3+))))
(define-public abjad
(package
(name "abjad")

View file

@ -948,7 +948,7 @@ (define-public socat
(define-public mbuffer
(package
(name "mbuffer")
(version "20210328")
(version "20211018")
(source (origin
(method url-fetch)
(uri (string-append
@ -956,8 +956,10 @@ (define-public mbuffer
version ".tgz"))
(sha256
(base32
"0pfw9xw4ph18yss07fl6w8fbqiwy1w9r1knzw5gsb4c993cbidai"))))
"1qxnbpyly00kml3sjan9iqg6pqacsi3yqq66x25w455cwkjc2h72"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))
(inputs `(("openssl" ,openssl)))
(home-page "http://www.maier-komor.de/mbuffer.html")
(synopsis
@ -4080,19 +4082,20 @@ (define-public hashcash
(define-public nbd
(package
(name "nbd")
(version "3.21")
(version "3.22")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/nbd/nbd/" version
"/nbd-" version ".tar.xz"))
(sha256
(base32 "1ydylvvayi4w2d08flji9q03sl7y8hn0c26vsay3nwwikprqls77"))))
(base32 "1ljx6vb3lja5p0lr28vmjp27n9d6krlvq49bhqbcm2ns8vxd1vh6"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)
`(("bison" ,bison)
("pkg-config" ,pkg-config)
("which" ,which)))
(home-page "https://nbd.sourceforge.io/")
(synopsis "NBD client and server")

View file

@ -273,8 +273,9 @@ (define-public node
devices.")
(home-page "https://nodejs.org/")
(license license:expat)
(properties '((max-silent-time . 7200) ;2h, needed on ARM
(timeout . 21600))))) ;6h
(properties '((max-silent-time . 7200) ;2h, needed on ARM
(timeout . 21600) ;6h
(cpe-name . "node.js")))))
;; This should be the latest version of node that still builds without
;; depending on llhttp.
@ -572,7 +573,7 @@ (define-public node-llparse-bootstrap
(define-public llhttp-bootstrap
(package
(name "llhttp")
(version "2.1.3")
(version "2.1.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -581,7 +582,7 @@ (define-public llhttp-bootstrap
(file-name (git-file-name name version))
(sha256
(base32
"0pqj7kyyzr1zs4h9yzn5rdxnxspm3wqgsv00765dd42fszlmrmk8"))
"115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x"))
(patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch"))
(modules '((guix build utils)))
(snippet
@ -642,14 +643,14 @@ (define-public llhttp-bootstrap
(define-public node-lts
(package
(inherit node)
(version "14.16.0")
(version "14.18.1")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
"/node-v" version ".tar.xz"))
(sha256
(base32
"19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf"))
"1vc9rypkgr5i5y946jnyr9jjpydxvm74p1s17rg2zayzvlddg89z"))
(modules '((guix build utils)))
(snippet
`(begin
@ -777,6 +778,9 @@ (define-public node-lts
'("test/parallel/test-dns.js"
"test/parallel/test-dns-lookupService-promises.js"))
;; These tests require networking.
(delete-file "test/parallel/test-https-agent-unref-socket.js")
;; FIXME: This test fails randomly:
;; https://github.com/nodejs/node/issues/31213
(delete-file "test/parallel/test-net-listen-after-destroying-stdin.js")
@ -815,7 +819,7 @@ (define-public node-lts
"deps/llhttp/include/llhttp.h"))))))))
(native-inputs
`(;; Runtime dependencies for binaries used as a bootstrap.
("c-ares" ,c-ares)
("c-ares" ,c-ares-for-node)
("brotli" ,brotli)
("icu4c" ,icu4c-67)
("libuv" ,libuv-for-node)
@ -831,7 +835,7 @@ (define-public node-lts
(inputs
`(("bash" ,bash)
("coreutils" ,coreutils)
("c-ares" ,c-ares)
("c-ares" ,c-ares-for-node)
("icu4c" ,icu4c-67)
("libuv" ,libuv-for-node)
("llhttp" ,llhttp-bootstrap)

View file

@ -2269,6 +2269,7 @@ (define-public ocaml-alcotest
("ocaml-stdlib-shims" ,ocaml-stdlib-shims)
("ocaml-uuidm" ,ocaml-uuidm)
("ocaml-uutf" ,ocaml-uutf)))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-alcotest))))
(home-page "https://github.com/mirage/alcotest")
(synopsis "Lightweight OCaml test framework")
(description "Alcotest exposes simple interface to perform unit tests. It
@ -2279,6 +2280,22 @@ (define-public ocaml-alcotest
simple (yet expressive) query language to select the tests to run.")
(license license:isc)))
(define-public ocaml4.07-alcotest
(package-with-ocaml4.07
(package
(inherit ocaml-alcotest)
(version "1.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mirage/alcotest")
(commit version)))
(file-name (git-file-name "ocaml-alcotest" version))
(sha256
(base32
"1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8"))))
(properties '()))))
(define-public ocaml-ppx-tools
(package
(name "ocaml-ppx-tools")
@ -2403,8 +2420,7 @@ (define-public ocaml-lwt
(arguments
`(#:package "lwt"))
(native-inputs
`(("ocaml-bisect-ppx" ,ocaml-bisect-ppx)
("ocaml-cppo" ,ocaml-cppo)
`(("ocaml-cppo" ,ocaml-cppo)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)))
@ -3354,6 +3370,7 @@ (define-public ocaml-re
`(("ocaml-seq" ,ocaml-seq)))
(native-inputs
`(("ounit" ,ocaml-ounit)))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-re))))
(home-page "https://github.com/ocaml/ocaml-re/")
(synopsis "Regular expression library for OCaml")
(description "Pure OCaml regular expressions with:
@ -3366,6 +3383,19 @@ (define-public ocaml-re
@end enumerate")
(license license:expat)))
(define-public ocaml4.07-re
(package-with-ocaml4.07
(package
(inherit ocaml-re)
(arguments
`(#:test-target "."
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-dune-version
(lambda _
(delete-file "dune-project"))))))
(properties '()))))
(define-public ocaml-ocplib-endian
(package
(name "ocaml-ocplib-endian")
@ -6584,7 +6614,8 @@ (define-public ocaml-bisect-ppx
(arguments
;; Tests require ocamlformat which would lead to circular dependencies
'(#:tests? #f))
(properties '((upstream-name . "bisect_ppx")))
(properties `((upstream-name . "bisect_ppx")
(ocaml4.07-variant . ,(delay ocaml4.07-bisect-ppx))))
(home-page "https://github.com/aantron/bisect_ppx")
(synopsis "Code coverage for OCaml")
(description "Bisect_ppx helps you test thoroughly. It is a small
@ -6596,6 +6627,33 @@ (define-public ocaml-bisect-ppx
then run the Bisect_ppx report tool on the generated visitation files.")
(license license:mpl2.0)))
(define-public ocaml4.07-bisect-ppx
(package-with-ocaml4.07
(package
(inherit ocaml-bisect-ppx)
(version "2.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/aantron/bisect_ppx")
(commit version)))
(file-name (git-file-name "ocaml-bisect-ppx" version))
(sha256
(base32
"1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q"))))
(propagated-inputs
`(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)
,@(package-propagated-inputs ocaml-bisect-ppx)))
(native-inputs
`(("ocaml-ounit2" ,ocaml-ounit2)))
(arguments
`(#:test-target "."
;; tests require git and network
#:tests? #f))
(properties '((upstream-name . "bisect_ppx"))))))
(define-public ocaml-odoc
(package
(name "ocaml-odoc")
@ -6682,6 +6740,12 @@ (define-public ocaml4.07-odoc
(file-name (git-file-name name version))
(sha256
(base32 "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"))))
(inputs
`(("ocaml-alcotest" ,ocaml-alcotest)
("ocaml-markup" ,ocaml-markup)
("ocaml-sexplib" ,ocaml-sexplib)
("ocaml-re" ,ocaml-re)
("ocaml-uutf" ,ocaml-uutf)))
(properties '()))))
(define-public ocaml4.07-fftw3

View file

@ -146,8 +146,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.3.0")
(commit "014f1b607f1d88a8e733017afaca006545b7d99b")
(revision 11))
(commit "9bbbac6783bcdace17d967e85c8ae8d14cbf1ef9")
(revision 12))
(package
(name "guix")
@ -163,7 +163,7 @@ (define-public guix
(commit commit)))
(sha256
(base32
"0mmq0ypkxj6dc1r9j1mdgih87h6fc0mk05hp481cjp8shdc1w6gw"))
"1p0my0gfshdhm1dpqf6j68iipnigmpb23l8p81kwpw5w50x0hfda"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -532,9 +532,6 @@ (define-public guix-daemon
(invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program)))))))
(define-public guile3.0-guix
(deprecated-package "guile3.0-guix" guix))
(define-public guix-minimal
;; A version of Guix which is built with the minimal set of dependencies, as
;; outlined in the README "Requirements" section. Intended as a CI job, so
@ -1042,9 +1039,6 @@ (define-public conda
written entirely in Python.")
(license license:bsd-3)))
(define-public python-conda
(deprecated-package "python-conda" conda))
(define-public conan
(package
(name "conan")
@ -1251,8 +1245,8 @@ (define-public gwl
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
(let ((commit "a4d0ec6bc564bbe98d3e6c03be41de16edbda928")
(revision "35"))
(let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca")
(revision "37"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1263,7 +1257,7 @@ (define-public guix-build-coordinator
(commit commit)))
(sha256
(base32
"0qa7qkskp9xzhyl0fgbm98f8apy8cn2yc9gpxhw0dfc9bkbs1pb9"))
"09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,64 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,8 +19,8 @@ add_test_case(profile_credentials_provider_environment_test)
add_test_case(credentials_provider_first_in_chain_test)
add_test_case(credentials_provider_second_in_chain_test)
add_test_case(credentials_provider_null_chain_test)
-add_test_case(credentials_provider_default_basic_test)
-add_test_case(credentials_provider_default_manual_tls_test)
+#add_test_case(credentials_provider_default_basic_test)
+#add_test_case(credentials_provider_default_manual_tls_test)
add_test_case(credentials_provider_imds_new_destroy)
add_test_case(credentials_provider_imds_connect_failure)
add_test_case(credentials_provider_imds_token_request_failure)
@@ -58,28 +58,28 @@ add_test_case(credentials_provider_x509_basic_success)
add_test_case(credentials_provider_x509_success_multi_part_doc)
add_test_case(credentials_provider_x509_real_new_destroy)
-add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env)
-add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config)
-add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config)
-add_net_test_case(credentials_provider_sts_web_identity_connect_failure)
-add_net_test_case(credentials_provider_sts_web_identity_request_failure)
-add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure)
-add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1)
-add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2)
-add_net_test_case(credentials_provider_sts_web_identity_basic_success_env)
-add_net_test_case(credentials_provider_sts_web_identity_basic_success_config)
-add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc)
-add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy)
-
-add_net_test_case(credentials_provider_sts_direct_config_succeeds)
-add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry)
-add_net_test_case(credentials_provider_sts_direct_config_invalid_doc)
-add_net_test_case(credentials_provider_sts_direct_config_connection_failed)
-add_net_test_case(credentials_provider_sts_direct_config_service_fails)
-add_net_test_case(credentials_provider_sts_from_profile_config_succeeds)
-add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds)
-add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds)
-add_net_test_case(credentials_provider_sts_cache_expiration_conflict)
+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env)
+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config)
+#add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config)
+#add_net_test_case(credentials_provider_sts_web_identity_connect_failure)
+#add_net_test_case(credentials_provider_sts_web_identity_request_failure)
+#add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure)
+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1)
+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2)
+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_env)
+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_config)
+#add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc)
+#add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy)
+
+#add_net_test_case(credentials_provider_sts_direct_config_succeeds)
+#add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry)
+#add_net_test_case(credentials_provider_sts_direct_config_invalid_doc)
+#add_net_test_case(credentials_provider_sts_direct_config_connection_failed)
+#add_net_test_case(credentials_provider_sts_direct_config_service_fails)
+#add_net_test_case(credentials_provider_sts_from_profile_config_succeeds)
+#add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds)
+#add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds)
+#add_net_test_case(credentials_provider_sts_cache_expiration_conflict)
add_test_case(credentials_provider_process_new_destroy_from_config)
add_test_case(credentials_provider_process_new_failed)

View file

@ -0,0 +1,19 @@
aws-sdk-cpp depends on the private headers from aws-c-auth. This dependency was
added to aws-sdk-cpp in commit 23cca02c2df on 2021-06-04.
The following error is generated when building aws-sdk-cpp when the private
aws-c-auth headers are not installed:
/tmp/guix-build-aws-sdk-cpp-1.9.121.drv-0/aws-sdk-cpp-1.9.121-checkout/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp:17:10: fatal error: aws/auth/private/aws_signing.h: No such file or directory
#include <aws/auth/private/aws_signing.h>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +114,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS})
aws_prepare_shared_lib_exports(${PROJECT_NAME})
install(FILES ${AWS_AUTH_ROOT_HEADERS} DESTINATION "include/aws/auth" COMPONENT Development)
+install(FILES ${AWS_AUTH_PRIVATE_HEADERS} DESTINATION "include/aws/auth/private" COMPONENT Development)
if (BUILD_SHARED_LIBS)
set (TARGET_DIR "shared")

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,10 @@ endif()
option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF)
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,10 @@ if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,10 @@
cmake_minimum_required (VERSION 3.1)
project (aws-c-event-stream C)
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ endif()
option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration tests that rely on a proxy server installed and running locally" OFF)
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,48 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -136,8 +136,8 @@ add_test_case(strutil_trim_http_whitespace)
add_test_case(strutil_is_http_token)
add_test_case(strutil_is_lowercase_http_token)
-add_net_test_case(tls_download_medium_file_h1)
-add_net_test_case(tls_download_medium_file_h2)
+#add_net_test_case(tls_download_medium_file_h1)
+#add_net_test_case(tls_download_medium_file_h2)
add_test_case(websocket_decoder_sanity_check)
add_test_case(websocket_decoder_simplest_frame)
@@ -438,21 +438,21 @@ add_test_case(connection_setup_shutdown)
# connection manager tests
# unit tests where connections are mocked
-add_net_test_case(test_connection_manager_setup_shutdown)
-add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
-add_net_test_case(test_connection_manager_connect_callback_failure)
-add_net_test_case(test_connection_manager_connect_immediate_failure)
-add_net_test_case(test_connection_manager_proxy_setup_shutdown)
-add_net_test_case(test_connection_manager_idle_culling_single)
-add_net_test_case(test_connection_manager_idle_culling_many)
-add_net_test_case(test_connection_manager_idle_culling_mixture)
+#add_net_test_case(test_connection_manager_setup_shutdown)
+#add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
+#add_net_test_case(test_connection_manager_connect_callback_failure)
+#add_net_test_case(test_connection_manager_connect_immediate_failure)
+#add_net_test_case(test_connection_manager_proxy_setup_shutdown)
+#add_net_test_case(test_connection_manager_idle_culling_single)
+#add_net_test_case(test_connection_manager_idle_culling_many)
+#add_net_test_case(test_connection_manager_idle_culling_mixture)
# tests where we establish real connections
-add_net_test_case(test_connection_manager_single_connection)
-add_net_test_case(test_connection_manager_many_connections)
-add_net_test_case(test_connection_manager_acquire_release)
-add_net_test_case(test_connection_manager_close_and_release)
-add_net_test_case(test_connection_manager_acquire_release_mix)
+#add_net_test_case(test_connection_manager_single_connection)
+#add_net_test_case(test_connection_manager_many_connections)
+#add_net_test_case(test_connection_manager_acquire_release)
+#add_net_test_case(test_connection_manager_close_and_release)
+#add_net_test_case(test_connection_manager_acquire_release_mix)
add_test_case(h1_server_sanity_check)

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,103 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -52,8 +52,8 @@ add_test_case(local_socket_communication)
add_net_test_case(tcp_socket_communication)
add_net_test_case(udp_socket_communication)
add_test_case(udp_bind_connect_communication)
-add_net_test_case(connect_timeout)
-add_net_test_case(connect_timeout_cancelation)
+#add_net_test_case(connect_timeout)
+#add_net_test_case(connect_timeout_cancelation)
if (USE_VSOCK)
add_test_case(vsock_loopback_socket_communication)
endif ()
@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors)
add_test_case(incoming_duplicate_tcp_bind_errors)
add_test_case(incoming_udp_sock_errors)
add_test_case(wrong_thread_read_write_fails)
-add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
+#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
add_test_case(cleanup_in_accept_doesnt_explode)
add_test_case(cleanup_in_write_cb_doesnt_explode)
add_test_case(sock_write_cb_is_async)
@@ -81,21 +81,21 @@ add_test_case(channel_tasks_run)
add_test_case(channel_rejects_post_shutdown_tasks)
add_test_case(channel_cancels_pending_tasks)
add_test_case(channel_duplicate_shutdown)
-add_net_test_case(channel_connect_some_hosts_timeout)
+#add_net_test_case(channel_connect_some_hosts_timeout)
-add_net_test_case(test_default_with_ipv6_lookup)
+#add_net_test_case(test_default_with_ipv6_lookup)
add_test_case(test_resolver_ipv6_address_lookup)
-add_net_test_case(test_default_with_multiple_lookups)
+#add_net_test_case(test_default_with_multiple_lookups)
add_test_case(test_resolver_ipv4_address_lookup)
-add_net_test_case(test_default_with_ipv4_only_lookup)
+#add_net_test_case(test_default_with_ipv4_only_lookup)
add_test_case(test_resolver_ttls)
add_test_case(test_resolver_connect_failure_recording)
add_test_case(test_resolver_ttl_refreshes_on_resolve)
add_net_test_case(test_resolver_listener_create_destroy)
-add_net_test_case(test_resolver_add_listener_before_host)
-add_net_test_case(test_resolver_add_listener_after_host)
-add_net_test_case(test_resolver_add_multiple_listeners_fn)
+#add_net_test_case(test_resolver_add_listener_before_host)
+#add_net_test_case(test_resolver_add_listener_after_host)
+#add_net_test_case(test_resolver_add_multiple_listeners_fn)
add_net_test_case(test_resolver_listener_host_re_add_fn)
add_net_test_case(test_resolver_listener_multiple_results)
add_net_test_case(test_resolver_listener_address_expired_fn)
@@ -121,11 +121,11 @@ add_test_case(socket_handler_close)
if (NOT BYO_CRYPTO)
add_net_test_case(test_concurrent_cert_import)
add_test_case(tls_channel_echo_and_backpressure_test)
- add_net_test_case(tls_client_channel_negotiation_error_expired)
- add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
- add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
- add_net_test_case(tls_client_channel_negotiation_error_self_signed)
- add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
+ #add_net_test_case(tls_client_channel_negotiation_error_expired)
+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
+ #add_net_test_case(tls_client_channel_negotiation_error_self_signed)
+ #add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
#track these down in s2n and find out why that aren't failing.
#add_net_test_case(tls_client_channel_negotiation_error_revoked)
#add_net_test_case(tls_client_channel_negotiation_error_pinning)
@@ -133,23 +133,23 @@ if (NOT BYO_CRYPTO)
# once done, add these tests as well
#add_net_test_case(tls_client_channel_negotiation_no_verify_revoked)
#add_net_test_case(tls_client_channel_negotiation_no_verify_pinning)
- add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
- add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
- add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
- add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
-
- add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
- add_net_test_case(tls_client_channel_negotiation_success)
- add_net_test_case(tls_client_channel_negotiation_success_ecc256)
- add_net_test_case(tls_client_channel_negotiation_success_ecc384)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
+
+ #add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
+ #add_net_test_case(tls_client_channel_negotiation_success)
+ #add_net_test_case(tls_client_channel_negotiation_success_ecc256)
+ #add_net_test_case(tls_client_channel_negotiation_success_ecc384)
add_net_test_case(tls_server_multiple_connections)
add_net_test_case(tls_server_hangup_during_negotiation)
- add_net_test_case(tls_client_channel_no_verify)
+ #add_net_test_case(tls_client_channel_no_verify)
add_net_test_case(test_tls_negotiation_timeout)
add_net_test_case(tls_double_channel)
add_net_test_case(alpn_successfully_negotiates)
add_net_test_case(alpn_no_protocol_message)
- add_net_test_case(test_ecc_cert_import)
+ #add_net_test_case(test_ecc_cert_import)
add_test_case(alpn_error_creating_handler)
add_test_case(tls_destroy_null_context)
add_test_case(tls_channel_statistics_test)

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ if (POLICY CMP0069)
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,153 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,8 +23,8 @@ add_test_case(test_s3_upload_part_message_new)
add_test_case(test_s3_complete_multipart_message_new)
add_test_case(test_s3_abort_multipart_upload_message_new)
-add_net_test_case(test_s3_client_create_destroy)
-add_net_test_case(test_s3_client_max_active_connections_override)
+#add_net_test_case(test_s3_client_create_destroy)
+#add_net_test_case(test_s3_client_max_active_connections_override)
add_test_case(test_s3_client_get_max_active_connections)
add_test_case(test_s3_request_create_destroy)
add_test_case(test_s3_client_queue_requests)
@@ -37,75 +37,75 @@ add_test_case(test_s3_client_update_connections_too_many_conns)
add_test_case(test_s3_client_update_connections_finish_result)
add_test_case(test_s3_client_update_connections_clean_up)
-add_net_test_case(test_s3_vip_create_destroy)
-add_net_test_case(test_s3_client_add_remove_vips)
-add_net_test_case(test_s3_client_resolve_vips)
+#add_net_test_case(test_s3_vip_create_destroy)
+#add_net_test_case(test_s3_client_add_remove_vips)
+#add_net_test_case(test_s3_client_resolve_vips)
add_test_case(test_s3_client_set_vip_connection_warm)
add_test_case(test_s3_client_set_vip_connection_active)
-add_net_test_case(test_s3_client_exceed_retries)
-add_net_test_case(test_s3_client_acquire_connection_fail)
-add_net_test_case(test_s3_meta_request_fail_prepare_request)
-add_net_test_case(test_s3_meta_request_sign_request_fail)
-add_net_test_case(test_s3_meta_request_send_request_finish_fail)
-add_net_test_case(test_s3_auto_range_put_missing_upload_id)
+#add_net_test_case(test_s3_client_exceed_retries)
+#add_net_test_case(test_s3_client_acquire_connection_fail)
+#add_net_test_case(test_s3_meta_request_fail_prepare_request)
+#add_net_test_case(test_s3_meta_request_sign_request_fail)
+#add_net_test_case(test_s3_meta_request_send_request_finish_fail)
+#add_net_test_case(test_s3_auto_range_put_missing_upload_id)
-add_net_test_case(test_s3_cancel_mpu_create_not_sent)
-add_net_test_case(test_s3_cancel_mpu_create_completed)
-add_net_test_case(test_s3_cancel_mpu_one_part_completed)
-add_net_test_case(test_s3_cancel_mpu_all_parts_completed)
-add_net_test_case(test_s3_cancel_mpd_nothing_sent)
-add_net_test_case(test_s3_cancel_mpd_one_part_sent)
-add_net_test_case(test_s3_cancel_mpd_one_part_completed)
-add_net_test_case(test_s3_cancel_mpd_two_parts_completed)
-add_net_test_case(test_s3_cancel_mpd_head_object_sent)
-add_net_test_case(test_s3_cancel_mpd_head_object_completed)
-add_net_test_case(test_s3_cancel_mpd_get_without_range_sent)
-add_net_test_case(test_s3_cancel_mpd_get_without_range_completed)
+#add_net_test_case(test_s3_cancel_mpu_create_not_sent)
+#add_net_test_case(test_s3_cancel_mpu_create_completed)
+#add_net_test_case(test_s3_cancel_mpu_one_part_completed)
+#add_net_test_case(test_s3_cancel_mpu_all_parts_completed)
+#add_net_test_case(test_s3_cancel_mpd_nothing_sent)
+#add_net_test_case(test_s3_cancel_mpd_one_part_sent)
+#add_net_test_case(test_s3_cancel_mpd_one_part_completed)
+#add_net_test_case(test_s3_cancel_mpd_two_parts_completed)
+#add_net_test_case(test_s3_cancel_mpd_head_object_sent)
+#add_net_test_case(test_s3_cancel_mpd_head_object_completed)
+#add_net_test_case(test_s3_cancel_mpd_get_without_range_sent)
+#add_net_test_case(test_s3_cancel_mpd_get_without_range_completed)
-add_net_test_case(test_s3_get_object_tls_disabled)
-add_net_test_case(test_s3_get_object_tls_enabled)
-add_net_test_case(test_s3_get_object_tls_default)
-add_net_test_case(test_s3_get_object_less_than_part_size)
-add_net_test_case(test_s3_get_object_empty_object)
-add_net_test_case(test_s3_get_object_multiple)
-add_net_test_case(test_s3_get_object_sse_kms)
-add_net_test_case(test_s3_get_object_sse_aes256)
-add_net_test_case(test_s3_no_signing)
-add_net_test_case(test_s3_signing_override)
-add_net_test_case(test_s3_put_object_tls_disabled)
-add_net_test_case(test_s3_put_object_tls_enabled)
-add_net_test_case(test_s3_put_object_tls_default)
-add_net_test_case(test_s3_multipart_put_object_with_acl)
-add_net_test_case(test_s3_put_object_multiple)
-add_net_test_case(test_s3_put_object_less_than_part_size)
-add_net_test_case(test_s3_put_object_empty_object)
-add_net_test_case(test_s3_put_object_with_part_remainder)
-add_net_test_case(test_s3_put_object_sse_kms)
-add_net_test_case(test_s3_put_object_sse_kms_multipart)
-add_net_test_case(test_s3_put_object_sse_aes256)
-add_net_test_case(test_s3_put_object_sse_aes256_multipart)
-add_net_test_case(test_s3_put_object_double_slashes)
-add_net_test_case(test_s3_meta_request_default)
-add_net_test_case(test_s3_put_object_fail_headers_callback)
-add_net_test_case(test_s3_put_object_fail_body_callback)
-add_net_test_case(test_s3_get_object_fail_headers_callback)
-add_net_test_case(test_s3_get_object_fail_body_callback)
-add_net_test_case(test_s3_default_fail_headers_callback)
-add_net_test_case(test_s3_default_fail_body_callback)
-add_net_test_case(test_s3_error_missing_file)
-add_net_test_case(test_s3_existing_host_entry)
-add_net_test_case(test_s3_put_fail_object_invalid_request)
-add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading)
-add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading)
-add_net_test_case(test_s3_bad_endpoint)
-add_net_test_case(test_s3_put_object_clamp_part_size)
-add_net_test_case(test_s3_different_endpoints)
-add_net_test_case(test_s3_auto_ranged_get_sending_user_agent)
-add_net_test_case(test_s3_auto_ranged_put_sending_user_agent)
-add_net_test_case(test_s3_default_sending_meta_request_user_agent)
-add_net_test_case(test_s3_range_requests)
-add_net_test_case(test_s3_not_satisfiable_range)
+#add_net_test_case(test_s3_get_object_tls_disabled)
+#add_net_test_case(test_s3_get_object_tls_enabled)
+#add_net_test_case(test_s3_get_object_tls_default)
+#add_net_test_case(test_s3_get_object_less_than_part_size)
+#add_net_test_case(test_s3_get_object_empty_object)
+#add_net_test_case(test_s3_get_object_multiple)
+#add_net_test_case(test_s3_get_object_sse_kms)
+#add_net_test_case(test_s3_get_object_sse_aes256)
+#add_net_test_case(test_s3_no_signing)
+#add_net_test_case(test_s3_signing_override)
+#add_net_test_case(test_s3_put_object_tls_disabled)
+#add_net_test_case(test_s3_put_object_tls_enabled)
+#add_net_test_case(test_s3_put_object_tls_default)
+#add_net_test_case(test_s3_multipart_put_object_with_acl)
+#add_net_test_case(test_s3_put_object_multiple)
+#add_net_test_case(test_s3_put_object_less_than_part_size)
+#add_net_test_case(test_s3_put_object_empty_object)
+#add_net_test_case(test_s3_put_object_with_part_remainder)
+#add_net_test_case(test_s3_put_object_sse_kms)
+#add_net_test_case(test_s3_put_object_sse_kms_multipart)
+#add_net_test_case(test_s3_put_object_sse_aes256)
+#add_net_test_case(test_s3_put_object_sse_aes256_multipart)
+#add_net_test_case(test_s3_put_object_double_slashes)
+#add_net_test_case(test_s3_meta_request_default)
+#add_net_test_case(test_s3_put_object_fail_headers_callback)
+#add_net_test_case(test_s3_put_object_fail_body_callback)
+#add_net_test_case(test_s3_get_object_fail_headers_callback)
+#add_net_test_case(test_s3_get_object_fail_body_callback)
+#add_net_test_case(test_s3_default_fail_headers_callback)
+#add_net_test_case(test_s3_default_fail_body_callback)
+#add_net_test_case(test_s3_error_missing_file)
+#add_net_test_case(test_s3_existing_host_entry)
+#add_net_test_case(test_s3_put_fail_object_invalid_request)
+#add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading)
+#add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading)
+#add_net_test_case(test_s3_bad_endpoint)
+#add_net_test_case(test_s3_put_object_clamp_part_size)
+#add_net_test_case(test_s3_different_endpoints)
+#add_net_test_case(test_s3_auto_ranged_get_sending_user_agent)
+#add_net_test_case(test_s3_auto_ranged_put_sending_user_agent)
+#add_net_test_case(test_s3_default_sending_meta_request_user_agent)
+#add_net_test_case(test_s3_range_requests)
+#add_net_test_case(test_s3_not_satisfiable_range)
add_test_case(test_s3_replace_quote_entities)
add_test_case(test_s3_parse_content_range_response_header)

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@
cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(AwsCheckHeadersCxx)
include(CTest)
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()

View file

@ -1,47 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,9 +13,9 @@ add_test_case(ApiMultiDefaultCreateDestroy)
add_test_case(EventLoopResourceSafety)
add_test_case(ClientBootstrapResourceSafety)
if (NOT BYO_CRYPTO)
- add_net_test_case(MqttClientResourceSafety)
+ #add_net_test_case(MqttClientResourceSafety)
add_net_test_case(MqttClientNewConnectionUninitializedTlsContext)
- add_net_test_case(TLSContextResourceSafety)
+ #add_net_test_case(TLSContextResourceSafety)
add_net_test_case(TLSContextUninitializedNewConnectionOptions)
endif ()
add_test_case(Base64RoundTrip)
@@ -29,15 +29,15 @@ add_test_case(SHA256ResourceSafety)
add_test_case(MD5ResourceSafety)
add_test_case(SHA256HMACResourceSafety)
if (NOT BYO_CRYPTO)
- add_net_test_case(HttpDownloadNoBackPressureHTTP1_1)
- add_net_test_case(HttpDownloadNoBackPressureHTTP2)
- add_net_test_case(HttpStreamUnActivated)
+ #add_net_test_case(HttpDownloadNoBackPressureHTTP1_1)
+ #add_net_test_case(HttpDownloadNoBackPressureHTTP2)
+ #add_net_test_case(HttpStreamUnActivated)
add_net_test_case(HttpCreateConnectionInvalidTlsConnectionOptions)
add_net_test_case(IotPublishSubscribe)
- add_net_test_case(HttpClientConnectionManagerResourceSafety)
+ #add_net_test_case(HttpClientConnectionManagerResourceSafety)
add_net_test_case(HttpClientConnectionManagerInvalidTlsConnectionOptions)
- add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
- add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)
+ #add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
+ #add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)
endif ()
add_test_case(DefaultResolution)
add_test_case(OptionalCopySafety)
@@ -55,8 +55,8 @@ add_test_case(TestProviderEnvironmentGet)
add_test_case(TestProviderProfileGet)
add_test_case(TestProviderImdsGet)
if (NOT BYO_CRYPTO)
- add_net_test_case(TestProviderDefaultChainGet)
- add_net_test_case(TestProviderDefaultChainManualTlsContextGet)
+ #add_net_test_case(TestProviderDefaultChainGet)
+ #add_net_test_case(TestProviderDefaultChainManualTlsContextGet)
endif ()
add_test_case(TestProviderDelegateGet)
add_test_case(HttpRequestTestCreateDestroy)

View file

@ -1,18 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,9 +98,13 @@ set(PYTHON_CMD "python")
# CMAKE_MODULE_PATH is a CMAKE variable. It contains a list of paths
# which could be used to search CMAKE modules by "include()" or "find_package()", but the default value is empty.
# Add ${CMAKE_INSTALL_LIBDIR}/cmake and ${CMAKE_PREFIX_PATH}/lib/cmake to search list
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+endif()
+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
+set(AWS_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake")
+string(REPLACE ":" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
# include() will "load and run" cmake script

View file

@ -1,44 +0,0 @@
--- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
+++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
@@ -92,12 +92,12 @@ TEST(HttpClientTest, TestRandomURLWithNoProxy)
makeRandomHttpRequest(httpClient, false);
}
-TEST(HttpClientTest, TestRandomURLWithProxy)
-{
- ClientConfiguration configuration = makeClientConfigurationWithProxy();
- auto httpClient = CreateHttpClient(configuration);
- makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid
-}
+//TEST(HttpClientTest, TestRandomURLWithProxy)
+//{
+// ClientConfiguration configuration = makeClientConfigurationWithProxy();
+// auto httpClient = CreateHttpClient(configuration);
+// makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid
+//}
TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredAsNonProxyHost)
{
@@ -119,14 +119,14 @@ TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredParentDomainAsNonProxyHost
makeRandomHttpRequest(httpClient, false);
}
-TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost)
-{
- ClientConfiguration configuration = makeClientConfigurationWithProxy();
- configuration.nonProxyHosts = Aws::Utils::Array<Aws::String>(1);
- configuration.nonProxyHosts[0] = "http://test.non.filtered.aws";
- auto httpClient = CreateHttpClient(configuration);
- makeRandomHttpRequest(httpClient, true);
-}
+//TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost)
+//{
+// ClientConfiguration configuration = makeClientConfigurationWithProxy();
+// configuration.nonProxyHosts = Aws::Utils::Array<Aws::String>(1);
+// configuration.nonProxyHosts[0] = "http://test.non.filtered.aws";
+// auto httpClient = CreateHttpClient(configuration);
+// makeRandomHttpRequest(httpClient, true);
+//}
// TODO: Pending Fix on Windows.
#if ENABLE_CURL_CLIENT

View file

@ -1,11 +0,0 @@
--- a/cmake/compiler_settings.cmake
+++ b/cmake/compiler_settings.cmake
@@ -53,7 +53,7 @@ macro(set_gcc_flags)
endmacro()
macro(set_gcc_warnings)
- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
+ list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
if(COMPILER_CLANG)
if(PLATFORM_ANDROID)
# when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.

View file

@ -1,20 +1,9 @@
From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001
From: Brett Gilio <brettg@gnu.org>
Date: Sun, 20 Dec 2020 14:43:30 -0600
Subject: [PATCH] Disallow Pre-install Checks
---
CMakeLists.txt | 8 --------
1 file changed, 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45c6d27..73b4ace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource
-DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
-DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS}
- TEST_BEFORE_INSTALL
- 1
- TEST_COMMAND
@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644
)
# Run the functional tests
@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS)
BearSource
CMAKE_CACHE_ARGS
@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS)
-DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
-DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
-DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
- TEST_BEFORE_INSTALL
- 1
@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644
)
endif ()
--
2.29.2

View file

@ -0,0 +1,40 @@
diff --git a/test/mke2fs.dump b/test/mke2fs.dump
index 8e63662..0c25798 100644
--- a/test/mke2fs.dump
+++ b/test/mke2fs.dump
@@ -11,7 +11,7 @@ Filesystem OS type: Linux
Inode count: 8192
Block count: 32768
Reserved block count: 1638
-Free blocks: 26568
+Free blocks: 26566
Free inodes: 8141
First block: 1
Block size: 1024
@@ -29,7 +29,7 @@ Mount count: 0
Maximum mount count: -1
Last checked: Sat Jan 1 00:00:00 2000
Check interval: 0 (<none>)
-Lifetime writes: 141 kB
+Lifetime writes: 143 kB
Reserved blocks uid: 0 (user root)
Reserved blocks gid: 0 (group root)
First inode: 11
@@ -49,13 +49,13 @@ Journal sequence: 0x00000001
Journal start: 0
-Group 0: (Blocks 1-8192) csum 0x74a0 [ITABLE_ZEROED]
+Group 0: (Blocks 1-8192) csum 0x3f30 [ITABLE_ZEROED]
Primary superblock at 1, Group descriptors at 2-2
- Block bitmap at 3 (+2), csum 0x16cec4db
+ Block bitmap at 3 (+2), csum 0x8d67cdef
Inode bitmap at 7 (+6), csum 0xb1052088
Inode table at 11-522 (+10)
- 6093 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes
- Free blocks: 2100-8192
+ 6091 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes
+ Free blocks: 2102-8192
Free inodes: 52-2048
Group 1: (Blocks 8193-16384) csum 0x8fde [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Backup superblock at 8193, Group descriptors at 8194-8194

View file

@ -1,24 +0,0 @@
commit 6574665f9d6c0757e8f55ccb465afbcaa90bf019
Author: Timotej Lazar <timotej.lazar@araneo.si>
Date: Wed Aug 19 19:36:02 2020 +0200
test: normalize flags reported by dumpe2fs
Filesystem flags depend on the system usually signed_directory_hash,
but unsigned_directory_hash at least on arm64.
Signed-off-by: Timotej Lazar <timotej.lazar@araneo.si>
diff --git a/test/basic-images.test b/test/basic-images.test
index f6685e1..cb104c3 100755
--- a/test/basic-images.test
+++ b/test/basic-images.test
@@ -158,6 +158,8 @@ check_ext() {
# format change
csum2="Group 0: (Blocks 1-4095) \\[ITABLE_ZEROED\\]\| Checksum .*, unused inodes 205"
dumpe2fs "${1}" | grep -v "^\($uuid\|$seed\|$csum1\|$csum2\)" > "dump" &&
+ # some architectures (including arm64) use unsigned char
+ sed -i 's/un\(signed_directory_hash\)/\1/' "dump" &&
# fixup for ext3 journal size with old tune2fs
sed -i 's/^\(Journal size: \)1029k$/\11024k/' "dump" &&
# output format changed with some version

View file

@ -1,11 +1,60 @@
Use our own googletest rather than the bundled one.
Get NNPACK to use our own PeachPy rather than the bundled one.
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
index 26210cb5..18b6df27 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
@@ -1723,7 +1723,7 @@ if(BUILD_TEST)
if(NOT MSVC)
add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp)
# TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main)
+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest)
if(USE_FBGEMM)
target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
endif()
@@ -1746,7 +1746,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_CPU_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
if(USE_OPENMP)
# -fopenmp is a compile time flag and as result not guaranteed
# to link executable against OpenMP runtime library
@@ -1769,7 +1769,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_GPU_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
cuda_add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
@@ -1787,7 +1787,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
@@ -1805,7 +1805,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_HIP_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE})
target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS})
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 5d57b9ca78..620cca4e60 100644
index ca560288..c0696e53 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -644,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
@@ -684,11 +684,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
# this shouldn't be necessary anymore.
get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
@ -17,7 +66,7 @@ index 5d57b9ca78..620cca4e60 100644
# We will not need to test benchmark lib itself.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
@@ -1485,7 +1480,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
@@ -1537,7 +1532,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
endif()
set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
@ -26,97 +75,8 @@ index 5d57b9ca78..620cca4e60 100644
endif()
include_directories(${FOXI_INCLUDE_DIRS})
list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
index 50ebb224ce..5953d9ddf7 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
@@ -1632,7 +1632,7 @@ if(BUILD_TEST)
if(NOT MSVC)
add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp)
# TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main)
+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest)
if(USE_FBGEMM)
target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
endif()
@@ -1655,7 +1655,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_CPU_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
@@ -1673,7 +1673,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_GPU_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
cuda_add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
@@ -1691,7 +1691,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
@@ -1709,7 +1709,7 @@ if(BUILD_TEST)
foreach(test_src ${Caffe2_HIP_TEST_SRCS})
get_filename_component(test_name ${test_src} NAME_WE)
add_executable(${test_name} "${test_src}")
- target_link_libraries(${test_name} torch_library gtest_main)
+ target_link_libraries(${test_name} torch_library gtest_main gtest)
target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE})
target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS})
diff --git a/torch/lib/c10d/test/CMakeLists.txt b/torch/lib/c10d/test/CMakeLists.txt
index b74d4b65f7..fc7c207505 100644
--- a/torch/lib/c10d/test/CMakeLists.txt
+++ b/torch/lib/c10d/test/CMakeLists.txt
@@ -16,24 +16,24 @@ function(c10d_add_test test_src)
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
endfunction()
-c10d_add_test(FileStoreTest.cpp c10d gtest_main)
-c10d_add_test(TCPStoreTest.cpp c10d gtest_main)
+c10d_add_test(FileStoreTest.cpp c10d gtest_main gtest)
+c10d_add_test(TCPStoreTest.cpp c10d gtest_main gtest)
if(NOT WIN32)
- c10d_add_test(HashStoreTest.cpp c10d gtest_main)
+ c10d_add_test(HashStoreTest.cpp c10d gtest_main gtest)
endif()
if(USE_CUDA)
if(USE_C10D_GLOO)
- c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main)
- c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main)
+ c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main gtest)
+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main gtest)
endif()
if(USE_C10D_NCCL)
- c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main)
+ c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main gtest)
c10d_add_test(ProcessGroupNCCLErrorsTest.cpp c10d c10d_cuda_test
- gtest_main)
+ gtest_main gtest)
endif()
else()
if(USE_C10D_GLOO)
- c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main)
+ c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main gtest)
endif()
endif()
diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
index a41343cbb5..6075bdd0a4 100644
index a41343cb..6075bdd0 100644
--- a/cmake/External/nnpack.cmake
+++ b/cmake/External/nnpack.cmake
@@ -40,7 +40,7 @@ endif()
@ -137,3 +97,61 @@ index a41343cbb5..6075bdd0a4 100644
-set(USE_NNPACK OFF)
+set(NNPACK_FOUND TRUE)
+set(USE_NNPACK ON)
diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
index 2e48773a..a70506ce 100644
--- a/test/cpp/c10d/CMakeLists.txt
+++ b/test/cpp/c10d/CMakeLists.txt
@@ -17,14 +17,14 @@ function(c10d_add_test test_src)
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
endfunction()
-c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main)
-c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main)
+c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest)
+c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest)
if(INSTALL_TEST)
install(TARGETS FileStoreTest DESTINATION bin)
install(TARGETS TCPStoreTest DESTINATION bin)
endif()
if(NOT WIN32)
- c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main)
+ c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest)
if(INSTALL_TEST)
install(TARGETS HashStoreTest DESTINATION bin)
endif()
@@ -32,11 +32,11 @@ endif()
if(USE_CUDA)
if(USE_GLOO AND USE_C10D_GLOO)
- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main)
+ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
if(INSTALL_TEST)
install(TARGETS ProcessGroupGlooTest DESTINATION bin)
endif()
- c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main)
+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest)
endif()
if(USE_NCCL AND USE_C10D_NCCL)
# NCCL is a private dependency of libtorch, but the tests include some
@@ -57,7 +57,7 @@ if(USE_CUDA)
endif()
else()
if(USE_GLOO AND USE_C10D_GLOO)
- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main)
+ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest)
endif()
endif()
diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt
index 213e99bd..ecaae840 100644
--- a/test/cpp/tensorexpr/CMakeLists.txt
+++ b/test/cpp/tensorexpr/CMakeLists.txt
@@ -46,7 +46,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
# pthreadpool header. For some build environment we need add the dependency
# explicitly.
if(USE_PTHREADPOOL)
- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface)
+ target_link_libraries(test_tensorexpr PRIVATE pthreadpool)
endif()
if(USE_CUDA)
target_link_libraries(test_tensorexpr PRIVATE

View file

@ -0,0 +1,69 @@
From b83b5b453d3f7883ef4c12f84a7045486957c709 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 9 Nov 2021 17:02:54 +0100
Subject: [PATCH] Ignore live tests.
diff --git a/tests/live.rs b/tests/live.rs
index b1a19fc..6bd4685 100644
--- a/tests/live.rs
+++ b/tests/live.rs
@@ -140,6 +140,7 @@ fn get_blocker_engine_deserialized_ios() -> Engine {
}
#[test]
+#[ignore]
fn check_live_specific_urls() {
let mut engine = get_blocker_engine();
{
@@ -176,6 +177,7 @@ fn check_live_specific_urls() {
}
#[test]
+#[ignore]
fn check_live_deserialized_specific_urls() {
let mut engine = get_blocker_engine_deserialized();
{
@@ -201,6 +203,7 @@ fn check_live_deserialized_specific_urls() {
}
#[test]
+#[ignore]
fn check_live_from_filterlists() {
let engine = get_blocker_engine();
let requests = load_requests();
@@ -214,6 +217,7 @@ fn check_live_from_filterlists() {
}
#[test]
+#[ignore]
fn check_live_deserialized_file() {
let engine = get_blocker_engine_deserialized();
let requests = load_requests();
@@ -243,6 +247,7 @@ fn check_live_deserialized_ios() {
#[cfg(feature = "resource_assembler")]
#[test]
+#[ignore]
fn check_live_redirects() {
use adblock::resources::resource_assembler::assemble_web_accessible_resources;
@@ -278,6 +283,7 @@ fn check_live_redirects() {
}
#[test]
+#[ignore]
/// Ensure that two different engines loaded from the same textual filter set serialize to
/// identical buffers.
fn stable_serialization() {
@@ -291,6 +297,7 @@ fn stable_serialization() {
}
#[test]
+#[ignore]
/// Ensure that one engine's serialization result can be exactly reproduced by another engine after
/// deserializing from it.
fn stable_serialization_through_load() {
--
2.33.1

View file

@ -1276,7 +1276,7 @@ (define-public python2-pypdf
(define-public pdfarranger
(package
(name "pdfarranger")
(version "1.7.1")
(version "1.8.0")
(source
(origin
(method git-fetch)
@ -1285,19 +1285,19 @@ (define-public pdfarranger
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3"))))
(base32 "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf"))))
(build-system python-build-system)
(arguments
'(#:tests? #f ;no tests
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-for-typelib
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(program (string-append out "/bin/pdfarranger")))
(wrap-program program
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH"))))
#t))))))
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-for-typelib
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(program (string-append out "/bin/pdfarranger")))
(wrap-program program
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH"))))))))))
(native-inputs
`(("intltool" ,intltool)
("python-distutils-extra" ,python-distutils-extra)))

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