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

Merge branch 'ungrafting' into staging

This commit is contained in:
Marius Bakke 2020-12-21 23:44:54 +01:00
commit 119fd58922
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
149 changed files with 47073 additions and 2760 deletions

View file

@ -121,6 +121,7 @@
(eval . (put 'let-system 'scheme-indent-function 1))
(eval . (put 'with-database 'scheme-indent-function 2))
(eval . (put 'call-with-database 'scheme-indent-function 1))
(eval . (put 'call-with-transaction 'scheme-indent-function 1))
(eval . (put 'with-statement 'scheme-indent-function 3))
(eval . (put 'call-with-retrying-transaction 'scheme-indent-function 1))

View file

@ -356,10 +356,15 @@ dist_noinst_DATA = \
AUX_FILES = \
gnu/packages/aux-files/chromium/master-preferences.json \
gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
gnu/packages/aux-files/guix.vim \
gnu/packages/aux-files/linux-libre/5.10-arm.conf \
gnu/packages/aux-files/linux-libre/5.10-arm64.conf \
gnu/packages/aux-files/linux-libre/5.10-i686.conf \
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.4-arm.conf \
gnu/packages/aux-files/linux-libre/5.4-arm64.conf \
gnu/packages/aux-files/linux-libre/5.4-i686.conf \

View file

@ -102,7 +102,7 @@ if test "x$GUILD" = "x"; then
fi
if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.6])
fi
dnl Get CFLAGS and LDFLAGS for libguile.

View file

@ -391,6 +391,7 @@ needed is to review and apply the patch.
* Version Numbers:: When the name is not enough.
* Synopses and Descriptions:: Helping users find the right package.
* Snippets versus Phases:: Whether to use a snippet, or a build phase.
* Emacs Packages:: Your Elisp fix.
* Python Modules:: A touch of British comedy.
* Perl Modules:: Little pearls.
* Java Packages:: Coffee break.
@ -636,6 +637,46 @@ embed store items in the sources; such patching should rather be done
using build phases. Refer to the @code{origin} record documentation for
more information (@pxref{origin Reference}).
@node Emacs Packages
@subsection Emacs Packages
@cindex emacs, packaging
@cindex elisp, packaging
Emacs packages should preferably use the Emacs build system
(@pxref{emacs-build-system}), for uniformity and the benefits provided
by its build phases, such as the auto-generation of the autoloads file
and the byte compilation of the sources. Because there is no
standardized way to run a test suite for Emacs packages, tests are
disabled by default. When a test suite is available, it should be
enabled by setting the @code{#:tests?} argument to @code{#true}. By
default, the command to run the test is @command{make check}, but any
command can be specified via the @code{#:test-command} argument. The
@code{#:test-command} argument expects a list containing a command and
its arguments, to be invoked during the @code{check} phase.
The Elisp dependencies of Emacs packages are typically provided as
@code{propagated-inputs} when required at run time. As for other
packages, build or test dependencies should be specified as
@code{native-inputs}.
Emacs packages sometimes depend on resources directories that should be
installed along the Elisp files. The @code{#:include} argument can be
used for that purpose, by specifying a list of regexps to match. The
best practice when using the @code{#:include} argument is to extend
rather than override its default value (accessible via the
@code{%default-include} variable). As an example, a yasnippet extension
package typically include a @file{snippets} directory, which could be
copied to the installation directory using:
@lisp
#:include (cons "^snippets/" %default-include))
@end lisp
When encountering problems, it is wise to check for the presence of the
@code{Package-Requires} extension header in the package main source
file, and whether any dependencies and their versions listed therein are
satisfied.
@node Python Modules
@subsection Python Modules
@ -864,7 +905,8 @@ to proper type error reports.
Guix code should define appropriate data types (for instance, using
@code{define-record-type*}) rather than abuse lists. In addition, it
should use pattern matching, via Guiles @code{(ice-9 match)} module,
especially when matching lists.
especially when matching lists (@pxref{Pattern Matching,,, guile, GNU
Guile Reference Manual}).
@node Formatting Code
@subsection Formatting Code
@ -1008,7 +1050,7 @@ to other packages unwillingly retained. It may also help determine
whether to split the package (@pxref{Packages with Multiple Outputs}),
and which optional dependencies should be used. In particular, avoid adding
@code{texlive} as a dependency: because of its extreme size, use
@code{texlive-tiny} or @code{texlive-union} instead.
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
@item
For important changes, check that dependent package (if applicable) are

View file

@ -7930,6 +7930,7 @@ Which D compiler is used can be specified with the @code{#:ldc}
parameter which defaults to @code{ldc}.
@end defvr
@anchor{emacs-build-system}
@defvr {Scheme Variable} emacs-build-system
This variable is exported by @code{(guix build-system emacs)}. It
implements an installation procedure similar to the packaging system

View file

@ -20,13 +20,26 @@
#
# <local ref> <local sha1> <remote ref> <remote sha1>
# Only use the hook when pushing to Savannah.
case "$2" in
*.gnu.org*)
exec make authenticate check-channel-news
exit 127
;;
*)
exit 0
;;
esac
# This is the "empty hash" used by Git when pushing a branch deletion.
z40=0000000000000000000000000000000000000000
while read local_ref local_hash remote_ref remote_hash
do
# When deleting a remote branch, no commits are pushed to the remote, and
# thus there are no signatures to be verified.
if [ "$local_hash" != $z40 ]
then
# Only use the hook when pushing to Savannah.
case "$2" in
*.gnu.org*)
exec make authenticate check-channel-news
exit 127
;;
*)
exit 0
;;
esac
fi
done
exit 0

View file

@ -183,9 +183,9 @@ chk_sys_arch()
aarch64)
local arch=aarch64
;;
armv7l)
local arch=armhf
;;
armv7l)
local arch=armhf
;;
*)
_err "${ERR}Unsupported CPU type: ${arch}"
exit 1
@ -233,7 +233,7 @@ guix_get_bin_list()
| sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \
| sort -Vu)")
latest_ver="$(echo "$bin_ver_ls" \
latest_ver="$(echo "${bin_ver_ls[0]}" \
| grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}[a-z0-9]*" \
| tail -n1)"
@ -247,7 +247,7 @@ guix_get_bin_list()
fi
# Use default to download according to the list and local ARCH_OS.
BIN_VER="$default_ver"
BIN_VER="${default_ver}"
}
guix_get_bin()
@ -271,7 +271,7 @@ guix_get_bin()
exit 1
fi
pushd $dl_path >/dev/null
pushd "${dl_path}" >/dev/null
gpg --verify "${bin_ver}.tar.xz.sig" >/dev/null 2>&1
if [[ "$?" -eq 0 ]]; then
_msg "${PAS}Signature is valid."
@ -379,15 +379,15 @@ sys_enable_guix_daemon()
/etc/systemd/system/;
chmod 664 /etc/systemd/system/guix-daemon.service;
# Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
sed -i /etc/systemd/system/guix-daemon.service \
-e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
# Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
sed -i /etc/systemd/system/guix-daemon.service \
-e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
# Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
then sed -i /etc/systemd/system/guix-daemon.service \
-e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
fi;
# Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
then sed -i /etc/systemd/system/guix-daemon.service \
-e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
fi;
systemctl daemon-reload &&
systemctl enable guix-daemon &&
@ -427,7 +427,7 @@ sys_enable_guix_daemon()
ln -sf "${var_guix}/bin/guix" "$local_bin"
[ -e "$info_path" ] || mkdir -p "$info_path"
for i in ${var_guix}/share/info/*; do
for i in "${var_guix}"/share/info/*; do
ln -sf "$i" "$info_path"
done
}

View file

@ -4,7 +4,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
;;;
@ -359,11 +359,14 @@ code."
(locale #f)
(system (%current-system))
(old-entries '())
(store-crypto-devices '())
store-directory-prefix)
"Return the GRUB configuration file corresponding to CONFIG, a
<bootloader-configuration> object, and where the store is available at
STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu
entries corresponding to old generations of the system.
STORE-CRYPTO-DEVICES contain the UUIDs of the encrypted units that must
be unlocked to access the store contents.
STORE-DIRECTORY-PREFIX may be used to specify a store prefix, as is required
when booting a root file system on a Btrfs subvolume."
(define all-entries
@ -411,6 +414,21 @@ menuentry ~s {
(string-join (map string-join '#$modules)
"\n module " 'prefix))))))
(define (crypto-devices)
(define (crypto-device->cryptomount dev)
(if (uuid? dev)
#~(format port "cryptomount -u ~a~%"
;; cryptomount only accepts UUID without the hypen.
#$(string-delete #\- (uuid->string dev)))
;; Other type of devices aren't implemented.
#~()))
(let ((devices (map crypto-device->cryptomount store-crypto-devices))
;; XXX: Add luks2 when grub 2.06 is packaged.
(modules #~(format port "insmod luks~%")))
(if (null? devices)
devices
(cons modules devices))))
(define (sugar)
(let* ((entry (first all-entries))
(device (menu-entry-device entry))
@ -474,6 +492,7 @@ keymap ~a~%" #$keymap))))
"# This file was generated from your Guix configuration. Any changes
# will be lost upon reconfiguration.
")
#$@(crypto-devices)
#$(sugar)
#$locale-config
#$keyboard-layout-config

View file

@ -140,23 +140,17 @@ given CONFIG file."
(define* (register-closure prefix closure
#:key
(deduplicate? #t) (reset-timestamps? #t)
(schema (sql-schema))
(wal-mode? #t))
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the
target store and CLOSURE is the name of a file containing a reference graph as
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is
true, reset timestamps on store files and, if DEDUPLICATE? is true,
deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE?
to call-with-database."
produced by #:references-graphs. Pass WAL-MODE? to call-with-database."
(let ((items (call-with-input-file closure read-reference-graph)))
(parameterize ((sql-schema schema))
(with-database (store-database-file #:prefix prefix) db
#:wal-mode? wal-mode?
(register-items db items
#:prefix prefix
#:deduplicate? deduplicate?
#:reset-timestamps? reset-timestamps?
#:registration-time %epoch)))))
(define* (initialize-efi-partition root
@ -188,7 +182,8 @@ rest of the store when registering the closures. SYSTEM-DIRECTORY is the name
of the directory of the 'system' derivation. Pass WAL-MODE? to
register-closure."
(populate-root-file-system system-directory root)
(populate-store references-graphs root)
(populate-store references-graphs root
#:deduplicate? deduplicate?)
;; Populate /dev.
(when make-device-nodes
@ -196,10 +191,7 @@ register-closure."
(when register-closures?
(for-each (lambda (closure)
(register-closure root
closure
#:reset-timestamps? #t
#:deduplicate? deduplicate?
(register-closure root closure
#:wal-mode? wal-mode?))
references-graphs))

View file

@ -214,7 +214,8 @@ This is used to create the self-contained tarballs with 'guix pack'."
(symlink old (scope new)))
;; Populate the store.
(populate-store (list closure) directory)
(populate-store (list closure) directory
#:deduplicate? #f)
(when database
(install-database-and-gc-roots directory database profile

View file

@ -560,7 +560,10 @@ upon error."
(load-linux-modules-from-directory linux-modules
linux-module-directory)
(unless (member "noresume" args)
(unless (or (member "hibernate=noresume" args)
;; Also handle the equivalent old-style argument.
;; See Documentation/admin-guide/kernel-parameters.txt.
(member "noresume" args))
;; Try to resume immediately after loading (storage) modules
;; but before any on-disk file systems have been mounted.
(false-if-exception ; failure is not fatal

View file

@ -127,7 +127,8 @@ REFERENCES-GRAPHS."
(mkdir "contents")
;; Copy the closures of all the items referenced in REFERENCES-GRAPHS.
(populate-store references-graphs "contents")
(populate-store references-graphs "contents"
#:deduplicate? #f)
(with-directory-excursion "contents"
;; Make '/init'.

View file

@ -215,20 +215,15 @@ the #:references-graphs parameter of 'derivation'."
(define* (register-closure prefix closure
#:key
(deduplicate? #t) (reset-timestamps? #t)
(schema (sql-schema)))
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the
target store and CLOSURE is the name of a file containing a reference graph as
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is
true, reset timestamps on store files and, if DEDUPLICATE? is true,
deduplicates files common to CLOSURE and the rest of PREFIX."
produced by #:references-graphs."
(let ((items (call-with-input-file closure read-reference-graph)))
(parameterize ((sql-schema schema))
(with-database (store-database-file #:prefix prefix) db
(register-items db items
#:prefix prefix
#:deduplicate? deduplicate?
#:reset-timestamps? reset-timestamps?
#:registration-time %epoch)))))
@ -397,7 +392,8 @@ system that is passed to 'populate-root-file-system'."
(when copy-closures?
;; Populate the store.
(populate-store (map (cut string-append "/xchg/" <>) closures)
target))
target
#:deduplicate? deduplicate?))
;; Populate /dev.
(make-device-nodes target)
@ -413,9 +409,7 @@ system that is passed to 'populate-root-file-system'."
(display "registering closures...\n")
(for-each (lambda (closure)
(register-closure target
(string-append "/xchg/" closure)
#:reset-timestamps? copy-closures?
#:deduplicate? deduplicate?))
(string-append "/xchg/" closure)))
closures)
(unless copy-closures?
(umount target-store)))

View file

@ -203,6 +203,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/enlightenment.scm \
%D%/packages/entr.scm \
%D%/packages/erlang.scm \
%D%/packages/esolangs.scm \
%D%/packages/fabric-management.scm \
%D%/packages/fcitx.scm \
%D%/packages/fcitx5.scm \
@ -494,7 +495,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/screen.scm \
%D%/packages/scribus.scm \
%D%/packages/scsi.scm \
%D%/packages/sdcc.scm \
%D%/packages/sdl.scm \
%D%/packages/search.scm \
%D%/packages/security-token.scm \
@ -791,7 +791,6 @@ dist_patch_DATA = \
%D%/packages/patches/akonadi-not-relocatable.patch \
%D%/packages/patches/akonadi-timestamps.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/alsa-modular-synth-fix-vocoder.patch \
%D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/anki-mpv-args.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
@ -823,6 +822,8 @@ dist_patch_DATA = \
%D%/packages/patches/avogadro-python-eigen-lib.patch \
%D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
%D%/packages/patches/bash-completion-directories.patch \
@ -830,6 +831,7 @@ dist_patch_DATA = \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/bear-disable-preinstall-tests.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
%D%/packages/patches/bsd-games-add-wrapper.patch \
@ -1211,6 +1213,7 @@ dist_patch_DATA = \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
%D%/packages/patches/libziparchive-add-includes.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \
@ -1450,7 +1453,6 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-pango-matrix_declarations.patch \
%D%/packages/patches/sdl-pango-sans-serif.patch \
%D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/sudo-fix-build-without-sendmail.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
%D%/packages/patches/patchutils-test-perms.patch \
%D%/packages/patches/patch-hurd-path-max.patch \
@ -1517,6 +1519,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-3.9-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \
%D%/packages/patches/python-CVE-2020-26116.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
@ -1595,6 +1598,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.45-linker-locale.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
@ -1610,6 +1614,7 @@ dist_patch_DATA = \
%D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/seed-webkit.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/serf-python3.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
%D%/packages/patches/shadow-hurd-pctrl.patch \
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \

View file

@ -484,6 +484,8 @@ an environment type of 'managed-host."
(list (second boot-parameters))))
(locale -> (boot-parameters-locale
(second boot-parameters)))
(crypto-dev -> (boot-parameters-store-crypto-devices
(second boot-parameters)))
(store-dir -> (boot-parameters-store-directory-prefix
(second boot-parameters)))
(old-entries -> (map boot-parameters->menu-entry
@ -496,6 +498,7 @@ an environment type of 'managed-host."
bootloader))
bootloader entries
#:locale locale
#:store-crypto-devices crypto-dev
#:store-directory-prefix store-dir
#:old-entries old-entries)))
(remote-result (machine-remote-eval machine remote-exp)))

View file

@ -444,7 +444,7 @@ graphs and can export its output to different formats.")
(define-public facter
(package
(name "facter")
(version "4.0.46")
(version "4.0.47")
(source (origin
(method git-fetch)
(uri (git-reference
@ -453,7 +453,7 @@ graphs and can export its output to different formats.")
(file-name (git-file-name name version))
(sha256
(base32
"1pi93i1jfpmxxw22b5r4gyx5jzgrammlrjzhjr3q2bpn3kcas91j"))))
"1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88"))))
(build-system ruby-build-system)
(arguments
`(#:phases
@ -565,7 +565,7 @@ memory, disks, network and processes.")
(define-public pies
(package
(name "pies")
(version "1.4")
(version "1.5")
(source
(origin
(method url-fetch)
@ -573,7 +573,7 @@ memory, disks, network and processes.")
version ".tar.bz2"))
(sha256
(base32
"14jb4pa4zs26d5j2skxbaypnwhsx2lw8jgj1irrgs03c2dnf7gp6"))))
"11j168qljsinaj5dwmg7nkm2z1aghi6gc3d0wf0pikflnh2q2wqf"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -1398,7 +1398,7 @@ system administrator.")
(define-public sudo
(package
(name "sudo")
(version "1.9.4")
(version "1.9.4p2")
(source (origin
(method url-fetch)
(uri
@ -1408,8 +1408,7 @@ system administrator.")
version ".tar.gz")))
(sha256
(base32
"1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb"))
(patches (search-patches "sudo-fix-build-without-sendmail.patch"))
"0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"))
(modules '((guix build utils)))
(snippet
'(begin
@ -3614,7 +3613,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.1.09-1")
(version "3.2.01-1")
(source
(origin
(method git-fetch)
@ -3623,7 +3622,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5"))))
(base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)
@ -3716,6 +3715,8 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
("perl-io-socket-ssl" ,perl-io-socket-ssl)
("perl-json-xs" ,perl-json-xs)
("perl-time-hires" ,perl-time-hires)
("lvm2" ,lvm2) ; lvs
("mdadm" ,mdadm)
;; TODO: Add more inputs:
;; ipmi-sensors
;; hddtemp

View file

@ -276,7 +276,7 @@ PARI is also available as a C library to allow for faster computations.")
(define-public gp2c
(package
(name "gp2c")
(version "0.0.11pl4")
(version "0.0.12")
(source (origin
(method url-fetch)
(uri (string-append
@ -284,7 +284,7 @@ PARI is also available as a C library to allow for faster computations.")
version ".tar.gz"))
(sha256
(base32
"1cnnh7diqc97q76q5pyhpbljbhc0sz8mlrbqgiwi0sjkgh8iqsj0"))))
"039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl)))
(inputs `(("pari-gp" ,pari-gp)))
@ -410,7 +410,7 @@ precision.")
(inputs
;; TODO: Add libnauty, unbundle "libmicropython.a".
`(("fltk" ,fltk)
("glpk" ,glpk)
("glpk" ,glpk-4)
("gmp" ,gmp)
("gsl" ,gsl)
("lapack" ,lapack)
@ -533,14 +533,14 @@ fast arithmetic.")
(string-append "--with-flint=" flint)
(string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr))))))))
(home-page "https://arblib.org")
(synopsis "Arbitrary precision floating-point ball arithmetic")
(description
"Arb is a C library for arbitrary-precision floating-point ball
arithmetic. It supports efficient high-precision computation with
polynomials, power series, matrices and special functions over the
real and complex numbers, with automatic, rigorous error control.")
(license license:lgpl2.1+)
(home-page "http://arblib.org")))
(license license:lgpl2.1+)))
(define-public python-flint
(package

View file

@ -261,7 +261,7 @@ runtime")
(define-public rgbds
(package
(name "rgbds")
(version "0.4.1")
(version "0.4.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -270,7 +270,7 @@ runtime")
(file-name (git-file-name name version))
(sha256
(base32
"05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf"))))
"0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"))))
(build-system gnu-build-system)
(arguments
`(#:phases

View file

@ -476,41 +476,15 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
(define-public alsa-modular-synth
(package
(name "alsa-modular-synth")
(version "2.1.2")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/alsamodular/alsamodular"
"/" version "/ams-" version ".tar.bz2"))
(sha256
(base32
"1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0"))
(patches
(search-patches "alsa-modular-synth-fix-vocoder.patch"))))
"056dn6b9c5nsw2jdww7z1kxrjqqfvxjzxhsd5x9gi4wkwyiv21nz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
'("--enable-qt5"
"CXXFLAGS=-std=gnu++11")
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'hide-default-gcc
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent
;; conflicts with the GCC 5 input.
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
":"))
#t)))
;; Insert an extra space between linker flags.
(add-before 'configure 'add-missing-space
(lambda _
(substitute* "configure"
(("LIBS\\+=\\$LIBSsave") "LIBS+=\" $LIBSsave\"")
(("CFLAGS\\+=\\$CFLAGSsave") "CFLAGS+=\" $CFLAGSsave\""))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
;; We cannot use zita-alsa-pcmi (the successor of clalsadrv) due to
@ -523,8 +497,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
("qtbase" ,qtbase)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)
("gcc@5" ,gcc-5)))
("qttools" ,qttools)))
(home-page "http://alsamodular.sourceforge.net/")
(synopsis "Realtime modular synthesizer and effect processor")
(description

View file

@ -0,0 +1,7 @@
" This appends all of the vim plugins to the end of Vim's runtimepath.
for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT]
let vimplugins = directory . "/share/vim/vimfiles"
if isdirectory(vimplugins)
let &rtp = join([&rtp,vimplugins], ',')
endif
endfor

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -8,6 +8,7 @@
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -31,6 +32,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@ -40,6 +42,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages storage)
#:use-module (ice-9 match))
@ -267,3 +270,66 @@ benchmark how your file systems perform with respect to data read and write
speed, the number of seeks that can be performed per second, and the number of
file metadata operations that can be performed per second.")
(license license:gpl2))) ;GPL 2 only, see copyright.txt
(define-public python-locust
(package
(name "python-locust")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "locust" version))
(sha256
(base32
"1q2nza37fwsqf8qdmisfz6bmjpss90shi1bajrclf6gkbslhryxl"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'extend-PATH
;; Add the 'locust' script to PATH, which is used in the test
;; suite.
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "PATH" (string-append out "/bin:"
(getenv "PATH"))))
#t))
(replace 'check
(lambda _
(invoke "python" "-m" "pytest"
"-k" (string-join
(list
;; These tests return "non-zero exit status 1".
"not test_default_headless_spawn_options"
"not test_default_headless_spawn_options_with_shape"
"not test_headless_spawn_options_wo_run_time"
;; This test depends on networking.
"not test_web_options"
;; This test fails because of the warning "System open
;; file limit '1024' is below minimum setting '10000'".
"not test_skip_logging") " and "))
#t)))))
(propagated-inputs
`(("python-configargparse" ,python-configargparse)
("python-flask" ,python-flask)
("python-flask-basicauth" ,python-flask-basicauth)
("python-gevent" ,python-gevent)
("python-geventhttpclient" ,python-geventhttpclient)
("python-msgpack" ,python-msgpack)
("python-psutil" ,python-psutil)
("python-pyzmq" ,python-pyzmq)
("python-requests" ,python-requests)
("python-werkzeug" ,python-werkzeug)))
(native-inputs
`(("python-mock" ,python-mock)
("python-pyquery" ,python-pyquery)
("python-pytest" ,python-pytest))) ;for more easily skipping tests
(home-page "https://locust.io/")
(synopsis "Distributed load testing framework")
(description "Locust is a performance testing tool that aims to be easy to
use, scriptable and scalable. The test scenarios are described in plain
Python. It provides a web-based user interface to visualize the results in
real-time, but can also be run non-interactively. Locust is primarily geared
toward testing HTTP-based applications or services, but it can be customized to
test any system or protocol.")
(license license:expat)))

View file

@ -50,6 +50,33 @@
;;; Annotations
(define-public r-org-eck12-eg-db
(package
(name "r-org-eck12-eg-db")
(version "3.12.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "org.EcK12.eg.db" version 'annotation))
(sha256
(base32 "0c4p6jr83k0gm6pvn760yr8xf33wggrfcr6fg7a42a96bcf817gs"))))
(properties
`((upstream-name . "org.EcK12.eg.db")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)))
(home-page "https://bioconductor.org/packages/org.EcK12.eg.db")
(synopsis "Genome wide annotation for E coli strain K12")
(description
"This package provides genome wide annotation for E coli strain K12,
primarily based on mapping using Entrez Gene identifiers. Entrez Gene is
National Center for Biotechnology Information (NCBI)s database for
gene-specific information. Entrez Gene maintains records from genomes which
have been completely sequenced, which have an active research community to
submit gene-specific information, or which are scheduled for intense sequence
analysis.")
(license license:artistic2.0)))
(define-public r-reactome-db
(package
(name "r-reactome-db")
@ -72,35 +99,6 @@
database, assembled using data from REACTOME.")
(license license:cc-by4.0)))
(define-public r-bluster
(package
(name "r-bluster")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bluster" version))
(sha256
(base32
"0izrf82m5znyrgai5y5jss4k2brabh4ajxdvnlwwc92l5bw7jp61"))))
(properties `((upstream-name . "bluster")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocneighbors" ,r-biocneighbors)
("r-biocparallel" ,r-biocparallel)
("r-igraph" ,r-igraph)
("r-matrix" ,r-matrix)
("r-rcpp" ,r-rcpp)
("r-s4vectors" ,r-s4vectors)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/bluster")
(synopsis "Clustering algorithms for Bioconductor")
(description"This package wraps common clustering algorithms in an easily
extended S4 framework. Backends are implemented for hierarchical, k-means
and graph-based clustering. Several utilities are also provided to compare
and evaluate clustering results.")
(license license:gpl3)))
(define-public r-bsgenome-celegans-ucsc-ce6
(package
(name "r-bsgenome-celegans-ucsc-ce6")
@ -571,30 +569,6 @@ as provided by UCSC (hg38, Dec. 2013) and stored in Biostrings objects.")
"This package exposes an annotation database generated from Ensembl.")
(license license:artistic2.0)))
(define-public r-genelendatabase
(package
(name "r-genelendatabase")
(version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "geneLenDataBase" version 'experiment))
(sha256
(base32
"03gm4pvsfascx7kjg0jycpf4f572mja68wwmwigs390vbmawyb4a"))))
(properties
`((upstream-name . "geneLenDataBase")))
(build-system r-build-system)
(propagated-inputs
`(("r-rtracklayer" ,r-rtracklayer)
("r-genomicfeatures" ,r-genomicfeatures)))
(home-page "https://bioconductor.org/packages/geneLenDataBase/")
(synopsis "Lengths of mRNA transcripts for a number of genomes")
(description
"This package provides the lengths of mRNA transcripts for a number of
genomes and gene ID formats, largely based on the UCSC table browser.")
(license license:lgpl2.0+)))
(define-public r-txdb-hsapiens-ucsc-hg19-knowngene
(package
(name "r-txdb-hsapiens-ucsc-hg19-knowngene")
@ -774,103 +748,6 @@ annotations.")
"This is a manifest package for Illumina's EPIC methylation arrays.")
(license license:artistic2.0)))
(define-public r-ideoviz
(package
(name "r-ideoviz")
(version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "IdeoViz" version))
(sha256
(base32
"1k5c0skr6pvpcvkak9f0a088w5wsx4fl3jb9a76gyyni4nkj7djq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-iranges" ,r-iranges)
("r-genomicranges" ,r-genomicranges)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-rtracklayer" ,r-rtracklayer)
("r-genomeinfodb" ,r-genomeinfodb)))
(home-page "https://bioconductor.org/packages/IdeoViz/")
(synopsis "Plots data along a chromosomal ideogram")
(description "This package provides functions to plot data associated with
arbitrary genomic intervals along chromosomal ideogram.")
(license license:gpl2)))
;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19
;; from Bioconductor.
(define-public r-deconstructsigs
(package
(name "r-deconstructsigs")
(version "1.8.0")
(source (origin
(method url-fetch)
(uri (cran-uri "deconstructSigs" version))
(sha256
(base32
"014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"))))
(properties
`((upstream-name . "deconstructSigs")))
(build-system r-build-system)
(propagated-inputs
`(("r-bsgenome" ,r-bsgenome)
("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19)
("r-genomeinfodb" ,r-genomeinfodb)
("r-reshape2" ,r-reshape2)))
(home-page "https://github.com/raerose01/deconstructSigs")
(synopsis "Identifies signatures present in a tumor sample")
(description "This package takes sample information in the form of the
fraction of mutations in each of 96 trinucleotide contexts and identifies
the weighted combination of published signatures that, when summed, most
closely reconstructs the mutational profile.")
(license license:gpl2+)))
;; This is a CRAN package, but it depends on Bioconductor packages.
(define-public r-nmf
(package
(name "r-nmf")
(version "0.23.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "NMF" version))
(sha256
(base32
"0ls7q9yc9l1z10jphq5a11wkfgcxc3gm3sfjj376zx3vnc0wl30g"))))
(properties `((upstream-name . "NMF")))
(build-system r-build-system)
(propagated-inputs
`(("r-cluster" ,r-cluster)
("r-biobase" ,r-biobase)
("r-biocmanager" ,r-biocmanager)
("r-bigmemory" ,r-bigmemory) ; suggested
("r-synchronicity" ,r-synchronicity) ; suggested
("r-colorspace" ,r-colorspace)
("r-digest" ,r-digest)
("r-doparallel" ,r-doparallel)
("r-foreach" ,r-foreach)
("r-ggplot2" ,r-ggplot2)
("r-gridbase" ,r-gridbase)
("r-pkgmaker" ,r-pkgmaker)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-registry" ,r-registry)
("r-reshape2" ,r-reshape2)
("r-rngtools" ,r-rngtools)
("r-stringr" ,r-stringr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "http://renozao.github.io/NMF")
(synopsis "Algorithms and framework for nonnegative matrix factorization")
(description
"This package provides a framework to perform Non-negative Matrix
Factorization (NMF). The package implements a set of already published
algorithms and seeding methods, and provides a framework to test, develop and
plug new or custom algorithms. Most of the built-in algorithms have been
optimized in C++, and the main interface function provides an easy way of
performing parallel computations on multicore machines.")
(license license:gpl2+)))
(define-public r-do-db
(package
(name "r-do-db")
@ -893,32 +770,6 @@ performing parallel computations on multicore machines.")
Disease Ontology.")
(license license:artistic2.0)))
(define-public r-pasilla
(package
(name "r-pasilla")
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append
"http://bioconductor.org/packages/release/data/experiment"
"/src/contrib/pasilla_" version ".tar.gz"))
(sha256
(base32
"0h124i2fb2lbj2k48zzf1n7ldqa471bs26fbd9vw50299aqx28x0"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biocstyle" ,r-biocstyle)
("r-dexseq" ,r-dexseq)
("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)))
(home-page "https://www.bioconductor.org/packages/pasilla/")
(synopsis "Data package with per-exon and per-gene read counts")
(description "This package provides per-exon and per-gene read counts
computed for selected genes from RNA-seq data that were presented in the
article 'Conservation of an RNA regulatory map between Drosophila and mammals'
by Brooks et al., Genome Research 2011.")
(license license:lgpl2.1+)))
(define-public r-pfam-db
(package
(name "r-pfam-db")
@ -1027,6 +878,56 @@ All datasets are restricted to protein coding genes.")
from Illumina 450k methylation arrays.")
(license license:artistic2.0)))
(define-public r-genelendatabase
(package
(name "r-genelendatabase")
(version "1.18.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "geneLenDataBase" version 'experiment))
(sha256
(base32
"03gm4pvsfascx7kjg0jycpf4f572mja68wwmwigs390vbmawyb4a"))))
(properties
`((upstream-name . "geneLenDataBase")))
(build-system r-build-system)
(propagated-inputs
`(("r-rtracklayer" ,r-rtracklayer)
("r-genomicfeatures" ,r-genomicfeatures)))
(home-page "https://bioconductor.org/packages/geneLenDataBase/")
(synopsis "Lengths of mRNA transcripts for a number of genomes")
(description
"This package provides the lengths of mRNA transcripts for a number of
genomes and gene ID formats, largely based on the UCSC table browser.")
(license license:lgpl2.0+)))
(define-public r-pasilla
(package
(name "r-pasilla")
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append
"http://bioconductor.org/packages/release/data/experiment"
"/src/contrib/pasilla_" version ".tar.gz"))
(sha256
(base32
"0h124i2fb2lbj2k48zzf1n7ldqa471bs26fbd9vw50299aqx28x0"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biocstyle" ,r-biocstyle)
("r-dexseq" ,r-dexseq)
("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)))
(home-page "https://www.bioconductor.org/packages/pasilla/")
(synopsis "Data package with per-exon and per-gene read counts")
(description "This package provides per-exon and per-gene read counts
computed for selected genes from RNA-seq data that were presented in the
article 'Conservation of an RNA regulatory map between Drosophila and mammals'
by Brooks et al., Genome Research 2011.")
(license license:lgpl2.1+)))
(define-public r-hsmmsinglecell
(package
(name "r-hsmmsinglecell")
@ -1103,62 +1004,31 @@ examples' of Affymetrix data, unlike the artificial examples included in the
package @code{affy}.")
(license license:gpl2+)))
(define-public r-coverageview
(define-public r-gagedata
(package
(name "r-coverageview")
(version "1.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CoverageView" version))
(sha256
(base32
"1k89gzqhd8ca8s9gk5bfzringnc5nayqbwzwwy35fls1cg96qmsj"))))
(name "r-gagedata")
(version "2.28.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "gageData" version 'experiment))
(sha256
(base32 "16lmnvmbykvbdgwyx7r2jc217gb9nidn81860v5kri99g97j4jdn"))))
(properties `((upstream-name . "gageData")))
(build-system r-build-system)
(propagated-inputs
`(("r-s4vectors" ,r-s4vectors)
("r-iranges" ,r-iranges)
("r-genomicranges" ,r-genomicranges)
("r-genomicalignments" ,r-genomicalignments)
("r-rtracklayer" ,r-rtracklayer)
("r-rsamtools" ,r-rsamtools)))
(home-page "https://bioconductor.org/packages/CoverageView/")
(synopsis "Coverage visualization package for R")
(description "This package provides a framework for the visualization of
genome coverage profiles. It can be used for ChIP-seq experiments, but it can
be also used for genome-wide nucleosome positioning experiments or other
experiment types where it is important to have a framework in order to inspect
how the coverage distributed across the genome.")
(license license:artistic2.0)))
(define-public r-cummerbund
(package
(name "r-cummerbund")
(version "2.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "cummeRbund" version))
(sha256
(base32
"1x7rby50api1c66al6a0i92q82ydjmh3h8l2k7hj0ffpn8c5pdgj"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-fastcluster" ,r-fastcluster)
("r-ggplot2" ,r-ggplot2)
("r-gviz" ,r-gviz)
("r-plyr" ,r-plyr)
("r-reshape2" ,r-reshape2)
("r-rsqlite" ,r-rsqlite)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)))
(home-page "https://bioconductor.org/packages/cummeRbund/")
(synopsis "Analyze Cufflinks high-throughput sequencing data")
(description "This package allows for persistent storage, access,
exploration, and manipulation of Cufflinks high-throughput sequencing
data. In addition, provides numerous plotting functions for commonly
used visualizations.")
(license license:artistic2.0)))
(home-page "https://bioconductor.org/packages/gageData")
(synopsis "Auxillary data for gage package")
(description
"This is a supportive data package for the software package @code{gage}.
However, the data supplied here are also useful for gene set or pathway
analysis or microarray data analysis in general. In this package, we provide
two demo microarray dataset: GSE16873 (a breast cancer dataset from GEO) and
BMP6 (originally published as an demo dataset for GAGE, also registered as
GSE13604 in GEO). This package also includes commonly used gene set data based
on KEGG pathways and GO terms for major research species, including human,
mouse, rat and budding yeast. Mapping data between common gene IDs for budding
yeast are also included.")
(license license:gpl2+)))
(define-public r-curatedtcgadata
(package
@ -1236,6 +1106,189 @@ of Bioconductor.")
packages.")
(license license:artistic2.0)))
(define-public r-coverageview
(package
(name "r-coverageview")
(version "1.28.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "CoverageView" version))
(sha256
(base32
"1k89gzqhd8ca8s9gk5bfzringnc5nayqbwzwwy35fls1cg96qmsj"))))
(build-system r-build-system)
(propagated-inputs
`(("r-s4vectors" ,r-s4vectors)
("r-iranges" ,r-iranges)
("r-genomicranges" ,r-genomicranges)
("r-genomicalignments" ,r-genomicalignments)
("r-rtracklayer" ,r-rtracklayer)
("r-rsamtools" ,r-rsamtools)))
(home-page "https://bioconductor.org/packages/CoverageView/")
(synopsis "Coverage visualization package for R")
(description "This package provides a framework for the visualization of
genome coverage profiles. It can be used for ChIP-seq experiments, but it can
be also used for genome-wide nucleosome positioning experiments or other
experiment types where it is important to have a framework in order to inspect
how the coverage distributed across the genome.")
(license license:artistic2.0)))
(define-public r-cummerbund
(package
(name "r-cummerbund")
(version "2.32.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "cummeRbund" version))
(sha256
(base32
"1x7rby50api1c66al6a0i92q82ydjmh3h8l2k7hj0ffpn8c5pdgj"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-biocgenerics" ,r-biocgenerics)
("r-fastcluster" ,r-fastcluster)
("r-ggplot2" ,r-ggplot2)
("r-gviz" ,r-gviz)
("r-plyr" ,r-plyr)
("r-reshape2" ,r-reshape2)
("r-rsqlite" ,r-rsqlite)
("r-rtracklayer" ,r-rtracklayer)
("r-s4vectors" ,r-s4vectors)))
(home-page "https://bioconductor.org/packages/cummeRbund/")
(synopsis "Analyze Cufflinks high-throughput sequencing data")
(description "This package allows for persistent storage, access,
exploration, and manipulation of Cufflinks high-throughput sequencing
data. In addition, provides numerous plotting functions for commonly
used visualizations.")
(license license:artistic2.0)))
(define-public r-bluster
(package
(name "r-bluster")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "bluster" version))
(sha256
(base32
"0izrf82m5znyrgai5y5jss4k2brabh4ajxdvnlwwc92l5bw7jp61"))))
(properties `((upstream-name . "bluster")))
(build-system r-build-system)
(propagated-inputs
`(("r-biocneighbors" ,r-biocneighbors)
("r-biocparallel" ,r-biocparallel)
("r-igraph" ,r-igraph)
("r-matrix" ,r-matrix)
("r-rcpp" ,r-rcpp)
("r-s4vectors" ,r-s4vectors)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://bioconductor.org/packages/bluster")
(synopsis "Clustering algorithms for Bioconductor")
(description"This package wraps common clustering algorithms in an easily
extended S4 framework. Backends are implemented for hierarchical, k-means
and graph-based clustering. Several utilities are also provided to compare
and evaluate clustering results.")
(license license:gpl3)))
(define-public r-ideoviz
(package
(name "r-ideoviz")
(version "1.26.0")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "IdeoViz" version))
(sha256
(base32
"1k5c0skr6pvpcvkak9f0a088w5wsx4fl3jb9a76gyyni4nkj7djq"))))
(build-system r-build-system)
(propagated-inputs
`(("r-biobase" ,r-biobase)
("r-iranges" ,r-iranges)
("r-genomicranges" ,r-genomicranges)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-rtracklayer" ,r-rtracklayer)
("r-genomeinfodb" ,r-genomeinfodb)))
(home-page "https://bioconductor.org/packages/IdeoViz/")
(synopsis "Plots data along a chromosomal ideogram")
(description "This package provides functions to plot data associated with
arbitrary genomic intervals along chromosomal ideogram.")
(license license:gpl2)))
;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19
;; from Bioconductor.
(define-public r-deconstructsigs
(package
(name "r-deconstructsigs")
(version "1.8.0")
(source (origin
(method url-fetch)
(uri (cran-uri "deconstructSigs" version))
(sha256
(base32
"014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"))))
(properties
`((upstream-name . "deconstructSigs")))
(build-system r-build-system)
(propagated-inputs
`(("r-bsgenome" ,r-bsgenome)
("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19)
("r-genomeinfodb" ,r-genomeinfodb)
("r-reshape2" ,r-reshape2)))
(home-page "https://github.com/raerose01/deconstructSigs")
(synopsis "Identifies signatures present in a tumor sample")
(description "This package takes sample information in the form of the
fraction of mutations in each of 96 trinucleotide contexts and identifies
the weighted combination of published signatures that, when summed, most
closely reconstructs the mutational profile.")
(license license:gpl2+)))
;; This is a CRAN package, but it depends on Bioconductor packages.
(define-public r-nmf
(package
(name "r-nmf")
(version "0.23.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "NMF" version))
(sha256
(base32
"0ls7q9yc9l1z10jphq5a11wkfgcxc3gm3sfjj376zx3vnc0wl30g"))))
(properties `((upstream-name . "NMF")))
(build-system r-build-system)
(propagated-inputs
`(("r-cluster" ,r-cluster)
("r-biobase" ,r-biobase)
("r-biocmanager" ,r-biocmanager)
("r-bigmemory" ,r-bigmemory) ; suggested
("r-synchronicity" ,r-synchronicity) ; suggested
("r-colorspace" ,r-colorspace)
("r-digest" ,r-digest)
("r-doparallel" ,r-doparallel)
("r-foreach" ,r-foreach)
("r-ggplot2" ,r-ggplot2)
("r-gridbase" ,r-gridbase)
("r-pkgmaker" ,r-pkgmaker)
("r-rcolorbrewer" ,r-rcolorbrewer)
("r-registry" ,r-registry)
("r-reshape2" ,r-reshape2)
("r-rngtools" ,r-rngtools)
("r-stringr" ,r-stringr)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "http://renozao.github.io/NMF")
(synopsis "Algorithms and framework for nonnegative matrix factorization")
(description
"This package provides a framework to perform Non-negative Matrix
Factorization (NMF). The package implements a set of already published
algorithms and seeding methods, and provides a framework to test, develop and
plug new or custom algorithms. Most of the built-in algorithms have been
optimized in C++, and the main interface function provides an easy way of
performing parallel computations on multicore machines.")
(license license:gpl2+)))
(define-public r-affycomp
(package
(name "r-affycomp")
@ -9187,3 +9240,63 @@ CATALYST (Cytometry dATa anALYSis Tools) to provide a pipeline for
preprocessing of cytometry data, including i) normalization using bead
standards, ii) single-cell deconvolution, and iii) bead-based compensation.")
(license license:gpl2+)))
(define-public r-kegggraph
(package
(name "r-kegggraph")
(version "1.50.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "KEGGgraph" version))
(sha256
(base32 "1h293hn02ysm923bh9gxk87xv663xiqchqcvpaxpla9c3yrgkx2v"))))
(properties `((upstream-name . "KEGGgraph")))
(build-system r-build-system)
(propagated-inputs
`(("r-graph" ,r-graph)
("r-rcurl" ,r-rcurl)
("r-xml" ,r-xml)))
(home-page "https://bioconductor.org/packages/KEGGgraph")
(synopsis "Graph approach to Kegg Pathway database in R and Bioconductor")
(description
"@code{r-kegggraph} is an interface between Kegg Pathway database and graph
object as well as a collection of tools to analyze, dissect and visualize these
graphs. It parses the regularly updated kgml (Kegg XML) files into graph models
maintaining all essential pathway attributes. The package offers
functionalities including parsing, graph operation, visualization and etc.")
(license license:gpl2+)))
(define-public r-pathview
(package
(name "r-pathview")
(version "1.30.1")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "pathview" version))
(sha256
(base32 "11fisiksw1y64ii9q8p2znyp9w8mlqzgiaacmycw59rngkjlmbs4"))))
(properties `((upstream-name . "pathview")))
(build-system r-build-system)
(propagated-inputs
`(("r-annotationdbi" ,r-annotationdbi)
("r-graph" ,r-graph)
("r-kegggraph" ,r-kegggraph)
("r-keggrest" ,r-keggrest)
("r-org-hs-eg-db" ,r-org-hs-eg-db)
("r-png" ,r-png)
("r-rgraphviz" ,r-rgraphviz)
("r-xml" ,r-xml)))
(home-page "https://pathview.uncc.edu/")
(synopsis "Tool set for pathway based data integration and visualization")
(description
"@code{r-pathview} is a tool set for pathway based data integration and
visualization. It maps and renders a wide variety of biological data on
relevant pathway graphs. All users need is to supply their data and specify
the target pathway. This package automatically downloads the pathway graph
data, parses the data file, maps user data to the pathway, and render pathway
graph with the mapped data. In addition, @code{r-pathview} also seamlessly
integrates with pathway and gene set (enrichment) analysis tools for
large-scale and fully automated analysis.")
(license license:gpl3+)))

View file

@ -11448,21 +11448,23 @@ models. TADbit is complemented by TADkit for visualizing 3D models.")
#t)))))
(native-inputs
`(("samtabix"
,(origin
(method git-fetch)
(uri (git-reference
(url "http://genome-source.cse.ucsc.edu/samtabix.git")
(commit "10fd107909c1ac4d679299908be4262a012965ba")))
(sha256
(base32
"0c1nj64l42v395sa84n7az43xiap4i6f9n9dfz4058aqiwkhkmma"))))))
,(let ((commit "10fd107909c1ac4d679299908be4262a012965ba"))
(origin
(method git-fetch)
(uri (git-reference
(url "http://genome-source.cse.ucsc.edu/samtabix.git")
(commit commit)))
(file-name (git-file-name "samtabix" (string-take commit 7)))
(sha256
(base32
"0c1nj64l42v395sa84n7az43xiap4i6f9n9dfz4058aqiwkhkmma")))))))
(inputs
`(("zlib" ,zlib)
("tcsh" ,tcsh)
("perl" ,perl)
("libpng" ,libpng)
("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl-1.0)))
("openssl" ,openssl)))
(home-page "https://genome.cse.ucsc.edu/index.html")
(synopsis "Assorted bioinformatics utilities")
(description "This package provides the kentUtils, a selection of

View file

@ -424,7 +424,7 @@ menu to select one of the installed operating systems.")
(define-public dtc
(package
(name "dtc")
(version "1.5.1")
(version "1.6.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -432,7 +432,7 @@ menu to select one of the installed operating systems.")
"dtc-" version ".tar.xz"))
(sha256
(base32
"07q3mdsvl4smbiakriq3hnsyyd0q344lsm306q0kgz4hjq1p82v6"))))
"0bf8801z6fpd1gz9mxd5pqqj8nq101x393cyw8rpkc712w13nl0h"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)

View file

@ -6,7 +6,7 @@
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
@ -36,18 +36,27 @@
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages adns)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages gcc)
#:use-module (gnu packages linux)
#:use-module (gnu packages logging)
#:use-module (gnu packages lua)
#:use-module (gnu packages package-management)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages regex)
#:use-module (gnu packages rpc)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages ninja)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python))
@ -90,19 +99,46 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear
(package
(name "bear")
(version "2.4.4")
(version "3.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rizsotto/Bear")
(commit version)))
(file-name (git-file-name name version))
(patches (search-patches
"bear-disable-preinstall-tests.patch"))
(sha256
(base32
"184dqjcpxiwcfziyi67zzran2c4fal1r3j8nhjdjadcmfxf4389d"))))
"15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'check 'set-build-environment
(lambda _
(setenv "CC" "gcc")
#t))
;; TODO: Test Configuration is Incomplete
(replace 'check
(lambda _
(invoke "ctest"))))))
(inputs
`(("python" ,python-wrapper)))
`(("c-ares" ,c-ares)
("fmt" ,fmt)
("grpc" ,grpc)
("json-modern-cxx" ,json-modern-cxx)
("protobuf" ,protobuf)
("python" ,python-wrapper)
("re2" ,re2)
("spdlog" ,spdlog)))
(native-inputs
`(("abseil-cpp" ,abseil-cpp)
("gcc-9" ,gcc-9) ; for <filesystem>, #44896
("googletest" ,googletest)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
("python-lit" ,python-lit)
("zlib" ,zlib)))
(home-page "https://github.com/rizsotto/Bear")
(synopsis "Tool for generating a compilation database")
(description "A JSON compilation database is used in the Clang project to

View file

@ -10,6 +10,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,8 +33,10 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
@ -536,3 +539,75 @@ avoiding distractions when studying code that uses @code{#ifdef} heavily for
portability.")
(license (list license:bsd-2 ;all files except...
license:bsd-3)))) ;...the unidef.1 manual page
(define-public aws-c-common
(package
(name "aws-c-common")
(version "0.4.63")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"))))
(build-system cmake-build-system)
(synopsis "Amazon Web Services core C library")
(description
"This library provides common C99 primitives, configuration, data
structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.")
(home-page "https://github.com/awslabs/aws-c-common")
(license license:asl2.0)))
(define-public aws-checksums
(package
(name "aws-checksums")
(version "0.1.10")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"))
(patches (search-patches "aws-checksums-cmake-prefix.patch"))))
(build-system cmake-build-system)
(inputs
`(("aws-c-common" ,aws-c-common)))
(synopsis "Amazon Web Services checksum library")
(description
"This library provides cross-Platform hardware accelerated CRC32c and CRC32
with fallback to efficient C99 software implementations.")
(home-page "https://github.com/awslabs/aws-checksums")
(license license:asl2.0)))
(define-public aws-c-event-stream
(package
(name "aws-c-event-stream")
(version "0.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/awslabs/" name))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1vl9ainc4klv0g9gk1iv4833bsllni6jxn6mwb0fnv2dnlz7zv9q"))
(patches (search-patches "aws-c-event-stream-cmake-prefix.patch"))))
(build-system cmake-build-system)
(propagated-inputs
`(("aws-c-common" ,aws-c-common)))
(inputs
`(("aws-checksums" ,aws-checksums)))
(synopsis "Amazon Web Services client-server message format library")
(description
"This library is a C99 implementation for @acronym{AWS,Amazon Web Services}
event stream encoding, a binary format for bidirectional client-server
communication.")
(home-page "https://github.com/awslabs/aws-c-event-stream")
(license license:asl2.0)))

View file

@ -266,14 +266,14 @@ with a flexible variety of user interfaces.")
(define-public cppunit
(package
(name "cppunit")
(version "1.14.0")
(version "1.15.1")
(source (origin
(method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/"
name "-" version ".tar.gz"))
(sha256
(base32
"1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"))))
"19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"))))
;; Explicitly link with libdl. This is expected to be done by packages
;; relying on cppunit for their tests. However, not all of them do.
;; If we added the linker flag to such packages, we would pollute all

View file

@ -3,6 +3,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@ -42,29 +43,29 @@
#:use-module (srfi srfi-1))
(define nanopass
(let ((version "1.9"))
(let ((version "1.9.1"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nanopass/nanopass-framework-scheme")
(commit (string-append "v" version))))
(sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
(sha256 (base32 "1synadgaycca39jfx525975ss9y0lkl516sdrc62wrrllamm8n21"))
(file-name (git-file-name "nanopass" version)))))
(define stex
(let ((version "1.2.1"))
(let ((version "1.2.2"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dybvig/stex")
(commit (string-append "v" version))))
(sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
(sha256 (base32 "1q5i8pf4cdfjsj6r2k1rih7ljbfggyxdng2p2fvsgarzihpsin2i"))
(file-name (git-file-name "stex" version)))))
(define-public chez-scheme
(package
(name "chez-scheme")
(version "9.5.2")
(version "9.5.4")
(source
(origin
(method git-fetch)
@ -72,13 +73,15 @@
(url "https://github.com/cisco/ChezScheme")
(commit (string-append "v" version))))
(sha256
(base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5"))
(base32 "0prgn2z9l888j93ydxaf04ph424g0fi3a8w7f8m0b2r7fr1v7388"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)
("libuuid" ,util-linux "lib")
("libx11" ,libx11)
("lz4" ,lz4)
("lz4:static" ,lz4 "static")
("xorg-rgb" ,xorg-rgb)
("nanopass" ,nanopass)
("zlib" ,zlib)
@ -118,7 +121,7 @@
(let ((out (assoc-ref outputs "out"))
(nanopass (assoc-ref inputs "nanopass"))
(stex (assoc-ref inputs "stex"))
(zlib (assoc-ref inputs "zlib"))
(lz4-static (assoc-ref inputs "lz4:static"))
(zlib-static (assoc-ref inputs "zlib:static"))
(unpack (assoc-ref %standard-phases 'unpack))
(patch-source-shebangs
@ -137,13 +140,6 @@
;; and manually patch the needed modules for compilation.
(substitute* "configure"
(("! -f '") "-d '")) ; working around CURL.
(substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+")
(("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
"${Kernel}: ${kernelobj}")
(("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args)
(string-append "ld " args " " zlib-static "/lib/libz.a"))
(("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))")
(which "true")))
(substitute* (find-files "mats" "Mf-.*")
(("^[[:space:]]+(cc ) *") "\tgcc "))
(substitute*
@ -155,16 +151,21 @@
"|stex\\.stex"
"|newrelease"
"|workarea"
"|unix\\.ms"
"|^6\\.ms"
;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read
")"))
(("/bin/rm") (which "rm"))
(("/bin/ln") (which "ln"))
(("/bin/cp") (which "cp")))
(("/bin/cp") (which "cp"))
(("/bin/echo") (which "echo")))
(substitute* "makefiles/installsh"
(("/bin/true") (which "true")))
(substitute* "stex/Makefile"
(("PREFIX=/usr") (string-append "PREFIX=" out)))
(invoke "./configure" "--threads"
(string-append "ZLIB=" zlib-static "/lib/libz.a")
(string-append "LZ4=" lz4-static "/lib/liblz4.a")
(string-append "--installprefix=" out)))))
;; Installation of the documentation requires a running "chez".
(add-after 'install 'install-doc

View file

@ -2202,7 +2202,7 @@ file compression algorithm.")
(define-public xarchiver
(package
(name "xarchiver")
(version "0.5.4.15")
(version "0.5.4.16")
(source
(origin
(method git-fetch)
@ -2211,7 +2211,7 @@ file compression algorithm.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0a3y54r5zp2c0cqm77r07qrl1vh200wvqmbhm35diy22fvkq5mwc"))))
(base32 "0nblyk65w1in0zpfbyzy6dw4x0fzx3q7xs85dby5ap4w0gjz9s44"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)

View file

@ -43,10 +43,12 @@
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind)
@ -732,6 +734,42 @@ of C++14 components that complements @code{std} and Boost.")
(supported-systems '("aarch64-linux" "x86_64-linux"))
(license license:asl2.0)))
(define-public aws-sdk-cpp
(package
(name "aws-sdk-cpp")
(version "1.8.102")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/aws/aws-sdk-cpp")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1w8x2vakg5ngjyyg08n4g3dqy8wqnz0k3gkrlqrh460s2pvdivba"))))
(build-system cmake-build-system)
(arguments
'(;; Tests are run during the build phase.
#:tests? #f
#:configure-flags
'("-DBUILD_SHARED_LIBS=OFF"
"-DBUILD_DEPS=OFF")))
(propagated-inputs
`(("aws-c-common" ,aws-c-common)
("aws-c-event-stream" ,aws-c-event-stream)))
(inputs
`(("aws-checksums" ,aws-checksums)
("curl" ,curl)
("openssl" ,openssl)
("zlib" ,zlib)))
(synopsis "Amazon Web Services SDK for C++")
(description
"The AWS SDK for C++ provides a C++11 interface to the @acronym{AWS,Amazon
Web Services} API. AWS provides on-demand computing infrastructure and software
services including database, analytic, and machine learning technologies.")
(home-page "https://github.com/aws/aws-sdk-cpp")
(license license:asl2.0)))
(define-public libexpected
(package
(name "libexpected")

View file

@ -32,6 +32,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Magali Lemes <magalilemes00@gmail.com>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -25174,6 +25175,94 @@ orthogonal coordinate systems: cartesian, polar, spherical, cylindrical,
parabolic or user defined by custom scale factors.")
(license license:gpl3)))
(define-public r-decon
(package
(name "r-decon")
(version "1.2-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "decon" version))
(sha256
(base32
"1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"))))
(properties `((upstream-name . "decon")))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))
(home-page
"https://cran.r-project.org/web/packages/decon/")
(synopsis "Deconvolution Estimation in Measurement Error Models")
(description
"This package contains a collection of functions to deal with
nonparametric measurement error problems using deconvolution
kernel methods. We focus two measurement error models in the
package: (1) an additive measurement error model, where the
goal is to estimate the density or distribution function from
contaminated data; (2) nonparametric regression model with
errors-in-variables. The R functions allow the measurement errors
to be either homoscedastic or heteroscedastic. To make the
deconvolution estimators computationally more efficient in R,
we adapt the \"Fast Fourier Transform\" (FFT) algorithm for
density estimation with error-free data to the deconvolution
kernel estimation. Several methods for the selection of the
data-driven smoothing parameter are also provided in the package.
See details in: Wang, X.F. and Wang, B. (2011). Deconvolution
estimation in measurement error models: The R package decon.
Journal of Statistical Software, 39(10), 1-24.")
(license license:gpl3+)))
(define-public r-locpol
(package
(name "r-locpol")
(version "0.7-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "locpol" version))
(sha256
(base32
"1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"))))
(properties `((upstream-name . "locpol")))
(build-system r-build-system)
(home-page
"https://cran.r-project.org/web/packages/locpol/")
(synopsis "Kernel Local Polynomial Regression")
(description
"Computes local polynomial estimators for the regression and
also density. It comprises several different utilities to handle
kernel estimators.")
(license license:gpl2+)))
(define-public r-lpme
(package
(name "r-lpme")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "lpme" version))
(sha256
(base32
"0si90nkgl8bqk8yvd2igdsrngiwqh8891072pfpzipifnd0f5448"))))
(properties `((upstream-name . "lpme")))
(build-system r-build-system)
(propagated-inputs
`(("r-decon" ,r-decon)
("r-flexmix" ,r-flexmix)
("r-locpol" ,r-locpol)
("r-rcpp" ,r-rcpp)
("r-rcpparmadillo" ,r-rcpparmadillo)))
(home-page
"https://cran.r-project.org/web/packages/lpme/")
(synopsis "Nonparametric Estimation of Measurement Error Models")
(description
"Provide nonparametric methods for mean regression model,
modal regression and conditional density estimation in the
presence/absence of measurement error. Bandwidth selection is
also provided for each method.")
(license license:gpl2+)))
(define-public r-aws-signature
(package
(name "r-aws-signature")

View file

@ -3627,8 +3627,7 @@ used in argon2rs' bench suite.")
"0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
`(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
(home-page "https://github.com/blas-lapack-rs/cblas-sys")
(synopsis "Bindings to CBLAS (C)")
(description
@ -8079,7 +8078,7 @@ encodings.")
(define-public rust-encoding-rs-0.8
(package
(name "rust-encoding-rs")
(version "0.8.17")
(version "0.8.26")
(source
(origin
(method url-fetch)
@ -8088,13 +8087,12 @@ encodings.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1v902qqnbd37vdq4rjvp6k05wmghrasfdcjy30gp1xpjg5f7hma1"))))
"10xjcafwbxvm2kfsyymxlz8wc9s4bmdj1xzlc809rxyp2yrbl6w0"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-packed-simd" ,rust-packed-simd-0.3)
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-packed-simd" ,rust-packed-simd-2-0.3)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-bincode" ,rust-bincode-1)
@ -11544,6 +11542,30 @@ IEEE 754-2008 binary16 type.")
the template engine that renders the official Rust website")
(license license:expat)))
(define-public rust-handlegraph-0.3
(package
(name "rust-handlegraph")
(version "0.3.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "handlegraph" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1sj100w4lpj7798pws85qrfrzsily5hhzh6j118rwf56sgic1yml"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bstr" ,rust-bstr-0.2)
("rust-gfa" ,rust-gfa-0.6))))
(home-page "https://github.com/chfi/rs-handlegraph")
(synopsis "Library for use in variation graphs")
(description
"This package provides a Rust implementation of VG handle graph.")
(license license:expat)))
(define-public rust-hash32-0.1
(package
(name "rust-hash32")
@ -12777,7 +12799,7 @@ ignore files such as .gitignore against file paths.")
(define-public rust-indexmap-1
(package
(name "rust-indexmap")
(version "1.4.0")
(version "1.6.1")
(source
(origin
(method url-fetch)
@ -12786,20 +12808,22 @@ ignore files such as .gitignore against file paths.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ziabh0lc4wwahv3qgv6aqckyydcrczpagpfp770jn5m2fqv5663"))))
"0friqyzr4ssyayks7nirqbc36zcsf8fdi67jmvl4vpjh8a9zmcag"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-autocfg" ,rust-autocfg-1.0)
("rust-hashbrown" ,rust-hashbrown-0.9)
("rust-serde" ,rust-serde-1)
("rust-rayon" ,rust-rayon-1))
#:cargo-development-inputs
(("rust-fnv" ,rust-fnv-1)
("rust-itertools" ,rust-itertools-0.8)
("rust-fxhash" ,rust-fxhash-0.2)
("rust-itertools" ,rust-itertools-0.9)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-quickcheck" ,rust-quickcheck-0.9)
("rust-rand" ,rust-rand-0.7)
("rust-serde-test" ,rust-serde-test-1))))
("rust-serde-derive" ,rust-serde-derive-1))))
(home-page "https://github.com/bluss/indexmap")
(synopsis "Hash table with consistent order and fast iteration.")
(description
@ -14627,6 +14651,42 @@ file.
(description "Native bindings to the libsqlite3 library")
(license license:expat)))
(define-public rust-libsqlite3-sys-0.18
(package
(inherit rust-libsqlite3-sys-0.20)
(name "rust-libsqlite3-sys")
(version "0.18.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "libsqlite3-sys" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ggpbnis0rci97ln628y2v6pkgfhb6zgc8rsp444mkdfph14lw0y"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "sqlite3")
;; Enable unstable features
(substitute* "src/lib.rs"
(("#!\\[allow\\(non_snake_case, non_camel_case_types\\)\\]" all)
(string-append "#![feature(non_exhaustive)]\n" all)))))))
(arguments
`(#:cargo-inputs
;; build-dependencies
(("rust-bindgen" ,rust-bindgen-0.53)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enable-unstable-features
(lambda _
(setenv "RUSTC_BOOTSTRAP" "1")
#t)))))))
(define-public rust-libsqlite3-sys-0.15
(package
(inherit rust-libsqlite3-sys-0.20)
@ -14877,6 +14937,74 @@ punctuation.")
(license (list license:asl2.0
license:expat))))
(define-public rust-lmdb-rkv-0.14
(package
(name "rust-lmdb-rkv")
(version "0.14.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "lmdb-rkv" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0aylp9j3s34cgxfj3dszcnplj5a594ylykhgnpxrqafag9pjjyj4"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-byteorder" ,rust-byteorder-1)
("rust-libc" ,rust-libc-0.2)
("rust-lmdb-rkv-sys" ,rust-lmdb-rkv-sys-0.11))
#:cargo-development-inputs
(("rust-rand" ,rust-rand-0.4)
("rust-tempdir" ,rust-tempdir-0.3))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("lmdb" ,lmdb)))
(home-page "https://github.com/mozilla/lmdb-rs")
(synopsis "Safe Rust bindings for LMDB")
(description "This package provides idiomatic and safe APIs for interacting
with lmdb.")
(license license:asl2.0)))
(define-public rust-lmdb-rkv-sys-0.11
(package
(name "rust-lmdb-rkv-sys")
(version "0.11.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "lmdb-rkv-sys" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1994mvbdxkvq6c3z9npv1zjpvrhvpk9zry3azgyklyqn4nn70x5j"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "lmdb")
#t))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Tests fail after removing bundled source.
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-bindgen" ,rust-bindgen-0.53)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("lmdb" ,lmdb)))
(home-page "https://github.com/mozilla/lmdb-rs")
(synopsis "Rust bindings for liblmdb")
(description "This package provides rust bindings for liblmdb.")
(license license:asl2.0)))
(define-public rust-locale-0.2
(package
(name "rust-locale")
@ -15234,18 +15362,18 @@ key-value pairs.")
(define-public rust-lzma-sys-0.1
(package
(name "rust-lzma-sys")
(version "0.1.15")
(version "0.1.17")
(source
(origin
(method url-fetch)
(uri (crate-uri "lzma-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "xz-5.2") #t))))
(origin
(method url-fetch)
(uri (crate-uri "lzma-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"06fnjsx5cj2w6rsqb12x30nl9lnj0xv4hv78z4x1vlfsxp1vgd5x"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "xz-5.2") #t))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@ -16851,6 +16979,39 @@ IO of Windows's named pipes.")
"This package provides a crate to perform natural ordering for Rust.")
(license license:expat)))
(define-public rust-ndarray-0.12
(package
(name "rust-ndarray")
(version "0.12.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "ndarray" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0a5rfwcbqnvbwi3nw5sfz6kf0flhmjxs64s0b4kxc6lhmyl81wvw"))
(patches (search-patches "rust-ndarray-remove-blas-src-dep.patch"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-itertools" ,rust-itertools-0.7)
("rust-matrixmultiply" ,rust-matrixmultiply-0.1)
("rust-num-complex" ,rust-num-complex-0.2)
("rust-cblas-sys" ,rust-cblas-sys-0.1)
("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-defmac" ,rust-defmac-0.1)
("rust-quickcheck" ,rust-quickcheck-0.7)
("rust-rawpointer" ,rust-rawpointer-0.1))))
(home-page "https://github.com/rust-ndarray/ndarray")
(synopsis "N-dimensional container for general elements and for numerics")
(description "@code{ndarray} implements an n-dimensional container for
general elements and for numerics.")
(license (list license:asl2.0
license:expat))))
(define-public rust-net2-0.2
(package
(name "rust-net2")
@ -17218,6 +17379,27 @@ combinators library.")
("rust-memchr" ,rust-memchr-1.0)
("rust-regex" ,rust-regex-0.2))))))
(define-public rust-nom-2
(package
(inherit rust-nom-4.2)
(name "rust-nom")
(version "2.2.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "nom" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1zv6ig7nw532rl4p35jsahglfhyyznjkblwa6si6c0plxhlsflfg"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-lazy-static" ,rust-lazy-static-0.2)
("rust-regex" ,rust-regex-0.2))
#:tests? #f))))
(define-public rust-nom-1.2
(package
(inherit rust-nom-4.2)
@ -18796,6 +18978,51 @@ normally prevent moving a type that has been borrowed from.")
(description "Portable Packed SIMD vectors.")
(license (list license:asl2.0 license:expat))))
(define-public rust-packed-simd-2-0.3
(package
(name "rust-packed-simd-2")
(version "0.3.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "packed-simd-2" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"05wsm2yxxpwww6a74hi8l80qszisfar5d7whf2pd87wn5x4y0y1j"))
(modules '((guix build utils)))
(snippet
'(begin
;; Unpin the dependencies.
(substitute* "Cargo.toml"
(("=0.2.52") "^0.2.52")
(("=0.3.2") "^0.3.2"))
#t))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; error[E0432]: unresolved import `packed_simd`
#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-core-arch" ,rust-core-arch-0.1)
("rust-libm" ,rust-libm-0.1)
("rust-sleef-sys" ,rust-sleef-sys-0.1))
#:cargo-development-inputs
(("rust-arrayvec" ,rust-arrayvec-0.5)
("rust-paste" ,rust-paste-0.1)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enable-unstable-features
(lambda _
(setenv "RUSTC_BOOTSTRAP" "1")
#t)))))
(home-page "https://github.com/rust-lang-nursery/packed_simd")
(synopsis "Portable Packed SIMD vectors")
(description "Portable Packed SIMD vectors.")
(license (list license:expat license:asl2.0))))
(define-public rust-pad-0.1
(package
(name "rust-pad")
@ -23570,6 +23797,47 @@ your own implementation.")
Rust Language Server.")
(license (list license:expat license:asl2.0))))
(define-public rust-rkv-0.10
(package
(name "rust-rkv")
(version "0.10.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "rkv" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"14v7izkpwvk4ag8p9machzjq2v10xwimy5ylbra744wpyk0xp8rh"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Some test files missing.
#:cargo-inputs
(("rust-arrayref" ,rust-arrayref-0.3)
("rust-bincode" ,rust-bincode-1)
("rust-bitflags" ,rust-bitflags-1)
("rust-byteorder" ,rust-byteorder-1)
("rust-failure" ,rust-failure-0.1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-lmdb-rkv" ,rust-lmdb-rkv-0.14)
("rust-ordered-float" ,rust-ordered-float-1.0)
("rust-serde" ,rust-serde-1)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-url" ,rust-url-2)
("rust-uuid" ,rust-uuid-0.8))
#:cargo-development-inputs
(("rust-byteorder" ,rust-byteorder-1)
("rust-tempfile" ,rust-tempfile-3))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("lmdb" ,lmdb)))
(home-page "https://github.com/mozilla/rkv")
(synopsis "Typed key-value storage")
(description "This package provides a typed key-value storage solution.")
(license license:asl2.0)))
(define-public rust-ron-0.5
(package
(name "rust-ron")
@ -23763,6 +24031,63 @@ console applications.")
(description "This prackage provides a wrapper for SQLite.")
(license license:expat)))
(define-public rust-rusqlite-0.23
(package
(inherit rust-rusqlite-0.24)
(name "rust-rusqlite")
(version "0.23.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rusqlite" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "12z5584sylfqg7v2fyiycahyg0hf186v8v2ff5ad4qyzw5igvl25"))
(modules '((guix build utils)))
(snippet
'(begin
;; Enable unstable features
(substitute* "src/lib.rs"
(("#!\\[allow\\(unknown_lints\\)\\]" all)
(string-append
"#![feature(cfg_doctest)]\n"
"#![feature(non_exhaustive)]\n"
all)))))))
(arguments
`(#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-byteorder" ,rust-byteorder-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-csv" ,rust-csv-1.1)
("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
("rust-fallible-streaming-iterator"
,rust-fallible-streaming-iterator-0.1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.18)
("rust-lru-cache" ,rust-lru-cache-0.1)
("rust-memchr" ,rust-memchr-2)
("rust-serde-json" ,rust-serde-json-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-time" ,rust-time-0.1)
("rust-url" ,rust-url-2)
("rust-uuid" ,rust-uuid-0.8))
#:cargo-development-inputs
(("rust-bencher" ,rust-bencher-0.1)
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1)
("rust-tempfile" ,rust-tempfile-3)
("rust-unicase" ,rust-unicase-2)
("rust-uuid" ,rust-uuid-0.8))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enable-unstable-features
(lambda _
(setenv "RUSTC_BOOTSTRAP" "1")
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))))
(define-public rust-rust-argon2-0.7
(package
(name "rust-rust-argon2")
@ -26339,29 +26664,28 @@ for the serde framework.")
(define-public rust-serde-json-1
(package
(name "rust-serde-json")
(version "1.0.50")
(version "1.0.60")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-json" version))
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
"0rs8rsk59kgkgsrw8hyyjrlhas9k1by2jwxxqcz3c2bq2qna39vq"))))
(origin
(method url-fetch)
(uri (crate-uri "serde-json" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0yapc7xxk8dx12691yj0l13008rgvknmc6krvk8jwj7y4x6yh00m"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
`(#:cargo-inputs
(("rust-indexmap" ,rust-indexmap-1)
("rust-itoa" ,rust-itoa-0.4)
("rust-ryu" ,rust-ryu-1.0)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(;("rust-automod" ,rust-automod-0.1)
(("rust-automod" ,rust-automod-1)
("rust-rustversion" ,rust-rustversion-1)
("rust-serde-bytes" ,rust-serde-bytes-0.11)
("rust-serde-derive" ,rust-serde-derive-1)
;("rust-serde-stacker" ,rust-serde-stacker-0.1)
("rust-serde-stacker" ,rust-serde-stacker-0.1)
("rust-trybuild" ,rust-trybuild-1))))
(home-page "https://github.com/serde-rs/json")
(synopsis "JSON serialization file format")
@ -26430,6 +26754,33 @@ for the serde framework.")
"Macros to auto-generate implementations for the serde framework.")
(license (list license:expat license:asl2.0))))
(define-public rust-serde-stacker-0.1
(package
(name "rust-serde-stacker")
(version "0.1.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-stacker" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1qlfpy0nmxrvahz4hs9p1y84rb0vy6mbxn1lfgvq6fryls8j7jgl"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-serde" ,rust-serde-1)
("rust-stacker" ,rust-stacker-0.1))
#:cargo-development-inputs
(("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/dtolnay/serde-stacker")
(synopsis "@code{serde} adapter that avoids stack overflow")
(description
"This package provides a @code{serde} adapter that avoids stack overflow
by dynamically growing the stack.")
(license (list license:expat license:asl2.0))))
(define-public rust-serde-test-1
(package
(name "rust-serde-test")
@ -27402,6 +27753,29 @@ variants in pure Rust.")
"SipHash functions from rust-core < 1.13.")
(license (list license:asl2.0 license:expat))))
(define-public rust-size-format-1
(package
(name "rust-size-format")
(version "1.0.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "size-format" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0fxjl0rc0x7yc14x885dh7jjf2jrlhpwf66akp3dxii246mzdmbf"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-generic-array" ,rust-generic-array-0.12)
("rust-num" ,rust-num-0.2))))
(home-page "https://github.com/aticu/size_format")
(synopsis "Allow easier formatting of sizes")
(description "This package allows for easier formatting of sizes.")
(license (list license:expat license:asl2.0))))
(define-public rust-skeptic-0.9
(package
(name "rust-skeptic")
@ -27473,6 +27847,7 @@ variants in pure Rust.")
data type.")
(license license:expat)))
;; TODO: Unbundle sleef.
(define-public rust-sleef-sys-0.1
(package
(name "rust-sleef-sys")
@ -27491,9 +27866,8 @@ data type.")
`(#:skip-build? #t
#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-libc" ,rust-libc-0.2))
#:cargo-development-inputs
(("rust-bindgen" ,rust-bindgen-0.50)
("rust-libc" ,rust-libc-0.2)
("rust-bindgen" ,rust-bindgen-0.46)
("rust-cmake" ,rust-cmake-0.1)
("rust-env-logger" ,rust-env-logger-0.6))))
(home-page "https://github.com/gnzlbg/sleef-sys")
@ -29434,6 +29808,33 @@ metadata, rather than programmatically in @file{build.rs}. This makes those
dependencies declarative, so other tools can read them as well.")
(license (list license:expat license:asl2.0))))
(define-public rust-tabwriter-1
(package
(name "rust-tabwriter")
(version "1.2.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "tabwriter" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"048i0mj3b07zlry9m5fl706y5bzdzgrswymqn32drakzk7y5q81n"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1)
("rust-unicode-width" ,rust-unicode-width-0.1))))
(home-page "https://github.com/BurntSushi/tabwriter")
(synopsis "Elastic tabstops")
(description "@code{tabwriter} is a crate that implements
@url{http://nickgravgaard.com/elastictabstops/index.html,elastic tabstops}. It
provides both a library for wrapping Rust @code{Writer}s and a small program
that exposes the same functionality at the command line.")
(license (list license:unlicense license:expat))))
(define-public rust-take-mut-0.2
(package
(name "rust-take-mut")

View file

@ -28,6 +28,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages fonts) ; font-dejavu
#:use-module (gnu packages fontutils)
@ -716,6 +717,41 @@ printer/driver specific, but spooler-independent PPD file.")
(("^MODTIME[[:blank:]]*=.*$")
"MODTIME = echo Thu Jan 01 01:00:00 1970\n"))
#t))
(add-before 'install 'make-install-dirs
(lambda* (#:key outputs #:allow-other-keys)
;; Make missing install dirs
(let ((out (assoc-ref outputs "out"))
(dirs '("/share/cups/model"
"/share/foomatic/db/source/opt"
"/share/foomatic/db/source/printer"
"/share/foomatic/db/source/driver"
"/lib/cups/filter")))
(for-each (lambda (dir)
(mkdir-p (string-append out dir)))
dirs))))
(add-after 'install 'wrap-wrappers
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(ghostscript (assoc-ref inputs "ghostscript"))
(coreutils (assoc-ref inputs "coreutils"))
(sed (assoc-ref inputs "sed")))
(for-each (lambda (file)
(wrap-program file
`("PATH" ":" prefix
(,(string-append ghostscript "/bin:"
coreutils "/bin:"
sed "/bin")))))
(find-files (string-append
out "/bin") "wrapper$")))))
(add-after 'install 'install-cups-filters-symlinks
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (file)
(symlink file
(string-append out "/lib/cups/filter/"
(basename file))))
(find-files (string-append out "/bin"))))))
(add-after 'install 'remove-pdf
(lambda* (#:key outputs #:allow-other-keys)
;; Remove 'manual.pdf' which is (1) useless (it's a
@ -729,7 +765,9 @@ printer/driver specific, but spooler-independent PPD file.")
#:tests? #f ;no tests
#:make-flags '("CC=gcc")))
(inputs
`(("ghostscript" ,ghostscript)
`(("coreutils" ,coreutils)
("sed" ,sed)
("ghostscript" ,ghostscript)
("foomatic-filters" ,foomatic-filters))) ;for 'foomatic-rip'
(native-inputs
`(("bc" ,bc)

View file

@ -2385,7 +2385,25 @@ database.")
(chdir "libraries/liblmdb")
(substitute* "Makefile"
(("/usr/local") (assoc-ref outputs "out")))
#t)))))
#t))
(add-after 'install 'create-pkg-config-file
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/lib/pkgconfig"))
(with-output-to-file (string-append out "/lib/pkgconfig/liblmdb.pc")
(lambda _
(format #t "prefix=~a~@
exec_prefix=~a~@
libdir=~a/lib~@
includedir=~a/include~@
~@
Name: liblmdb~@
Version: ~a~@
Description: Lightning Memory-Mapped Database library~@
Libs: -L${libdir} -llmdb~@
Cflags: -I${includedir}~%"
out out out out ,version)))
#t))))))
(home-page "https://symas.com/lmdb/")
(synopsis "Lightning Memory-Mapped Database library")
(description

View file

@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
(package
(name "bind")
;; When updating, check whether isc-dhcp's bundled copy should be as well.
(version "9.16.9")
(version "9.16.10")
(source (origin
(method url-fetch)
(uri (string-append
@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
"/bind-" version ".tar.xz"))
(sha256
(base32
"0nja60jxb8d2m5fi6xd55xjpfkzmxhjsmbxqphy6x91qsz295cmw"))))
"1cv26gzbyk3ahidr1fip0pgj28s7l52cafdqpykfc1b2kh0zqixw"))))
(build-system gnu-build-system)
(outputs `("out" "utils"))
(inputs
@ -807,7 +807,7 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
(version "3.0.2")
(version "3.0.3")
(source
(origin
(method git-fetch)
@ -816,7 +816,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1cinzz8p86fzknnr2z6b49yqr4y05mmnr0l2q3lwzcfhc6dcl8di"))
(base32 "0xzig9l91wj6x23mh75vw2r51ihrgx916c7wxvpcfnwrqsv4f3hy"))
(modules '((guix build utils)))
(snippet
'(begin

View file

@ -151,7 +151,7 @@
("python2-css-parser" ,python2-css-parser)
("python2-dateutil" ,python2-dateutil)
("python2-dbus" ,python2-dbus)
("python2-dnspython" ,python2-dnspython)
("python2-dnspython" ,python2-dnspython-1.16)
("python2-dukpy" ,python2-dukpy)
("python2-feedparser" ,python2-feedparser)
("python2-html2text" ,python2-html2text)

View file

@ -611,14 +611,14 @@ Portuguese, Spanish and Italian.")
(define-public fet
(package
(name "fet")
(version "5.48.0")
(version "5.48.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
"fet-" version ".tar.bz2"))
(sha256
(base32 "12bd53r841r8zsn3v1kzws2qar908p6g6mlnm50kmjkxramr63ga"))))
(base32 "0k728l6zi0lkhzyipsb0f2jw53s4xicm7arp33ikhrvc4jlwcp4v"))))
(build-system gnu-build-system)
(arguments
`(#:phases

View file

@ -32,6 +32,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages embedded)
#:use-module (gnu packages gawk)
#:use-module (gnu packages glib)
#:use-module (gnu packages graphviz)
@ -39,8 +40,7 @@
#:use-module (gnu packages libusb)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages sdcc))
#:use-module (gnu packages qt))
(define-public libserialport
(package

View file

@ -87,6 +87,8 @@
;;; Copyright © 2020 Noah Landis <noahlandis@posteo.net>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 André A. Gomes <andremegafone@gmail.com>
;;; Copyright © 2020 Jonathan Rostran <rostranjj@gmail.com>
;;; Copyright © 2020 Noah Evans <noah@nevans.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -341,6 +343,26 @@ for those who may want transient periods of unbalanced parentheses, such as
when typing parentheses directly or commenting out code line by line.")
(license license:gpl3+)))
(define-public emacs-project
(package
(name "emacs-project")
(version "0.5.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"project-" version ".el"))
(sha256
(base32 "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-xref" ,emacs-xref)))
(home-page "http://elpa.gnu.org/packages/project.html")
(synopsis "Operations on the current project")
(description
"This library contains generic infrastructure for dealing with projects,
some utility functions, and commands using that infrastructure.")
(license license:gpl3+)))
(define-public git-modes
(package
(name "emacs-git-modes")
@ -777,12 +799,12 @@ deliver data to mobile and web apps.")
(license license:gpl3+)))
(define-public emacs-graphql-mode
;; No tagged commit.
;; No tagged commit. No "Version" keyword either.
(let ((commit "9bed568ec86242dbe30bdbab324aa0eb2cd9bf08")
(revision "1"))
(package
(name "emacs-graphql-mode")
(version commit)
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
@ -1324,6 +1346,28 @@ skip set strings, which are arguments to @code{skip-chars-forward} and
and reused.")
(license license:gpl3+))))
(define-public emacs-airline-themes
(package
(name "emacs-airline-themes")
(version "1.8")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/AnthonyDiGirolamo/airline-themes")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-powerline" ,emacs-powerline)))
(home-page "https://github.com/AnthonyDiGirolamo/airline-themes")
(synopsis "Vim-airline themes for Emacs Powerline")
(description
"This is a port of the themes in Vim-airline to Emacs Powerline.")
(license license:expat)))
(define-public emacs-ample-theme
(let ((commit "536966adf882446165a1f756830028faa792c7a9")
(revision "1"))
@ -3792,7 +3836,7 @@ IRC bouncer with ERC.")
ERC, an Emacs client for IRC (Internet Relay Chat). It relies on the
@code{erc-track} module, and displays all the same information
@code{erc-track} does in the mode line, but in an alternative format.")
(license license:expat))))
(license license:gpl3+))))
(define-public emacs-shut-up
(package
@ -4695,7 +4739,8 @@ respective @code{*Help*} buffers.")
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)))
("emacs-f" ,emacs-f)
("emacs-yaml-mode" ,emacs-yaml-mode)))
(home-page "https://github.com/meqif/docker-compose-mode/")
(synopsis "Major mode for editing @file{docker-compose} files")
(description
@ -4760,8 +4805,9 @@ Gnus, e.g., for applying patches received by email.")
(license license:gpl2+))))
(define-public emacs-sudo-edit
(let ((commit "cc3d478937b1accd38742bfceba92af02ee9357d")
(revision "6"))
;; No proper release nor tag.
(let ((commit "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d")
(revision "0"))
(package
(name "emacs-sudo-edit")
(version (git-version "0.1.0" revision commit))
@ -4774,12 +4820,13 @@ Gnus, e.g., for applying patches received by email.")
(file-name (git-file-name name version))
(sha256
(base32
"1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl"))))
"1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1"))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-undercover" ,emacs-undercover)))
(arguments
`(#:phases
`(#:emacs ,emacs
#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-makefile
(lambda _
@ -5761,7 +5808,7 @@ in @code{html-mode}.")
(define-public emacs-slime
(package
(name "emacs-slime")
(version "2.26")
(version "2.26.1")
(source
(origin
(method git-fetch)
@ -5770,7 +5817,7 @@ in @code{html-mode}.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0mxb1wnw19v0s72w2wkz5afdlzvpy5nn7pr4vav403qybac0sw5c"))))
(base32 "1a25ixb7q4svqabxnhwkk43v47mbsh13qwm7qlazkd3zkr8j3cli"))))
(build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
@ -6288,7 +6335,7 @@ started with 20 minutes. All values are customizable.")
(define-public emacs-org-sidebar
(package
(name "emacs-org-sidebar")
(version "0.2")
(version "0.3.2")
(source
(origin
(method git-fetch)
@ -6297,7 +6344,7 @@ started with 20 minutes. All values are customizable.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "106h06vjfbqfj761vbxwymd6612ds8c6fk053yzgbrqzm3hn2c03"))))
(base32 "1r8kp954ciin4j7j7j8ihdkryf5x09s3ryl7bi9h2j6xqc1ij4wq"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
@ -8124,33 +8171,31 @@ to all the other commands, too.")
(license license:gpl3+)))
(define-public emacs-js2-mode
(let ((commit "40aab27581279d0fdbfeb9afeb85f39d401a927f")
(revision "1"))
(package
(name "emacs-js2-mode")
(version (git-version "20190219" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mooz/js2-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0ysd0ji3vvk2zpjcg1wl7b2hva8471vq0ypib4h6spnpjdr43vzk"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/mooz/js2-mode/")
(synopsis "Improved JavaScript editing mode for Emacs")
(description
"Js2-mode provides a JavaScript major mode for Emacs that is more
(package
(name "emacs-js2-mode")
(version "20201220")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mooz/js2-mode")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "00jy917cgp5xzfgs4m0spzlbqk8mg63layin8nxmn2647rfjnik4"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/mooz/js2-mode/")
(synopsis "Improved JavaScript editing mode for Emacs")
(description
"Js2-mode provides a JavaScript major mode for Emacs that is more
advanced than the built-in javascript-mode. Features include accurate syntax
highlighting using a recursive-descent parser, on-the-fly reporting of syntax
errors and strict-mode warnings, smart line-wrapping within comments and
strings, and code folding.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-nodejs-repl
(package
@ -9695,6 +9740,31 @@ Emacs that Evil does not cover properly by default, such as @code{help-mode},
@code{M-x calendar}, Eshell and more.")
(license license:gpl3+))))
(define-public emacs-evil-goggles
(let ((commit "08a22058fd6a167f9f1b684c649008caef571459")
(version "0.0.1")
(revision "0"))
(package
(name "emacs-evil-goggles")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/edkolev/evil-goggles")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1p3vjrij63v9nrcyj3b5jsqzv9y7dgv9i1inx1q7x3s90vndavac"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)))
(home-page "https://github.com/edkolev/evil-goggles")
(synopsis "Displays visual hints when editing with evil")
(description "Creates a visual pulse to indicate the region that is
being deleted, changed, yanked, or pasted when using evil commands")
(license license:gpl3+))))
(define-public emacs-goto-chg
(let ((commit "1829a13026c597e358f716d2c7793202458120b5")
(version "1.7.3")
@ -10190,13 +10260,13 @@ passive voice.")
(name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update it as
;; well.
(version "9.4")
(version "9.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar"))
(sha256
(base32 "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6"))))
(base32 "1bkihy9zd8c1xxlmin1mzafn9kp8a9b3pq0f7bs0yzvxla9dvx98"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -10221,14 +10291,14 @@ programming and reproducible research.")
(package
(inherit emacs-org)
(name "emacs-org-contrib")
(version "20200914")
(version "20201213")
(source
(origin
(method url-fetch)
(uri (string-append "https://orgmode.org/elpa/"
"org-plus-contrib-" version ".tar"))
(sha256
(base32 "1naq25g4d95cx29axx428rnpc4m9hd0j7w1l0vqwkdjyr5qfj0ab"))
(base32 "0ljjx6zaqphqhm434ymv3bcpyxqymzpaifdh8nkzg8vdzyfma580"))
;; ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine.
(modules '((guix build utils)))
@ -11305,7 +11375,7 @@ actually changing the buffer's text.")
(define-public emacs-diff-hl
(package
(name "emacs-diff-hl")
(version "1.8.7")
(version "1.8.8")
(source
(origin
(method git-fetch)
@ -11314,7 +11384,7 @@ actually changing the buffer's text.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0i7x6qgr3nydcwhw72sbc8z9x9dfhgkf0dqj9nakvx36vn1bblbq"))))
(base32 "075klzf66z1rvhpxv4j694pdkmi7f4fpw6c8q4ncz0h4y5wdbl8w"))))
(build-system emacs-build-system)
(home-page "https://github.com/dgutov/diff-hl")
(synopsis
@ -12248,14 +12318,14 @@ Emacs.")
(define-public emacs-eglot
(package
(name "emacs-eglot")
(version "1.6")
(version "1.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"eglot-" version ".tar"))
(sha256
(base32 "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"))))
(base32 "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-jsonrpc" ,emacs-jsonrpc)))
@ -13450,7 +13520,7 @@ in a generalized CSV (character-separated values) format.")
(define-public emacs-transmission
(package
(name "emacs-transmission")
(version "0.12.1")
(version "0.12.2")
(source
(origin
(method git-fetch)
@ -13459,7 +13529,7 @@ in a generalized CSV (character-separated values) format.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"))))
(base32 "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc"))))
(build-system emacs-build-system)
(home-page "https://github.com/holomorph/transmission")
(synopsis "Emacs interface to a Transmission session")
@ -13936,7 +14006,7 @@ the format.")
(define-public emacs-nov-el
(package
(name "emacs-nov-el")
(version "0.3.1")
(version "0.3.3")
(source
(origin
(method git-fetch)
@ -13945,7 +14015,8 @@ the format.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9"))))
(base32
"116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -14835,32 +14906,74 @@ as well as functions for navigating between these headings.")
(license license:gpl3+)))
(define-public emacs-org-super-agenda
;; emacs-org-sidebar depends on a newer commit than the latest release version.
(let ((commit "a87ca11fbbe72ab6c1c4c3b55ae9e1e93ebfb8ba")
(revision "3"))
(package
(name "emacs-org-super-agenda")
(version (git-version "1.1.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/org-super-agenda")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-org" ,emacs-org)
("emacs-dash" ,emacs-dash)
("emacs-ts" ,emacs-ts)
("emacs-ht" ,emacs-ht)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/alphapapa/org-super-agenda")
(synopsis "Supercharged Org agenda")
(description "This package allows items in the Org agenda to be grouped
(package
(name "emacs-org-super-agenda")
(version "1.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/org-super-agenda")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"10l9h2n09cql4ih7nc0ma3ghdsq9l5v9xlj1lg7kq67icdwjlsvy"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("test/run" "--debug")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-for-tests.el
(lambda _
(make-file-writable "test/test.el")
(emacs-substitute-variables "test/test.el"
("org-super-agenda-test-results-file"
(string-append (getcwd) "/test/results.el")))
;; The following test fail (see:
;; https://github.com/alphapapa/org-super-agenda/issues/183).
(substitute* "test/test.el"
((".*org-super-agenda-test--:auto-map.*" all)
(string-append all " (skip-unless nil)\n")))
#t)))))
(native-inputs
`(("emacs-f" ,emacs-f)
("getopt" ,util-linux)))
(propagated-inputs
`(("emacs-org" ,emacs-org)
("emacs-dash" ,emacs-dash)
("emacs-ts" ,emacs-ts)
("emacs-ht" ,emacs-ht)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/alphapapa/org-super-agenda")
(synopsis "Supercharged Org agenda")
(description "This package allows items in the Org agenda to be grouped
into sections while preserving the structure imposed by any timestamps.")
(license license:gpl3+)))
(define-public emacs-elegant-agenda-mode
(let ((commit "c72f42e0f551c3dd81e68262f07a96c0ec90a589")
(revision "1"))
(package
(name "emacs-elegant-agenda-mode")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/justinbarclay/elegant-agenda-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0f8qk3vd41ffbkfqw5nks3bld0qpjrlnk9sb46wcbsyfnrs2v082"))))
(build-system emacs-build-system)
(home-page "https://github.com/justinbarclay/elegant-agenda-mode")
(synopsis "Elegant theme for your org-agenda")
(description
"The elegant-agenda-mode package uses fonts and typography to give your
org-agenda some breathing room and elegance. This package was inspired by the
work Nicolas Rougier.")
(license license:gpl3+))))
(define-public emacs-org-make-toc
@ -14967,10 +15080,45 @@ timestamps by providing a @code{ts} struct.")
according to a parsing expression grammar.")
(license license:gpl3+)))
(define-public emacs-with-simulated-input
(package
(name "emacs-with-simulated-input")
(version "2.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/DarwinAwardWinner/with-simulated-input")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf"))))
(build-system emacs-build-system)
(arguments
;; The test suite fails with error: "Spies can only be created in
;; before-each".
`(#:tests? #f
#:test-command '("buttercup" "-L" ".")))
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)
("emacs-undercover" ,emacs-undercover)))
(propagated-inputs
`(("emacs-s" ,emacs-s)))
(home-page "https://github.com/DarwinAwardWinner/with-simulated-input")
(synopsis "Non-interactive testing Emacs library")
(description "This package provides an Emacs Lisp macro,
@code{with-simulated-input}, which evaluates one or more forms while
simulating a sequence of input events for those forms to read. The result is
the same as if a user had evaluated the forms and then manually typed in the
same input. This macro is useful for non-interactive testing of normally
interactive commands and functions, such as @code{completing-read}.")
(license license:gpl3+)))
(define-public emacs-org-ql
(package
(name "emacs-org-ql")
(version "0.3.2")
(version "0.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -14978,7 +15126,7 @@ according to a parsing expression grammar.")
(commit version)))
(sha256
(base32
"11bhpi2l28vp8mm9nx18jljbqdnh9vxpv9kp1dn9lpsgivcdbc34"))
"14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
@ -14991,20 +15139,24 @@ according to a parsing expression grammar.")
("emacs-org" ,emacs-org)
("emacs-helm" ,emacs-helm)
("emacs-helm-org" ,emacs-helm-org)
("emacs-dash" ,emacs-dash)))
("emacs-dash" ,emacs-dash)
("emacs-transient" ,emacs-transient)))
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)))
`(("emacs-buttercup" ,emacs-buttercup)
("emacs-with-simulated-input" ,emacs-with-simulated-input)))
(arguments
`(#:phases
`(#:tests? #t
#:test-command '("buttercup" "-L" ".")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'require-helm
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "helm-org-ql.el"
(("^;;;; Requirements")
";;;; Requirements\n(require 'helm)\n(require 'helm-org)"))
#t)))
#:tests? #t
#:test-command '("buttercup" "-L" ".")))
(substitute* "tests/test-org-ql.el"
;; This test fails on Emacs 27.1 (see:
;; https://github.com/alphapapa/org-super-agenda/issues/183).
(("it \"Can search buffer containing the link\"" all)
(string-append "x" all)))
#t)))))
(home-page "https://github.com/alphapapa/org-ql/")
(synopsis "Query language for Org buffers")
(description "This package provides a Lispy query language for Org
@ -15491,6 +15643,8 @@ navigate and display hierarchy structures.")
(base32
"0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi"))))
(build-system emacs-build-system)
(arguments
`(#:include (cons "^[^/]*\\.extmap$" %default-include)))
(inputs
`(("emacs-extmap" ,emacs-extmap)))
(home-page "https://github.com/doublep/datetime/")
@ -16508,7 +16662,8 @@ and doesn't require memorisation of commands.
(sha256
(base32 "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"))))
(propagated-inputs
`(("emacs-datetime" ,emacs-datetime)))
`(("emacs-datetime" ,emacs-datetime)
("emacs-extmap" ,emacs-extmap)))
(build-system emacs-build-system)
(home-page "https://github.com/doublep/logview/")
(synopsis "Emacs mode for viewing log files")
@ -17752,10 +17907,11 @@ be changed by customizing the appropriate variables.")
(license license:gpl3+)))
(define-public emacs-org-caldav
(let ((commit "a563500c9884f38ce08793e2964f8274adde163d"))
(let ((commit "8569941a0a5a9393ba51afc8923fd7b77b73fa7a")
(revision "2"))
(package
(name "emacs-org-caldav")
(version (git-version "0.0.0" "1" commit))
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@ -17764,8 +17920,7 @@ be changed by customizing the appropriate variables.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"18qi1iv5dc0gsvkv9ifal3cjpm568nlb907v8a53cnm4439x1l0l"))))
(base32 "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g"))))
(build-system emacs-build-system)
(arguments
;; Tests require to have two specific calendars on a test server.
@ -17774,7 +17929,8 @@ be changed by customizing the appropriate variables.")
`(("emacs-org" ,emacs-org)))
(home-page "https://github.com/dengste/org-caldav")
(synopsis "Sync Org files with external calendars via the CalDAV protocol")
(description "Synchronize between events in Org files and a CalDAV
(description
"Org CalDAV synchronizes events between Org files and a CalDAV
calendar.")
(license license:gpl3+))))
@ -19694,10 +19850,10 @@ Emacs.")
(license license:gpl3+)))
(define-public emacs-matrix-client
(let ((commit "59c792423fd0503f1375f356bec56130e65d3b51"))
(let ((commit "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"))
(package
(name "emacs-matrix-client")
(version (git-version "0.0.0" "5" commit))
(version (git-version "0.0.0" "6" commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -19706,20 +19862,8 @@ Emacs.")
(file-name (git-file-name name version))
(sha256
(base32
"1gmpw14q9zkvviqpnmvh5vbyxk42038yilxm6b2zqw7mwxfc1xra"))))
"1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-missing-require
;; Fix a filter error at runtime due to a missing require.
;; Reported upstream:
;; <https://github.com/alphapapa/matrix-client.el/issues/76>
(lambda _
(substitute* "matrix-client-room.el"
(("\\(require 'dash-functional\\)" all)
(string-append all "\n" "(require 'anaphora)")))
#t)))))
(propagated-inputs
`(("a" ,emacs-a)
("anaphora" ,emacs-anaphora)
@ -23572,7 +23716,7 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(define-public emacs-helm-switch-to-repl
(package
(name "emacs-helm-switch-to-repl")
(version "0.1.0")
(version "0.1.1")
(home-page "https://github.com/emacs-helm/helm-switch-to-repl")
(source
(origin
@ -23582,7 +23726,7 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0n19brymwnawhi0y10m54cas3qg64pmkqq1ajvjw1rfibmw3n6nk"))))
(base32 "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2"))))
(build-system emacs-build-system)
(propagated-inputs
`(("helm" ,emacs-helm)))
@ -23597,8 +23741,8 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
;; This package has versions newer than indicated on MELPA.
;; Get the current version from `telega-version` in telega.el.
;; or by running M-x telega-version.
(let ((commit "04e53d44f5a5ccffeef40ba8c3d58f1572e5c752")
(revision "0")
(let ((commit "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9")
(revision "1")
(version "0.7.1"))
(package
(name "emacs-telega")
@ -23611,7 +23755,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(commit commit)))
(sha256
(base32
"1zrfwa7wqica93399k7myy8zxixzv8dqkqy7ky81bgxsngjxir97"))
"0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7"))
(patches (search-patches
"emacs-telega-patch-server-functions.patch"
"emacs-telega-test-env.patch"))
@ -23743,7 +23887,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(description
"Telega is a full-featured, unofficial GNU Emacs-based client for the
Telegram messaging platform.")
(home-page "https://github.com/zevlg/telega.el")
(home-page "https://zevlg.github.io/telega.el/")
(license license:gpl3+))))
(define-public emacs-doom-modeline
@ -24060,14 +24204,14 @@ interface.")
(define-public emacs-ivy-posframe
(package
(name "emacs-ivy-posframe")
(version "0.5.3")
(version "0.5.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"ivy-posframe-" version ".el"))
"ivy-posframe-" version ".tar"))
(sha256
(base32 "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6"))))
(base32 "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)
@ -24386,7 +24530,7 @@ pattern guessed from thing under current cursor position.
(define-public emacs-helm-selector
(package
(name "emacs-helm-selector")
(version "0.3")
(version "0.5")
(home-page "https://github.com/emacs-helm/helm-selector")
(source
(origin
@ -24397,7 +24541,7 @@ pattern guessed from thing under current cursor position.
(file-name (git-file-name name version))
(sha256
(base32
"134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6"))))
"1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
@ -25801,6 +25945,25 @@ work on alists, hash-table and arrays. All functions are prefixed with
@code{map-}.")
(license license:gpl3+)))
(define-public emacs-xref
(package
(name "emacs-xref")
(version "1.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"xref-" version ".el"))
(sha256
(base32 "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/xref.html")
(synopsis "Cross-referencing commands")
(description
"This library provides a generic infrastructure for cross referencing
commands, in particular @code{find-definition}.")
(license license:gpl3+)))
(define-public emacs-burly
(package
(name "emacs-burly")

View file

@ -34,12 +34,14 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module ((guix build utils) #:select (alist-replace delete-file-recursively))
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
#:use-module ((gnu packages base) #:prefix base:)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages dejagnu)
#:use-module (gnu packages flex)
@ -1420,3 +1422,101 @@ handling communication with eBUS devices connected to a 2-wire bus system
(\"energy bus\" used by numerous heating systems).")
(home-page "https://ebusd.eu/")
(license license:gpl3+)))
(define-public ucsim
(package
(name "ucsim")
(version "0.6-pre67")
(source (origin
(method url-fetch)
(uri (string-append
"http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/"
"devel/ucsim-" version ".tar.gz"))
(sha256
(base32
"0aahj9pbfjphjrm4hgs9pfmp6d5aikaq4yvxlrvhywjinnnf0qp1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-avr-port"
"--enable-m6809-port"
"--enable-p1516-port"
"--enable-st7-port")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefiles
(lambda _
(substitute* (find-files "." "(\\.mk$|\\.in$)")
(("/bin/sh") (which "sh")))
#t))
(add-after 'install 'remove-empty-directory
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively
(string-append (assoc-ref outputs "out") "/share/man"))
#t)))))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
(home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
(synopsis "Simulators for various microcontroller families")
(description "μCsim is a collection of software simulators for
microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and
6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8;
and Zilog Z80 families, plus many of their variants.")
(license license:gpl2+)))
(define-public sdcc
(package
(name "sdcc")
(version "4.0.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/sdcc/sdcc"
"/" version "/sdcc-src-" version ".tar.bz2"))
(sha256
(base32
"042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove non-free source files
(delete-file-recursively "device/non-free")
;; Remove bundled μCsim source
(delete-file-recursively "sim")
#t))
(patches (search-patches "sdcc-disable-non-free-code.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
("boost" ,boost)
("flex" ,flex)
("python-2" ,python-2)
("texinfo" ,texinfo)
("zlib" ,zlib)))
(arguments
`(;; GPUTILS is required for the PIC ports, but the licensing status of
;; some of the files contained in its distribution is unclear (see
;; https://issues.guix.gnu.org/44557). For this reason it is not yet
;; available as a package in Guix.
#:configure-flags
'("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefiles
(lambda _
(substitute* (find-files "." "(\\.mk$|\\.in$)")
(("/bin/sh") (which "sh")))
#t)))))
(home-page "http://sdcc.sourceforge.net")
(synopsis "C compiler suite for 8-bit microcontrollers")
(description "SDCC is a retargetable, optimizing Standard C compiler suite
that targets 8-bit microcontrollers in the Intel MCS-51 (8051); Motorola
68HC08; Padauk PDK13, PDK14 and PDK15; STMicroelectronics STM8; and Zilog Z80
families, plus many of their variants.")
(license (list license:gpl2+
license:gpl3+
license:lgpl2.0+
license:lgpl2.1+
license:lgpl3+
license:public-domain
license:zlib))))

View file

@ -12,6 +12,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -39,6 +40,7 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
#:use-module (gnu packages autogen)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
@ -1380,6 +1382,173 @@ just replaces the executables shipped with the games, allowing you to
play them on systems for which they were never designed!")
(license license:gpl2+)))
(define-public libticables2
(package
(name "libticables2")
(version "1.3.5")
(source (origin
(method url-fetch)
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
(sha256
(base32
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list "--enable-libusb10")
#:phases
(modify-phases %standard-phases
(replace 'unpack
(lambda* (#:key source #:allow-other-keys)
(invoke "tar" "xvkf" source)
(invoke "tar" "xvkf"
(string-append "tilibs2/libticables2-"
,version ".tar.bz2"))
(chdir (string-append "libticables2-" ,version))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("autogen" ,autogen)
("automake" ,automake)
("gettext" ,gnu-gettext)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("libusb" ,libusb)))
(synopsis "Link cable library for TI calculators")
(description
"This package contains libticables, a library for operations on
@acronym{TI, Texas Instruments} calculator link cables.
This is a part of the TiLP project.")
(home-page "http://lpg.ticalc.org/prj_tilp/")
(license license:gpl2+)))
(define-public libticonv
(package
(name "libticonv")
(version "1.1.5")
(source (origin
(method url-fetch)
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
(sha256
(base32
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
(build-system gnu-build-system)
(arguments
;; build fails with out --enable-iconv (...?)
`(#:configure-flags (list "--enable-iconv")
#:phases
(modify-phases %standard-phases
(replace 'unpack
(lambda* (#:key source #:allow-other-keys)
(invoke "tar" "xvkf" source)
(invoke "tar" "xvkf"
(string-append "tilibs2/libticonv-"
,version ".tar.bz2"))
(chdir (string-append "libticonv-" ,version))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)))
(synopsis "Character conversion library for TI calculators")
(description
"This package contains libticonv, a library to support working with
@acronym{TI, Texas Instruments} calculator charsets.
This is a part of the TiLP project.")
(home-page "http://lpg.ticalc.org/prj_tilp/")
(license license:gpl2+)))
(define-public libtifiles2
(package
(name "libtifiles2")
(version "1.1.7")
(source (origin
(method url-fetch)
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
(sha256
(base32
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'unpack
(lambda* (#:key source #:allow-other-keys)
(invoke "tar" "xvkf" source)
(invoke "tar" "xvkf"
(string-append "tilibs2/libtifiles2-"
,version ".tar.bz2"))
(chdir (string-append "libtifiles2-" ,version))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gnu-gettext)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("libarchive" ,libarchive)
("libticonv" ,libticonv)))
(synopsis "File functions library for TI calculators")
(description
"This package contains libticonv, a library to support working with
@acronym{TI, Texas Instruments} calculator files.
This is a part of the TiLP project.")
(home-page "http://lpg.ticalc.org/prj_tilp/")
(license license:gpl2+)))
(define-public libticalcs2
(package
(name "libticalcs2")
(version "1.1.9")
(source (origin
(method url-fetch)
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
(sha256
(base32
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'unpack
(lambda* (#:key source #:allow-other-keys)
(invoke "tar" "xvkf" source)
(invoke "tar" "xvkf"
(string-append "tilibs2/libticalcs2-"
,version ".tar.bz2"))
(chdir (string-append "libticalcs2-" ,version))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gnu-gettext)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("libarchive" ,libarchive)
("libticables2" ,libticables2)
("libticonv" ,libticonv)
("libtifiles2" ,libtifiles2)))
(synopsis "Support library for TI calculators")
(description
"This project aims to develop a multi-platform linking program for use
with all @acronym{TI, Texas Instruments} graphing calculators (TI73 to
V200PLT).
This is a part of the TiLP project.")
(home-page "http://lpg.ticalc.org/prj_tilp/")
(license license:gpl2+)))
(define-public mame
(package
(name "mame")

View file

@ -67,6 +67,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages dejagnu)
#:use-module (gnu packages digest)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
@ -102,6 +103,7 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#: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 qt)
@ -849,7 +851,6 @@ The viewer can be used interactively with a REPL (for example Geiser in
Emacs).")
(license license:gpl3+))))
;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master
(define-public kicad
(package
(name "kicad")
@ -899,6 +900,9 @@ Emacs).")
#t)))))
(native-search-paths
(list (search-path-specification
(variable "KICAD") ; to find kicad-doc
(files '("")))
(search-path-specification
(variable "KICAD_TEMPLATE_DIR")
(files '("share/kicad/template")))
(search-path-specification
@ -970,6 +974,46 @@ translations for KiCad.")
(define-public kicad-i18l
(deprecated-package "kicad-i18l" kicad-i18n))
(define-public kicad-doc
(package
(name "kicad-doc")
(version "5.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/kicad/services/kicad-doc.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"03kvss8a0xrjnfvkwymm0vfd7rn9ix7i926xdzz9jg9iycrjfj3g"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_FORMATS=html")
#:phases
(modify-phases %standard-phases
(delete 'build)
(add-before 'install 'set-perl-env
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PERL5LIB"
(string-append (assoc-ref inputs "perl-unicode-linebreak")
"/lib/perl5/site_perl" ":"
(getenv "PERL5LIB")))
#t))
(delete 'check))))
(native-inputs
`(("asciidoc" ,asciidoc)
("gettext" ,gettext-minimal)
("git" ,git-minimal)
("perl" ,perl)
("perl-unicode-linebreak" ,perl-unicode-linebreak)
("po4a" ,po4a)
("source-highlight" ,source-highlight)))
(home-page "https://kicad.org")
(synopsis "KiCad official documentation")
(description "This repository contains the official KiCad documentation.")
(license license:gpl3+)))
(define-public kicad-symbols
(package
(name "kicad-symbols")
@ -1077,7 +1121,7 @@ the 'showing the effect of'-style of operation.")
(define-public volk
(package
(name "volk")
(version "2.4.0")
(version "2.4.1")
(source
(origin
(method git-fetch)
@ -1087,7 +1131,7 @@ the 'showing the effect of'-style of operation.")
(recursive? #t))) ; for cpu_features git submodule
(file-name (git-file-name name version))
(sha256
(base32 "14y0988r5qi1h3yvkivx5ihccn8r15910lq30r8iy71ih190r5m9"))))
(base32 "1mkqiw0i2fbbsk46zvk8yv5swl7ifhq6y1dlfphq8dsmkvxckqby"))))
(build-system cmake-build-system)
(arguments
`(#:phases

51
gnu/packages/esolangs.scm Normal file
View file

@ -0,0 +1,51 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages esolangs)
#:use-module (gnu packages ncurses)
#:use-module (guix build-system cmake)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
(define-public cfunge
(package
(name "cfunge")
(version "0.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/VorpalBlade/cfunge")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"18ir0h10vxdb5jb57w5hjbgi8spjxg9x2148agadhhmbhsja02m7"))))
(build-system cmake-build-system)
(arguments
;; The tests are not designed to be run and evaluated automatically.
'(#:tests? #f))
(inputs
`(("ncurses" ,ncurses)))
(home-page "https://github.com/VorpalBlade/cfunge")
(synopsis "Fast conforming Befunge93/98/109 interpreter in C")
(description "@command{cfunge} is a fast conforming Befunge93/98/109 interpreter
written in C. It supports several @dfn{fingerprints} (opt-in language extensions
identified by unique ID codes).")
(license license:gpl3)))

View file

@ -38,6 +38,7 @@
#:use-module (gnu packages acl)
#:use-module (gnu packages attr)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@ -48,6 +49,7 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kerberos)
@ -328,8 +330,8 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
(let ((commit "742dbbdbb90efb786f05a8576917fcd0e9cbd57e")
(revision "1"))
(let ((commit "db931a4571817d7d61be6bce306f1d42f7cd3398")
(revision "2"))
(package
(name "bcachefs-tools")
(version (git-version "0.1" revision commit))
@ -341,7 +343,7 @@ from a mounted file system.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0kn8y3kqylz6scv47mzfmwrlh21kbb14z5vs65vks8w50i26sxnc"))))
(base32 "1zl8lda6ni6rhsmsng6smrcjihy2irjf03h1m7nvkqmkhq44j80s"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -352,7 +354,24 @@ from a mounted file system.")
"PYTEST=pytest")
#:phases
(modify-phases %standard-phases
(delete 'configure)) ; no configure script
(delete 'configure) ; no configure script
(add-after 'install 'promote-mount.bcachefs.sh
;; XXX The (optional) mount.bcachefs helper requires rust:cargo.
;; This alternative shell script does the job well enough for now.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion (string-append out "/sbin")
(rename-file "mount.bcachefs.sh" "mount.bcachefs")
;; WRAP-SCRIPT causes bogus Insufficient arguments errors.
(wrap-program "mount.bcachefs"
`("PATH" ":" prefix
,(cons (string-append out "/sbin")
(map (lambda (input)
(string-append (assoc-ref inputs input)
"/bin"))
(list "coreutils"
"gawk"
"util-linux"))))))))))
#:tests? #f)) ; XXX 6 valgrind tests fail
(native-inputs
`(("pkg-config" ,pkg-config)
@ -367,10 +386,15 @@ from a mounted file system.")
("libscrypt" ,libscrypt)
("libsodium" ,libsodium)
("liburcu" ,liburcu)
("util-linux" ,util-linux "lib") ; lib{blkid,uuid}
("util-linux:lib" ,util-linux "lib") ; lib{blkid,uuid}
("lz4" ,lz4)
("zlib" ,zlib)
("zstd:lib" ,zstd "lib")))
("zstd:lib" ,zstd "lib")
;; Only for mount.bcachefs.sh.
("coreutils" ,coreutils-minimal)
("gawk" ,gawk)
("util-linux" ,util-linux)))
(home-page "https://bcachefs.org/")
(synopsis "Tools to create and manage bcachefs file systems")
(description

View file

@ -525,7 +525,7 @@ do so.")
("python-aiohttp-socks" ,python-aiohttp-socks)
("python-aiorpcx" ,python-aiorpcx)
("python-certifi" ,python-certifi)
("python-dnspython" ,python-dnspython)
("python-dnspython" ,python-dnspython-1.16)
("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
(arguments
`(#:tests? #f ; no tests
@ -625,7 +625,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
;; the system's dynamically linked library.
(package
(name "monero")
(version "0.17.1.6")
(version "0.17.1.7")
(source
(origin
(method git-fetch)
@ -645,7 +645,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
"external/unbound"))
#t))
(sha256
(base32 "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"))))
(base32 "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
@ -735,7 +735,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
(version "0.17.1.6")
(version "0.17.1.7")
(source
(origin
(method git-fetch)
@ -744,7 +744,7 @@ the Monero command line client and daemon.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"))))
(base32 "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)

View file

@ -24,7 +24,7 @@
;;; Copyright © 2018 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
;;; Copyright © 2019, 2020 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2019 Alva <alva@skogen.is>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
@ -1034,15 +1034,15 @@ Sans Pro family.")
(define-public font-fira-code
(package
(name "font-fira-code")
(version "1.206")
(source (origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/tonsky/FiraCode/releases/"
"download/" version
"/FiraCode_" version ".zip"))
(sha256
(base32
"02r1lcp0c9135ps71v66wdvbsrcxwirrp0blqsa1xbjkkq2rwgj3"))))
(version "5.2")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/tonsky/FiraCode/releases/"
"download/" version
"/Fira_Code_v" version ".zip"))
(sha256
(base32 "1zayrb6k0gd7xdvx7yx44dpip767q0bzhqwf4j6nf8nx02z746jj"))))
(build-system font-build-system)
(home-page "https://mozilla.github.io/Fira/")
(synopsis "Monospaced font with programming ligatures")
@ -1198,7 +1198,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
(package
(name "font-iosevka")
;; When updating, also update the hash of the Iosevka variant(s) below.
(version "3.4.7")
(version "4.0.3")
(source
(origin
(method url-fetch/zipbomb)
@ -1206,7 +1206,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"/releases/download/v" version
"/ttc-iosevka-" version ".zip"))
(sha256
(base32 "178xyxz57ncigv715db0898d5arcx1l7qi73a8prb2fdlb7x2yx6"))))
(base32 "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"))))
(build-system font-build-system)
(home-page "https://be5invis.github.io/Iosevka/")
(synopsis "Coders' typeface, built from code")
@ -1229,7 +1229,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-slab-" version ".zip"))
(sha256
(base32 "1zqgly4ymmmz3ckfsc2vdxw6d62axcyl79fq3gi630c4951nfikz"))))))
(base32 "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"))))))
(define-public font-iosevka-term
(package
@ -1243,8 +1243,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttf-iosevka-term-" version ".zip"))
(sha256
(base32
"0nfwxhxgrgz3hhhrvr759263bm88zbh0zsavpnmphxwg9kykjq39"))))
(base32 "092ygzv24wbi8cjjsmq0jkxdf4cm7wqlfj7jkn0cip7nlbyskl3h"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1261,12 +1260,11 @@ programming. Iosevka is completely generated from its source code.")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka"
"/releases/download/v" version
"/ttf-iosevka-term-slab-" version ".zip"))
(uri (string-append "https://github.com/be5invis/Iosevka/"
"releases/download/v" version "/"
"ttf-iosevka-term-slab-" version ".zip"))
(sha256
(base32
"01ynnwlfq3294p8v0656xw6wcfmqklf0yqwkqh3sh2wmj7rrs7wi"))))
(base32 "157kdxrxz981ympd2iww66v50vm2cxd7z98vvb36rii94hf30k7x"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1287,7 +1285,35 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-aile-" version ".zip"))
(sha256
(base32 "0h4wzjyw3h5zbxzfb71z7aj5xwp8r1hd93qim6zicxfk9dgczgw5"))))))
(base32 "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"))))))
(define-public font-iosevka-curly
(package
(inherit font-iosevka)
(name "font-iosevka-curly")
(version (package-version font-iosevka))
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka/"
"releases/download/v" version "/"
"ttc-iosevka-curly-" version ".zip"))
(sha256
(base32 "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"))))))
(define-public font-iosevka-curly-slab
(package
(inherit font-iosevka)
(name "font-iosevka-curly-slab")
(version (package-version font-iosevka))
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://github.com/be5invis/Iosevka/"
"releases/download/v" version "/"
"ttc-iosevka-curly-slab-" version ".zip"))
(sha256
(base32 "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"))))))
(define-public font-iosevka-etoile
(package
@ -1301,7 +1327,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-etoile-" version ".zip"))
(sha256
(base32 "1n1jy7g0q0kd4ihsyka1v02s7xgpg80rf9sml1yhxkqw5pq62972"))))))
(base32 "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"))))))
(define-public font-iosevka-sparkle
(package
@ -1315,7 +1341,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-sparkle-" version ".zip"))
(sha256
(base32 "0chl6x3xy6alq64sax71psvpq6f6fgw6pbn04f5j5skgrbqkk292"))))))
(base32 "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"))))))
(define-public font-sarasa-gothic
(package

View file

@ -26,18 +26,24 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tcl)
#:use-module (gnu packages readline)
#:use-module (gnu packages python)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
#:use-module (gnu packages perl)
#:use-module (gnu packages ghostscript)
@ -374,3 +380,61 @@ simulator trace files (@dfn{FST}).")
(home-page "http://gtkwave.sourceforge.net/")
;; Exception against free government use in tcl_np.c and tcl_np.h.
(license (list license:gpl2+ license:expat license:tcl/tk))))
(define-public python-myhdl
(package
(name "python-myhdl")
(version "0.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri "myhdl" version))
(sha256
(base32
"04fi59cyn5dsci0ai7djg74ybkqfcjzhj1jfmac2xanbcrw9j3yk"))))
(build-system python-build-system)
(home-page "http://www.myhdl.org/")
(synopsis "Python as a Hardware Description Language")
(description "This package provides a library to turn Python into
a hardware description and verification language. ")
(license license:lgpl2.1+)))
(define-public nvc
(package
(name "nvc")
(version "1.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nickg/nvc.git")
(commit (string-append "r" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0dd1xany6qhh2qsfw8ba0ky7y86h19yr4hlk0r5i2bvwsg4355v9"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-build? #f ; https://github.com/nickg/nvc/issues/409
#:configure-flags
'("--enable-vhpi")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'clean-up
(lambda _
(delete-file "autogen.sh")
#t)))))
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf)
("flex" ,flex)
("gettext" ,gnu-gettext)
("libtool" ,libtool)
("pkg-config" ,pkg-config)
("which" ,which)
("check" ,check))) ; for the tests
(inputs
`(("llvm" ,llvm-9)))
(synopsis "VHDL compiler and simulator")
(description "This package provides a VHDL compiler and simulator.")
(home-page "https://github.com/nickg/nvc")
(license license:gpl3+)))

View file

@ -793,7 +793,7 @@ high a score as possible.")
(define-public cataclysm-dda
(package
(name "cataclysm-dda")
(version "0.E-2")
(version "0.E-3")
(source
(origin
(method git-fetch)
@ -801,7 +801,7 @@ high a score as possible.")
(url "https://github.com/CleverRaven/Cataclysm-DDA")
(commit version)))
(sha256
(base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"))
(base32 "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -1218,7 +1218,7 @@ effects and music to make a completely free game.")
("sdl-image" ,sdl-image)
("sdl-mixer" ,sdl-mixer)
("zlib" ,zlib)))
(home-page "http://www.freedroid.org/")
(home-page "https://www.freedroid.org/")
(synopsis "Isometric role-playing game against killer robots")
(description
"Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics.

View file

@ -1330,7 +1330,7 @@ to the OSM opening hours specification.")
(define-public josm
(package
(name "josm")
(version "17084")
(version "17329")
(source (origin
(method svn-fetch)
(uri (svn-reference
@ -1339,7 +1339,7 @@ to the OSM opening hours specification.")
(recursive? #f)))
(sha256
(base32
"0pl1v0lj6lslnaxlr5isivg97xgnydsp0f491idvf93fi2g5grn5"))
"0bq6mirdsi0kmhjfzfp3innxi5a4395d7mas7ikxaz0cziljrz1i"))
(file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils)))
(snippet

View file

@ -190,7 +190,7 @@ of a larger interface.")
(propagated-inputs
;; Propagated to satisfy babl.pc.
`(("lcms" ,lcms)))
(home-page "http://gegl.org/babl/")
(home-page "https://gegl.org/babl/")
(synopsis "Image pixel format conversion library")
(description
"Babl is a dynamic, any-to-any pixel format translation library.

View file

@ -227,6 +227,17 @@ shared NFS home directories.")
(("gio-launch-desktop")
(string-append out "/libexec/gio-launch-desktop")))
#t)))
;; TODO: Remove the conditional in the next core-updates cycle.
;; Needed to build glib on slower ARM nodes.
,@(if (string-prefix? "arm" (%current-system))
`((add-after 'unpack 'increase-test-timeout
(lambda _
(substitute* "meson.build"
(("test_timeout = 60")
"test_timeout = 90")
(("test_timeout_slow = 120")
"test_timeout_slow = 180")))))
'())
(add-before 'build 'pre-build
(lambda* (#:key inputs outputs #:allow-other-keys)
;; For tests/gdatetime.c.
@ -444,7 +455,9 @@ dynamic loading, and an object system.")
("python" ,python-wrapper)
("zlib" ,zlib)))
(propagated-inputs
`(("libffi" ,libffi)))
`(;; In practice, GIR users will need libffi when using
;; gobject-introspection.
("libffi" ,libffi)))
(native-search-paths
(list
(search-path-specification

View file

@ -6474,7 +6474,7 @@ USB transfers with your high-level application or system daemon.")
(define-public simple-scan
(package
(name "simple-scan")
(version "3.38.1")
(version "3.38.2")
(source
(origin
(method url-fetch)
@ -6482,7 +6482,7 @@ USB transfers with your high-level application or system daemon.")
(version-major+minor version) "/"
"simple-scan-" version ".tar.xz"))
(sha256
(base32 "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy"))))
(base32 "02sdkhxgr6i7iy481h4xavgaqd0a5dlsipzwrm4qd242jrr813d8"))))
(build-system meson-build-system)
;; TODO: Fix icons in home screen, About dialogue, and scan menu.
(arguments
@ -6802,6 +6802,7 @@ freedesktop.org help system specification.")
(inputs
`(("yelp-xsl" ,yelp-xsl)))
(propagated-inputs
;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'.
`(("itstool" ,itstool)
("xmllint" ,libxml2)
("xsltproc" ,libxslt)))
@ -11892,6 +11893,9 @@ libraries. Applications do not need to be recompiled--or even restarted.")
"-Dplugin_clang=false"
"-Dplugin_flatpak=false"
"-Dplugin_glade=false"
;; XXX: This one has been shown not to work in
;; <https://issues.guix.gnu.org/45272>
"-Dplugin_jedi=false"
;; ... except this one.
"-Dplugin_update_manager=false")
#:phases
@ -11952,7 +11956,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(define-public komikku
(package
(name "komikku")
(version "0.23.0")
(version "0.24.0")
(source
(origin
(method git-fetch)
@ -11962,7 +11966,7 @@ integrated profiler via Sysprof, debugging support, and more.")
(file-name (git-file-name name version))
(sha256
(base32
"1xh3qmf2pk80qxj528lajjcwg7mps72s1zz8cj388av58p8l3hyw"))))
"010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11994,7 +11998,6 @@ integrated profiler via Sysprof, debugging support, and more.")
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-cloudscraper" ,python-cloudscraper)
("python-dateparser" ,python-dateparser)
("python-keyring" ,python-keyring)
("python-lxml" ,python-lxml)
@ -12003,6 +12006,7 @@ integrated profiler via Sysprof, debugging support, and more.")
("python-pure-protobuf" ,python-pure-protobuf)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
("python-requests" ,python-requests)
("python-unidecode" ,python-unidecode)))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)

View file

@ -14,6 +14,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -413,6 +414,149 @@ in C/C++.")
("pkg-config" ,pkg-config)
("python" ,python-2)))))
(define-public mozjs-78
(package
(inherit mozjs-60)
(version "78.5.0")
(source (origin
(method url-fetch)
;; TODO: Switch to IceCat source once available on ftp.gnu.org.
(uri (string-append "https://archive.mozilla.org/pub/firefox"
"/releases/" version "esr/source/firefox-"
version "esr.source.tar.xz"))
(sha256
(base32
"1442yjmwz69hkfcvh8kkb60jf4c9ms0pac04nc3xw2da13v4zxai"))))
(arguments
`(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
#:modules ((guix build cargo-utils)
,@%gnu-build-system-modules)
#:test-target "check-jstests"
#:configure-flags
'(;; Disable debugging symbols to save space.
"--disable-debug"
"--disable-debug-symbols"
;; This is important because without it gjs will segfault during the
;; configure phase. With jemalloc only the standalone mozjs console
;; will work.
"--disable-jemalloc"
"--enable-tests"
"--enable-hardening"
"--enable-optimize"
"--enable-release"
"--enable-rust-simd"
"--enable-readline"
"--enable-shared-js"
"--with-system-icu"
"--with-system-nspr"
"--with-system-zlib"
"--with-intl-api")
#:phases
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-cargo-checksums
(lambda _
(let ((null-hash
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
(for-each (lambda (file)
(format #t "patching checksums in ~a~%" file)
(substitute* file
(("^checksum = \".*\"")
(string-append "checksum = \"" null-hash "\""))))
(find-files "." "Cargo\\.lock$"))
(for-each generate-all-checksums
'("js" "third_party/rust"))
#t)))
(replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
;; The configure script does not accept environment variables as
;; arguments. It also must be run from a different directory,
;; but not the root directory either.
(let ((out (assoc-ref outputs "out")))
(mkdir "run-configure-from-here")
(chdir "run-configure-from-here")
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
(setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf")
"/bin/autoconf"))
(apply invoke "../js/src/configure"
(cons (string-append "--prefix=" out)
configure-flags))
#t)))
(add-after 'unpack 'adjust-for-icu-68
(lambda _
(with-directory-excursion "js/src/tests"
;; The test suite expects a lightly patched ICU 67. Since
;; Guix is about to switch to ICU 68, massage the tests to
;; work with that instead of patching ICU. Try removing this
;; phase for newer versions of mozjs.
;; These tests look up locale names and expects to get
;; "GB" instead of "UK".
(substitute* "non262/Intl/DisplayNames/language.js"
(("Traditionell, GB")
"Traditionell, UK"))
(substitute* "non262/Intl/DisplayNames/region.js"
(("\"GB\": \"GB\"")
"\"GB\": \"UK\""))
;; XXX: Some localized time formats have changed, and
;; substitution fails for accented characters, even though
;; it works in the REPL(?). Just delete these for now.
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
;; Similarly, these get an unexpected "A" suffix when looking
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
;; tricky to substitute.
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
(delete-file "non262/Intl/DateTimeFormat/format.js")
;; This file compares a generated list of ICU locale names
;; with actual lookups. Some have changed slightly, i.e.
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))
#t))
(add-before 'check 'pre-check
(lambda _
(with-directory-excursion "../js/src/tests"
(substitute* "shell/os.js"
;; FIXME: Why does the killed process have an exit status?
((".*killed process should not have exitStatus.*")
""))
;; XXX: Delete all tests that test time zone functionality,
;; because the test suite uses /etc/localtime to figure out
;; the offset from the hardware clock, which does not work
;; in the build container. See <tests/non262/Date/shell.js>.
(delete-file-recursively "non262/Date")
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
(setenv "JSTESTS_EXTRA_ARGS"
(string-join
(list
;; Do not run tests marked as "random".
"--exclude-random"
;; Exclude web platform tests.
"--wpt=disabled"
;; Respect the daemons configured number of jobs.
(string-append "--worker-count="
(number->string (parallel-job-count)))))))
#t)))))
(native-inputs
`(("autoconf" ,autoconf-2.13)
("automake" ,automake)
("llvm" ,llvm) ;for llvm-objdump
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-3)
("rust" ,rust)
("cargo" ,rust "cargo")))
(inputs
`(("icu4c" ,icu4c-68)
("readline" ,readline)
("zlib" ,zlib)))))
(define mozilla-compare-locales
(origin
(method hg-fetch)
@ -550,8 +694,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
(define %icecat-version "78.5.0-guix0-preview1")
(define %icecat-build-id "20201117000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "78.6.0-guix0-preview1")
(define %icecat-build-id "20201215000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -573,11 +717,11 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"1442yjmwz69hkfcvh8kkb60jf4c9ms0pac04nc3xw2da13v4zxai"))))
"0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay"))))
(upstream-icecat-base-version "78.5.0") ; maybe older than base-version
(upstream-icecat-base-version "78.6.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "bcfe407570cae32d00dd33a268de0e0593166f7b")
(gnuzilla-commit "a43514623e93d4f3fe6d61f5b2f82c5ef29bf518")
(gnuzilla-source
(origin
(method git-fetch)
@ -589,7 +733,7 @@ from forcing GEXP-PROMISE."
(string-take gnuzilla-commit 8)))
(sha256
(base32
"1pg8fjjg91qyrv7za585ds1xrdvmybbkf2jmkff107fh5y23lxrg"))))
"0d2hpk4x0hwflhilc3hyj6nl4pv2m53fcv3jc415ca01bigk6drp"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -1161,11 +1305,11 @@ standards of the IceCat project.")
(cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat!
(define %icedove-build-id "20201202000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-build-id "20201215000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove
(package
(name "icedove")
(version "78.5.1")
(version "78.6.0")
(source icecat-source)
(properties
`((cpe-name . "thunderbird_esr")))
@ -1445,7 +1589,7 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository.
,(let ((changeset "7bfb6e5797a4120c798eaa67a9cddd2846badcee"))
,(let ((changeset "18be92a3f0388fe1b69941a50cdbadbf2c95b885"))
(origin
(method hg-fetch)
(uri (hg-reference
@ -1454,7 +1598,7 @@ standards of the IceCat project.")
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
"0s0c96137brg25dysym579kv4vq65z8czb4mcssqvwkg316g2dqp")))))
"1w21g19l93bcna20260cgxjsh17pznd3kdfvyrn23wjkslgpbyi3")))))
("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.41 "cargo")
("clang" ,clang)

View file

@ -1240,30 +1240,28 @@ sockets.")
(license license:expat))))
(define-public go-github-com-emicklei-go-restful
(let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22")
(revision "0"))
(package
(name "go-github-com-emicklei-go-restful")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emicklei/go-restful")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0rrlfcfq80fkxifpih6bq31vavb5mf4530xz51pp9pq1mn2fzjfh"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/emicklei/go-restful"))
(home-page "https://github.com/emicklei/go-restful")
(synopsis "Build REST-style web services using Go")
(description "This package provides @code{go-restful}, which helps
(package
(name "go-github-com-emicklei-go-restful")
(version "3.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emicklei/go-restful")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/emicklei/go-restful"))
(home-page "https://github.com/emicklei/go-restful")
(synopsis "Build REST-style web services using Go")
(description "This package provides @code{go-restful}, which helps
developers to use @code{http} methods explicitly and in a way that's consistent
with the HTTP protocol definition.")
(license license:expat))))
(license license:expat)))
(define-public go-github-com-google-cadvisor
(let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd")
@ -1708,7 +1706,7 @@ application's http.Handlers.")
(define-public go-github-com-magiconair-properties
(package
(name "go-github-com-magiconair-properties")
(version "1.8.1")
(version "1.8.4")
(source
(origin
(method git-fetch)
@ -1718,7 +1716,7 @@ application's http.Handlers.")
(file-name (git-file-name name version))
(sha256
(base32
"19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb"))))
"0q7d55z0v8y55dyy8nhgdnswf5zkgj3i87irbk294nvzhx01bnxd"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/magiconair/properties"))
@ -3519,7 +3517,7 @@ format in Go.")
(define-public go-github-com-kr-pretty
(package
(name "go-github-com-kr-pretty")
(version "0.2.0")
(version "0.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3528,13 +3526,13 @@ format in Go.")
(file-name (git-file-name name version))
(sha256
(base32
"1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"))))
"0vzfz06y9q8gs2nxx0kys0591vzp78k0fvpb8digi5n15h3b25hy"))))
(build-system go-build-system)
(propagated-inputs
`(("go-github-com-kr-text" ,go-github-com-kr-text)))
(arguments
'(#:import-path "github.com/kr/pretty"))
(synopsis "A pretty printer for Go values")
(synopsis "Pretty printer for Go values")
(description "This package provides a pretty printer for Go values.")
(home-page "https://github.com/kr/pretty")
(license license:expat)))

View file

@ -114,6 +114,22 @@ C/C++ part.")
(base32
"1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"))))))
(define-public icu4c-68
(package
(inherit icu4c)
(version "68.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/unicode-org/icu/releases/download/release-"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
(sha256
(base32
"0bcznbxvdvxbfsiv3qj2f2f1rrbf3syhhhwbhx9qwjs3nkcf7wm9"))))))
(define-public icu4c-build-root
(package
(inherit icu4c)

View file

@ -8288,7 +8288,7 @@ actual rendering.")
(copy-recursively "runtime/Java/src/main/dot"
"build/classes")
#t)))))
(home-page "https://antlr.org")
(home-page "https://www.antlr.org")
(synopsis "ANTLR runtime library")
(description "This package contains the runtime library used with generated
sources by ANTLR.")

View file

@ -327,63 +327,6 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
;; text.
(license license:lgpl3+)))
(define-public breeze-assets
(package
(inherit breeze-icons)
(name "breeze-assets")
(version "5.19.5")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kde/stable/plasma/" version
"/breeze-" version ".tar.xz"))
(sha256
(base32
"0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1"))))
(inputs
`(,@(package-inputs breeze-icons)
("ki18n" ,ki18n)
("kpackage" ,kpackage)
("kguiaddons" ,kguiaddons)
("kdecoration" ,kdecoration)
("kcoreaddons" ,kcoreaddons)
("kiconthemes" ,kiconthemes)
("kwindowsystem" ,kwindowsystem)
("kconfigwidgets" ,kconfigwidgets)
("qtx11extras" ,qtx11extras)))
(home-page "https://github.com/KDE/breeze")
(synopsis "Artwork, styles and assets for the Breeze visual style")
(description "This package contains artwork, styles and assets associated
with the Breeze visual style.")
(license license:gpl2+)))
(define-public breeze
(package
(name "breeze")
(version (package-version breeze-assets))
(source #f)
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build union))
#:builder
(begin
(use-modules (ice-9 match)
(guix build union))
(match %build-inputs
(((names . directories) ...)
(union-build (assoc-ref %outputs "out")
directories)
#t)))))
(inputs
`(("breeze-icons" ,breeze-icons)
("breeze-assets" ,breeze-assets)))
(home-page "https://github.com/KDE/breeze-icons")
(synopsis "Full KDE Breeze theme")
(description
"This package contains the full Breeze visual style for KDE:
assets and icons.")
(license (list license:gpl2 license:gpl3+))))
(define-public kapidox
(package
(name "kapidox")
@ -1529,7 +1472,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
(sha256
(base32
"1whsp0f87lrcn61s9rfhy0aj68hm6zgfa38mq6frlkcjksi0z1vn"))))
(build-system cmake-build-system)
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs

View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@ -35,6 +35,53 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages xorg))
(define-public breeze
(package
(name "breeze")
(version "5.19.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1"))))
(build-system qt-build-system)
;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake:
;; warnings during generation of metainfo for org.kde.breezedark.desktop:
;; Package type "Plasma/LookAndFeel" not found
;; TODO: Check whether is makes sence splitting into several outputs, like
;; Debian does:
;; - breeze-cursor-theme
;; - "out", "devel"
;; - kde-style-breeze - Widget style
;; - kde-style-breeze-qt4 - propably not useful
;; - kwin-style-breeze
;; - qml-module-qtquick-controls-styles-breeze - QtQuick style
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("kcmutils" ,kcmutils) ; optional
("kconfigwidgets" ,kconfigwidgets)
("kcoreaddons" ,kcoreaddons)
("kde-frameworkintegration" ,kde-frameworkintegration) ; optional
("kdecoration" ,kdecoration)
("kguiaddons" ,kguiaddons)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes) ; for optional kde-frameworkintegration
("kpackage" ,kpackage)
("kwayland" ,kwayland) ; optional
("kwindowsystem" ,kwindowsystem)
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative) ; optional
("qtx11extras" ,qtx11extras)))
(home-page "https://invent.kde.org/plasma/breeze")
(synopsis "Default KDE Plasma theme")
(description "Artwork, styles and assets for the Breeze visual style for
the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.")
(license license:gpl2+)))
(define-public kdecoration
(package
(name "kdecoration")

View file

@ -47,8 +47,11 @@
#:use-module (gnu packages cpp)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages djvu)
#:use-module (gnu packages documentation)
#:use-module (gnu packages ebook)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
@ -60,6 +63,7 @@
#:use-module (gnu packages kde-plasma)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages markup)
#:use-module (gnu packages maths)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
@ -181,7 +185,8 @@ This package contains GUI widgets for baloo.")
("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2)
("kiconthemes" ,kiconthemes)
("breeze" ,breeze)
("breeze" ,breeze) ; make dark them available easily
("breeze-icons" ,breeze-icons) ; recommended icon set
("purpose" ,purpose)
("qtwebkit" ,qtwebkit)
("qtgraphicaleffects" ,qtgraphicaleffects)
@ -196,12 +201,14 @@ This package contains GUI widgets for baloo.")
(qtbase (assoc-ref inputs "qtbase"))
(frei0r (assoc-ref inputs "frei0r-plugins"))
(ffmpeg (assoc-ref inputs "ffmpeg"))
(breeze (assoc-ref inputs "breeze")))
(breeze (assoc-ref inputs "breeze"))
(breeze-icons (assoc-ref inputs "breeze-icons")))
(wrap-program (string-append out "/bin/kdenlive")
`("PATH" ":" prefix
,(list (string-append ffmpeg "/bin")))
`("XDG_DATA_DIRS" ":" prefix
,(list (string-append breeze "/share")))
,(list (string-append breeze "/share")
(string-append breeze-icons "/share")))
`("QT_PLUGIN_PATH" ":" prefix
,(list (getenv "QT_PLUGIN_PATH")))
`("FREI0R_PATH" ":" =
@ -766,6 +773,73 @@ Python, PHP, and Perl.")
(description "Runtime library for kdegames")
(license (list license:gpl2+ license:fdl1.2+))))
(define-public okular
(package
(name "okular")
(version "20.12.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/" name "-" version ".tar.xz"))
(sha256
(base32 "1kib8zqfd9qgqn7bz88hay2j3kcvarnlfyr3a417pi6rvaam6b4p"))))
(build-system qt-build-system)
;; The tests fail because they can't find the proper mimetype plugins:
;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'."
;; The built program seems to work okay, so we skip the tests for now.
(arguments
`(#:tests? #f
#:configure-flags
(list "-DBUILD_TESTING=OFF")))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)
("pkg-config" ,pkg-config)))
(inputs
`(("ebook-tools" ,ebook-tools)
("breeze-icons" ,breeze-icons)
("discount" ,discount)
("djvulibre" ,djvulibre)
("kactivities" ,kactivities)
("khtml" ,khtml)
("chmlib" ,chmlib)
("kdegraphics-mobipocket" ,kdegraphics-mobipocket)
("karchive" ,karchive)
("kbookmarks" ,kbookmarks)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
("qtbase" ,qtbase)
("libjpeg-turbo" ,libjpeg-turbo)
("libtiff" ,libtiff)
("kirigami" ,kirigami)
("purpose" ,purpose)
("freetype" ,freetype)
("kiconthemes" ,kiconthemes)
("kio" ,kio)
("kparts" ,kparts)
("kpty" ,kpty)
("qtspeech" ,qtspeech)
("kwallet" ,kwallet)
("kwindowsystem" ,kwindowsystem)
("libkexiv2" ,libkexiv2)
("libspectre" ,libspectre)
("libzip" ,libzip)
("phonon" ,phonon)
("poppler-qt5" ,poppler-qt5)
("qca" ,qca)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("threadweaver" ,threadweaver)
("kcrash" ,kcrash)
("kjs" ,kjs)))
(home-page "https://kde.org/applications/graphics/okular/")
(synopsis "Document viewer")
(description
"Okular is a document viewer developed for KDE. It can display files in
a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
(license license:gpl2+)))
(define-public kdegraphics-mobipocket
(package
(name "kdegraphics-mobipocket")

View file

@ -7,6 +7,7 @@
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 John Doe <dftxbs3e@free.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -57,7 +58,7 @@
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")
;; TODO: Inline patch on next rebuild cycle.
;; TODO: Inline patches on next rebuild cycle.
,@(if (string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
'(#:phases (modify-phases %standard-phases
@ -67,13 +68,28 @@
"powerpc-patch")))
(invoke "patch" "--batch" "-p1"
"-i" patch))))))
'())
,@(if (string-prefix? "powerpc64le-" (or (%current-target-system)
(%current-system)))
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'apply-patch2
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"powerpc64le-patch")))
(invoke "patch" "--batch" "-p1"
"-i" patch))))))
'())))
(inputs
(if (string-prefix? "powerpc-" (or (%current-target-system)
(cond
((string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
`(("powerpc-patch" ,@(search-patches
"libffi-3.3-powerpc-fixes.patch")))
'()))
`(("powerpc-patch" ,@(search-patches
"libffi-3.3-powerpc-fixes.patch"))))
((string-prefix? "powerpc64le-" (or (%current-target-system)
(%current-system)))
`(("powerpc64le-patch" ,@(search-patches
"libffi-float128-powerpc64le.patch"))))
(else '())))
(outputs '("out" "debug"))
(synopsis "Foreign function call interface library")
(description

View file

@ -349,18 +349,30 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
"linux-" version ".tar.xz"))
(sha256 hash)))
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-5.10-version "5.10.1")
(define deblob-scripts-5.10
(linux-libre-deblob-scripts
linux-libre-5.10-version
(base32 "0i99adbfjnir8p8ihhac58dv8p7mnqg4z2jpgvhj35lksdskngf7")
(base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7")))
(define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version)
(hash (base32 "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
;; The current "stable" kernel. That is, the most recently released major
;; version.
(define-public linux-libre-5.9-version "5.9.14")
(define-public linux-libre-5.9-version "5.9.15")
(define deblob-scripts-5.9
(linux-libre-deblob-scripts
linux-libre-5.9-version
(base32 "1l0iw2lp6alk0a8nvdafklyks83iiyw4b2r5xif84z47qfbydsis")
(base32 "0yb04a4j2wq3mwvks3cj7kcm2pscmfs29lrz3falkxpbvjxbbgq2")))
(base32 "1vrv78xwcy32b82plkkbpyfxhpy3br7b18sjah4iqv25fxfcxpak")))
(define-public linux-libre-5.9-pristine-source
(let ((version linux-libre-5.9-version)
(hash (base32 "0jbb3rzbkh0l75zq9bnc60w55ryvrvcg7vw85fsbcwfzvi0zpz1r")))
(hash (base32 "1vhaayqjv1ha3nsxy9zbsz497ba4d4a1g0gfhgxcvci8dp8djh2p")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.9)))
@ -368,15 +380,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.83")
(define-public linux-libre-5.4-version "5.4.84")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
(base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25")
(base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg")))
(base32 "0q3gwf3b404brjld7aj9krzv0wdpzvs8fgy088ag7q106cwgqg8i")
(base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "1ik14pfgynkn1sjhgyhgmxjvviq0mgvk0ygj76w8mplkpc5rgv5y")))
(hash (base32 "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
@ -461,6 +473,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(patches (append (origin-patches source)
patches))))
(define-public linux-libre-5.10-source
(source-with-patches linux-libre-5.10-pristine-source
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch)))
(define-public linux-libre-5.9-source
(source-with-patches linux-libre-5.9-pristine-source
(list %boot-logo-patch
@ -565,6 +582,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(description "Headers of the Linux-Libre kernel.")
(license license:gpl2)))
(define-public linux-libre-headers-5.10
(make-linux-libre-headers* linux-libre-5.10-version
linux-libre-5.10-source))
(define-public linux-libre-headers-5.9
(make-linux-libre-headers* linux-libre-5.9-version
linux-libre-5.9-source))
@ -856,17 +877,23 @@ It has been modified to remove all non-free binary blobs.")
;;; Generic kernel packages.
;;;
(define-public linux-libre-5.10
(make-linux-libre* linux-libre-5.10-version
linux-libre-5.10-source
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux")
#:configuration-file kernel-config))
(define-public linux-libre-version linux-libre-5.10-version)
(define-public linux-libre-pristine-source linux-libre-5.10-pristine-source)
(define-public linux-libre-source linux-libre-5.10-source)
(define-public linux-libre linux-libre-5.10)
(define-public linux-libre-5.9
(make-linux-libre* linux-libre-5.9-version
linux-libre-5.9-source
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux")
#:configuration-file kernel-config))
(define-public linux-libre-version linux-libre-5.9-version)
(define-public linux-libre-pristine-source linux-libre-5.9-pristine-source)
(define-public linux-libre-source linux-libre-5.9-source)
(define-public linux-libre linux-libre-5.9)
(define-public linux-libre-5.4
(make-linux-libre* linux-libre-5.4-version
linux-libre-5.4-source
@ -1023,8 +1050,8 @@ It has been modified to remove all non-free binary blobs.")
(define-public linux-libre-with-bpf
(let ((base-linux-libre
(make-linux-libre*
linux-libre-5.9-version
linux-libre-5.9-source
linux-libre-5.10-version
linux-libre-5.10-source
'("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux" "riscv64-linux")
#:extra-version "bpf"
@ -2040,7 +2067,7 @@ trace of all the system calls made by a another process/program.")
(base32
"00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"))))
(build-system gnu-build-system)
(inputs `(("libelf" ,libelf)))
(inputs `(("libelf" ,elfutils)))
(arguments
;; Compilation uses -Werror by default, but it fails.
'(#:configure-flags '("--disable-werror")))
@ -2304,6 +2331,8 @@ that the Ethernet protocol is much simpler than the IP protocol.")
#:tests? #f
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list "DESTDIR="
(string-append "CC=" ,(cc-for-target))
"HOSTCC=gcc"
(string-append "BASH_COMPDIR=" out
"/etc/bash_completion.d")
(string-append "LIBDIR=" out "/lib")
@ -2319,7 +2348,16 @@ that the Ethernet protocol is much simpler than the IP protocol.")
;; Don't attempt to create /var/lib/arpd.
(substitute* "Makefile"
(("^.*ARPDDIR.*$") ""))
#t)))))
#t))
(add-after 'unpack 'patch-configure
(lambda _
(let ((target ,(%current-target-system)))
(substitute* "configure"
(("pkg-config")
(if target
(string-append target "-pkg-config")
"pkg-config")))
#t))))))
(inputs
`(("db4" ,bdb)
("iptables" ,iptables)
@ -5872,7 +5910,7 @@ developers.")
(define-public radeontop
(package
(name "radeontop")
(version "1.2")
(version "1.3")
(source
(origin
(method git-fetch)
@ -5881,7 +5919,7 @@ developers.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw"))))
(base32 "0ay6vl9zsz9b2scy0fnsy482pzizj52i27syxwny4z4i9wrk2wmn"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -7353,14 +7391,14 @@ to ring buffers shared with a consumer daemon.")
(define-public kexec-tools
(package
(name "kexec-tools")
(version "2.0.20")
(version "2.0.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/kernel"
"/kexec/kexec-tools-" version ".tar.xz"))
(sha256
(base32
"1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s"))))
"00l7iqp337cr846b6w4lc5vl893v4zwjrxz0jsnkh5l9xqni84z1"))))
(build-system gnu-build-system)
(arguments
;; There are no automated tests.

View file

@ -110,6 +110,45 @@ portable between implementations.")
(define-public ecl-alexandria
(sbcl-package->ecl-package sbcl-alexandria))
(define-public sbcl-asdf-finalizers
(let ((commit "7f537f6c598b662ae987c6acc268dd27c25977e0")
(revision "1"))
(package
(name "sbcl-asdf-finalizers")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("fare-utils" ,sbcl-fare-utils)
("hu.dwim.stefil" ,sbcl-hu.dwim.stefil)))
(arguments
`(#:asd-files '("asdf-finalizers.asd"
"list-of.asd"
"asdf-finalizers-test.asd")
#:asd-systems '("asdf-finalizers"
"list-of")))
(home-page "https://gitlab.common-lisp.net/asdf/asdf-finalizers")
(synopsis "Enforced calling of finalizers for Lisp code")
(description "This library allows you to implement and enforce proper
finalization of compile-time constructs while building Lisp source files.
It produces two systems: asdf-finalizers and list-of.")
(license license:expat))))
(define-public ecl-asdf-finalizers
(sbcl-package->ecl-package sbcl-asdf-finalizers))
(define-public cl-asdf-finalizers
(sbcl-package->cl-source-package sbcl-asdf-finalizers))
(define-public sbcl-net.didierverna.asdf-flv
(package
(name "sbcl-net.didierverna.asdf-flv")
@ -144,6 +183,35 @@ In order to make one or several variables file-local, use the macros
(define-public ecl-net.didierverna.asdf-flv
(sbcl-package->ecl-package sbcl-net.didierverna.asdf-flv))
(define-public sbcl-command-line-arguments
(let ((commit "fbac862fb01c0e368141204f3f639920462c23fe")
(revision "1"))
(package
(name "sbcl-command-line-arguments")
(version (git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fare/command-line-arguments")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "054m1ikndzqf72mb9ajaa64136cwr3bgag4yfbi1574a9vq75mjq"))))
(build-system asdf-build-system/sbcl)
(home-page "https://github.com/fare/command-line-arguments")
(synopsis "Trivial command-line argument parsing library for Common Lisp")
(description "This is a library to abstract away the parsing of
Unix-style command-line arguments. Use it in conjunction with asdf:program-op
or cl-launch for portable processing of command-line arguments.")
(license license:expat))))
(define-public ecl-command-line-arguments
(sbcl-package->ecl-package sbcl-command-line-arguments))
(define-public cl-command-line-arguments
(sbcl-package->cl-source-package sbcl-command-line-arguments))
(define-public sbcl-fiveam
(package
(name "sbcl-fiveam")
@ -1576,26 +1644,29 @@ Common Lisp.")
(sbcl-package->ecl-package sbcl-rt))
(define-public sbcl-nibbles
(package
(name "sbcl-nibbles")
(version "0.14")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sharplispers/nibbles/")
(commit (string-append "v" version))))
(sha256
(base32
"1v7qfgpvdr6nz7v63dj69d26dis0kff3rd8xamr1llfdvza2pm8f"))
(file-name (git-file-name "nibbles" version))))
(build-system asdf-build-system/sbcl)
(native-inputs
;; Tests only.
`(("rt" ,sbcl-rt)))
(synopsis "Common Lisp library for accessing octet-addressed blocks of data")
(description
"When dealing with network protocols and file formats, it's common to
;; No tagged release since 2018.
(let ((commit "8e6b9b42d9f69000f55e5c45ad974d9e376ffdbd")
(revision "1"))
(package
(name "sbcl-nibbles")
(version (git-version "0.14" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sharplispers/nibbles/")
(commit commit)))
(sha256
(base32 "15qlsm82h36pjgvfnbzdg60l21qxbaii4d049jc5y0dn56y93amb"))
(file-name (git-file-name "nibbles" version))))
(build-system asdf-build-system/sbcl)
(native-inputs
;; Tests only.
`(("rt" ,sbcl-rt)))
(synopsis
"Common Lisp library for accessing octet-addressed blocks of data")
(description
"When dealing with network protocols and file formats, it's common to
have to read or write 16-, 32-, or 64-bit datatypes in signed or unsigned
flavors. Common Lisp sort of supports this by specifying :element-type for
streams, but that facility is underspecified and there's nothing similar for
@ -1609,8 +1680,8 @@ SETFable. Since it's sometimes desirable to read/write directly from streams,
functions for doing so are also provided. On some implementations,
reading/writing IEEE singles/doubles (i.e. single-float and double-float) will
also be supported.")
(home-page "https://github.com/sharplispers/nibbles")
(license license:bsd-3)))
(home-page "https://github.com/sharplispers/nibbles")
(license license:bsd-3))))
(define-public cl-nibbles
(sbcl-package->cl-source-package sbcl-nibbles))
@ -1621,7 +1692,7 @@ also be supported.")
(define-public sbcl-ironclad
(package
(name "sbcl-ironclad")
(version "0.52")
(version "0.53")
(source
(origin
(method git-fetch)
@ -1629,7 +1700,7 @@ also be supported.")
(url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version))))
(sha256
(base32 "0cyghppxwg7jr56af6098drbl6byknqlqcnj9sqlab5pxlywzkxx"))
(base32 "01qdfa0jggqbwlsb3aw1iigvs5xhnddk6kn3abhan59956dsbp02"))
(file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl)
(native-inputs
@ -2246,6 +2317,47 @@ Lisp programs. It parses URI according to the RFC 2396 specification.")
(define-public ecl-puri
(sbcl-package->ecl-package sbcl-puri))
(define-public sbcl-qmynd
(let ((commit "7e56daf73f0ed5f49a931c01af75fb874bcf3445")
(revision "1"))
(package
(name "sbcl-qmynd")
(version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/qitab/qmynd")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("asdf-finalizers" ,sbcl-asdf-finalizers)
("babel" ,sbcl-babel)
("chipz" ,sbcl-chipz)
("cl+ssl" ,sbcl-cl+ssl)
("flexi-streams" ,sbcl-flexi-streams)
("ironclad" ,sbcl-ironclad)
("salza2" ,sbcl-salza2)
("trivial-gray-streams" ,sbcl-trivial-gray-streams)
("usocket" ,sbcl-usocket)))
(home-page "https://github.com/qitab/qmynd")
(synopsis "QITAB MySQL Native Driver for Common Lisp")
(description "QMyND, the QITAB MySQL Native Driver, is a MySQL client
library that directly talks to a MySQL server in its native network protocol.
It's a part of QITAB umbrella project.")
(license license:expat))))
(define-public ecl-qmynd
(sbcl-package->ecl-package sbcl-qmynd))
(define-public cl-qmynd
(sbcl-package->cl-source-package sbcl-qmynd))
(define-public sbcl-queues
(let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94"))
(package
@ -6113,7 +6225,7 @@ can contain any kind of values.")
(define-public sbcl-cl-octet-streams
(package
(name "sbcl-cl-octet-streams")
(version "1.0")
(version "1.2")
(source
(origin
(method git-fetch)
@ -6122,8 +6234,7 @@ can contain any kind of values.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1d7mn6ydv0j2x4r7clpc9ijjwrnfpxmvhifv8n5j7jh7s744sf8d"))))
(base32 "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
@ -6144,11 +6255,11 @@ cl-plumbing libraries.")
(sbcl-package->ecl-package sbcl-cl-octet-streams))
(define-public sbcl-lzlib
(let ((commit "0de1db7129fef9a58a059d35a2fa2ecfc5b47b47")
(revision "1"))
(let ((commit "cad10f5becbcfebb44b9d311a257563778803452")
(revision "2"))
(package
(name "sbcl-lzlib")
(version (git-version "1.0" revision commit))
(version (git-version "1.1" revision commit))
(source
(origin
(method git-fetch)
@ -6157,14 +6268,14 @@ cl-plumbing libraries.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12ny7vj52fgnd8hb8fc8mry92vq4c1x72x2350191m4476j95clz"))))
(base32 "09lp7li35h4jkls0448fj1sh6pjslr1w7ranbc4szjr8g0c2bdry"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(inputs
`(("cffi" ,sbcl-cffi)
("cl-octet-streams" ,sbcl-cl-octet-streams)
("lparallel" ,sbcl-lparallel)
("lzlib" ,lzlib)))
(arguments
'(#:phases

View file

@ -16,6 +16,7 @@
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -258,7 +259,12 @@ interface to the Tk widget system.")
(contrib-asdf "contrib/asdf/asdf.lisp"))
(copy-file guix-asdf contrib-asdf))
#t))
(add-after 'install 'wrap
(add-after 'install 'remove-build-stamp
(lambda* (#:key outputs #:allow-other-keys)
(delete-file (string-append (assoc-ref outputs "out")
"/lib/ecl-" ,version "/build-stamp"))
#t))
(add-after 'remove-build-stamp 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((ecl (assoc-ref outputs "out"))
(input-path (lambda (lib path)
@ -280,7 +286,8 @@ interface to the Tk widget system.")
(input-path lib "/include"))
`("kernel-headers" ,@libraries)))
`("LIBRARY_PATH" suffix ,library-directories)
`("LD_LIBRARY_PATH" suffix ,library-directories)))))
`("LD_LIBRARY_PATH" suffix ,library-directories))
#t)))
(add-after 'wrap 'check (assoc-ref %standard-phases 'check))
(add-before 'check 'fix-path-to-ecl
(lambda _

View file

@ -86,11 +86,8 @@ as \"x86_64-linux\"."
("i586" => "X86"))))
(define (llvm-uri component version)
(if (version>=? version "9.0.1")
(string-append "https://github.com/llvm/llvm-project/releases/download"
"/llvmorg-" version "/" component "-" version ".src.tar.xz")
(string-append "https://releases.llvm.org/" version "/" component "-"
version ".src.tar.xz")))
(string-append "https://github.com/llvm/llvm-project/releases/download"
"/llvmorg-" version "/" component "-" version ".src.tar.xz"))
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))

View file

@ -190,7 +190,7 @@ output in multiple windows in a terminal.")
(define-public spdlog
(package
(name "spdlog")
(version "1.7.0")
(version "1.8.2")
(source
(origin
(method git-fetch)
@ -200,7 +200,7 @@ output in multiple windows in a terminal.")
(file-name (git-file-name name version))
(sha256
(base32
"1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j"))))
"03vmwbi9v7r3v8kzd0lj10fchp54kxbxwzfx7dp6qzkxjrvmx2dx"))))
(build-system cmake-build-system)
;; TODO run benchmark. Currently not possible, as adding
;; (gnu packages benchmark) forms a dependency cycle

View file

@ -562,7 +562,7 @@ It can utilize SIMD instructions that are available on modern processors.")
(define-public glpk
(package
(name "glpk")
(version "4.65")
(version "5.0")
(source
(origin
(method url-fetch)
@ -570,12 +570,13 @@ It can utilize SIMD instructions that are available on modern processors.")
version ".tar.gz"))
(sha256
(base32
"040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"))))
"05bgxidxj8d9xdp82niy7cy36w181cxq7p8vc3y2ixshpgp1642a"))))
(build-system gnu-build-system)
(inputs
`(("gmp" ,gmp)))
(arguments
`(#:configure-flags '("--with-gmp")))
`(#:configure-flags '("--with-gmp"
"--disable-static")))
(home-page "https://www.gnu.org/software/glpk/")
(synopsis "GNU Linear Programming Kit, supporting the MathProg language")
(description
@ -586,6 +587,20 @@ translator for the language. In addition to the C library, a stand-alone
LP/MIP solver is included in the package.")
(license license:gpl3+)))
(define-public glpk-4
(package
(inherit glpk)
(name "glpk")
(version "4.65")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/glpk/glpk-"
version ".tar.gz"))
(sha256
(base32
"040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"))))))
(define-public 4ti2
(package
(name "4ti2")

View file

@ -889,6 +889,8 @@ wagon providers supporting HTTP.")))
;; unable to find valid certification path to requested target
"**/HttpsWagonPreemptiveTest.java"
"**/HttpsWagonTest.java"
;; Timeout
"**/HugeFileDownloadTest.java"
;; Injection errors
"**/TckTest.java")
#:jdk ,icedtea-8

View file

@ -2290,7 +2290,7 @@ export.")
(define-public pd
(package
(name "pd")
(version "0.51-2")
(version "0.51-3")
(source (origin
(method url-fetch)
(uri
@ -2298,7 +2298,7 @@ export.")
version ".src.tar.gz"))
(sha256
(base32
"1jgklcnaxypc8hr5j6mng8dd4na4ygfdixsfch8b86glssddi6mh"))))
"10cqg387xdpiirak5v9y1lpvcds9bpqz61znx6d1m1hb45n513aw"))))
(build-system gnu-build-system)
(arguments
(let ((wish (string-append "wish" (version-major+minor

View file

@ -41,6 +41,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; Copyright © 2020 Hamzeh Nasajpour <h.nasajpour@pantherx.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -294,51 +295,64 @@ GLib-based library, libnice, as well as GStreamer elements to use it.")
license:mpl1.1))))
(define-public rtmpdump
(package
(name "rtmpdump")
(version "2.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.ffmpeg.org/rtmpdump")
(commit "c28f1bab7822de97353849e7787b59e50bbb1428")))
(file-name (git-file-name name version))
(sha256
(base32 "1n3kdip83nvvs4sin30zpcdr5q711mqhq2lxrv5vgbc6lskpwzlj"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags
(list
;; The validate-runpath phase fails to find librtmp.so.0.
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'omit-static-library
(lambda _
(substitute* "librtmp/Makefile"
(("cp librtmp\\.a .*") ; don't install it
"")
(("librtmp\\.a ") ; don't build it
""))
#t))
(delete 'configure))))
(inputs
`(("openssl" ,openssl-1.0)
("zlib" ,zlib)))
(synopsis "Tools and library for handling RTMP streams")
(description "RTMPdump is a toolkit for RTMP streams. All forms of RTMP are
;; There are no tags in the repository, and the project is unlikely to
;; make new releases. Take a recent commit for multiple security fixes
;; as well as GnuTLS compatibility.
(let ((commit "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3")
(revision "0")
(version "2.4")) ;as mentioned in README and man pages
(package
(name "rtmpdump")
(version (git-version version revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.ffmpeg.org/rtmpdump")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags
(list
;; The validate-runpath phase fails to find librtmp.so.0.
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'omit-static-library
(lambda _
(substitute* "librtmp/Makefile"
(("cp librtmp\\.a .*") ; don't install it
"")
(("librtmp\\.a ") ; don't build it
""))
#t))
(add-after 'unpack 'prefer-gnutls
(lambda _
(substitute* '("Makefile" "librtmp/Makefile")
(("CRYPTO=OPENSSL")
"#CRYPTO=OPENSSL")
(("#CRYPTO=GNUTLS")
"CRYPTO=GNUTLS"))))
(delete 'configure))))
(inputs
`(("gnutls" ,gnutls)
("zlib" ,zlib)))
(synopsis "Tools and library for handling RTMP streams")
(description "RTMPdump is a toolkit for RTMP streams. All forms of RTMP are
supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.")
(home-page "https://rtmpdump.mplayerhq.hu/")
(license
(list
;; Library.
license:lgpl2.1+
;; Others.
license:gpl2+))))
(home-page "https://rtmpdump.mplayerhq.hu/")
(license
(list
;; Library.
license:lgpl2.1+
;; Others.
license:gpl2+)))))
(define-public srt
(package
@ -1075,14 +1089,14 @@ receiving NDP messages.")
(define-public ethtool
(package
(name "ethtool")
(version "5.9")
(version "5.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/network/"
"ethtool/ethtool-" version ".tar.xz"))
(sha256
(base32
"0vwam1ay184z237vnl8ivb0rdjjbljp9pj3kjzhc6yzq180k4aai"))))
"1kygjg6g90017k53b8342i59cpwgidalqpa3gdilqyrhm6b56zc1"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -1323,14 +1337,14 @@ of the same name.")
(define-public wireshark
(package
(name "wireshark")
(version "3.4.0")
(version "3.4.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz"))
(sha256
(base32 "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37"))))
(base32 "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@ -1555,14 +1569,17 @@ application stack itself.")
(define-public httpstat
(package
(name "httpstat")
(version "1.2.1")
(version "1.3.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "httpstat" version))
(method git-fetch)
(uri (git-reference
(url "https://github.com/reorx/httpstat")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1chw2nk56vaq87aba012a270k9na06hfx1pfbsrc3jfvlc2kb9hb"))))
"18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"))))
(build-system python-build-system)
(inputs `(("curl" ,curl)))
(arguments
@ -1574,7 +1591,10 @@ application stack itself.")
(("ENV_CURL_BIN.get\\('curl'\\)")
(string-append "ENV_CURL_BIN.get('"
(assoc-ref inputs "curl")
"/bin/curl')")))
"/bin/curl')"))
;; "curl -w time_*" units seems to have
;; changed from seconds to nanoseconds.
(("d\\[k\\] \\* 1000") "d[k] / 1000"))
#t)))))
(home-page "https://github.com/reorx/httpstat")
(synopsis "Visualize curl statistics")

View file

@ -16,6 +16,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 divoplade <d@divoplade.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -5859,3 +5860,48 @@ LablGL), gnomecanvas, gnomeui, gtksourceview, gtkspell, libglade (and it can
generate OCaml code from .glade files), libpanel, librsvg and quartz.")
;; Version 2 only, with linking exception.
(license license:lgpl2.0)))
(define-public ocaml-reactivedata
;; Future releases will use dune.
(package
(name "ocaml-reactivedata")
(version "0.2.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocsigen/reactiveData")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0l5z0fsckqkywjbn2nwy3s55h85yx8scc4hq9qzr9ig3hrq1mfb0"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-deprecated
(lambda _
(substitute*
"src/reactiveData.ml"
(("Pervasives.compare") "compare"))
#t))
(add-before 'install 'forget-makefile
;; Ensure we use opam to install files
(lambda _
(delete-file "Makefile")
#t)))))
(build-system ocaml-build-system)
(properties `((upstream-name . "reactiveData")))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
("opam" ,opam)))
(propagated-inputs
`(("ocaml-react" ,ocaml-react)))
(home-page "https://github.com/ocsigen/reactiveData")
(synopsis "Declarative events and signals for OCaml")
(description
"React is an OCaml module for functional reactive programming (FRP). It
provides support to program with time varying values: declarative events and
signals. React doesn't define any primitive event or signal, it lets the
client chooses the concrete timeline.")
(license license:lgpl2.1+)))

View file

@ -212,9 +212,6 @@ Google mox framework} to Python 3. It was meant to be as compatible
with mox as possible, but small enhancements have been made.")
(license asl2.0)))
(define-public python2-mox3
(package-with-python2 python-mox3))
(define-public python-openstackdocstheme
(package
(name "python-openstackdocstheme")
@ -242,9 +239,6 @@ with mox as possible, but small enhancements have been made.")
to docs.openstack.org and developer.openstack.org.")
(license asl2.0)))
(define-public python2-openstackdocstheme
(package-with-python2 python-openstackdocstheme))
(define-public python-os-client-config
(package
(name "python-os-client-config")
@ -390,7 +384,11 @@ extensions.")
common features used in Tempest.")
(license asl2.0)))
;; Packages from the Oslo library
;;;
;;; Packages from the Oslo library
;;;
(define-public python-oslo.config
(package
(name "python-oslo.config")
@ -400,8 +398,8 @@ common features used in Tempest.")
(method url-fetch)
(uri (pypi-uri "oslo.config" version))
(sha256
(base32
"0ymf7jxbq29fifyvkwhfiys1qvljqfxdw8ajwzwaf3yiqidgpxqd"))))
(base32
"0ymf7jxbq29fifyvkwhfiys1qvljqfxdw8ajwzwaf3yiqidgpxqd"))))
(build-system python-build-system)
(propagated-inputs
`(("python-debtcollector" ,python-debtcollector)
@ -426,7 +424,7 @@ common features used in Tempest.")
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo Configuration API")
(description
"The Oslo configuration API supports parsing command line arguments and
"The Oslo configuration API supports parsing command line arguments and
.ini style configuration files.")
(license asl2.0)))
@ -468,42 +466,36 @@ about a request context. The request context is usually populated in the WSGI
pipeline and used by various modules such as logging.")
(license asl2.0)))
(define-public python2-oslo.context
(package-with-python2 python-oslo.context))
(define-public python-oslo.i18n
(package
(name "python-oslo.i18n")
(version "3.20.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.i18n" version))
(sha256
(base32
"0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))
(origin
(method url-fetch)
(uri (pypi-uri "oslo.i18n" version))
(sha256
(base32
"0kjcdw4bk3mi4vqmqwhhq053kxbbbj05si6nwxd1pzx33z067ky3"))))
(build-system python-build-system)
(propagated-inputs
`(("python-babel" ,python-babel)
("python-six" ,python-six)))
`(("python-babel" ,python-babel)
("python-six" ,python-six)))
(native-inputs
`(("python-pbr" ,python-pbr)
;; Tests
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
("python-oslotest" ,python-oslotest)
("python-testscenarios" ,python-testscenarios)))
`(("python-pbr" ,python-pbr)
;; Tests
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
("python-oslotest" ,python-oslotest)
("python-testscenarios" ,python-testscenarios)))
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo internationalization (i18n) library")
(description
"The oslo.i18n library contain utilities for working with
"The oslo.i18n library contain utilities for working with
internationalization (i18n) features, especially translation for text strings
in an application or library.")
(license asl2.0)))
(define-public python2-oslo.i18n
(package-with-python2 python-oslo.i18n))
(define-public python-oslo.log
(package
(name "python-oslo.log")
@ -611,9 +603,6 @@ in transmittable and storable formats, such as JSON and MessagePack.")
and building documentation from them.")
(license asl2.0)))
(define-public python2-reno
(package-with-python2 python-reno))
(define-public python-oslosphinx
(package
(name "python-oslosphinx")

View file

@ -131,8 +131,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0")
(commit "799f066768bacb321ebad84c75b2bbfd269e7cd8")
(revision 6))
(commit "4f621a2b003e85d480999e4d0630e9dc3de85bc3")
(revision 7))
(package
(name "guix")
@ -148,7 +148,7 @@
(commit commit)))
(sha256
(base32
"04k8q5yjmxazskl13ap210jki2zh73zlzd0xdx06v08liskgz10q"))
"0ks6sdbxk4as4d3jz6jzgn5l476cr4cqxf3imjfgwiy3lk4502sj"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -1026,8 +1026,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
(let ((commit "79e28fbfd7298eecd754f75170c09c59c0943f67")
(revision "10"))
(let ((commit "9128f96ced76bd01c87fb766c3b30dc3b2100d42")
(revision "11"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1038,7 +1038,7 @@ environments.")
(commit commit)))
(sha256
(base32
"02yk56iisfwg8k4l1allxlanisp1cm13v6yifgl90b7msvy7qz3a"))
"1fgc6kjnqjc9n9mz9ki7ap772n3c1fahd0m6nxqk7a45yi5y5car"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments

View file

@ -218,7 +218,7 @@
#t)))))))
;; fpc invokes gcc, so make sure LIBRARY_PATH et.al are set.
;(native-search-paths (package-native-search-paths gcc))
(home-page "http://www.freepascal.org")
(home-page "https://www.freepascal.org")
(synopsis "The Free Pascal Compiler")
(description
"Free Pascal is a professional Object Pascal compiler. It supports the

View file

@ -904,7 +904,7 @@ between hosts and entries in the password store.")
`(("gmp" ,gmp)
("libpcap" ,libpcap)
("nss" ,nss)
("openssl" ,openssl-1.0)
("openssl" ,openssl)
("python" ,python-2) ; For "python" and "python2" shebangs
("ruby" ,ruby) ; For genincstats.rb
("zlib" ,zlib)))

View file

@ -1,522 +0,0 @@
This patch was taken from Debian.
https://salsa.debian.org/multimedia-team/ams/-/raw/master/debian/patches/0007-Make-vocoder-module-compatible-to-C-11.patch
From: Guido Scholz <gscholz@users.sourceforge.net>
Date: Tue, 6 Nov 2018 21:55:38 +0100
Subject: Make vocoder module compatible to C++11
---
src/m_vocoder.cpp | 218 +++++++++++++++++++++++++++---------------------------
src/m_vocoder.h | 31 ++++----
2 files changed, 124 insertions(+), 125 deletions(-)
diff --git a/src/m_vocoder.cpp b/src/m_vocoder.cpp
index 572cf65..371e2cf 100644
--- a/src/m_vocoder.cpp
+++ b/src/m_vocoder.cpp
@@ -18,10 +18,6 @@
along with ams. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <math.h>
#include <qwidget.h>
#include <qstring.h>
#include <qslider.h>
@@ -36,16 +32,13 @@
#include "synthdata.h"
#include "midicheckbox.h"
#include "midislider.h"
-// For FFTW to be happy we must include complex.h before fftw3.h
-#include <complex.h>
-#include <fftw3.h>
#include "port.h"
#include "m_vocoder.h"
// Window function - One way to make the FFT behave
// and give more continuous results over edge steps.
-float M_vocoder::windowcurve (int windowfunc, int len, int elem, float alpha)
+float M_vocoder::windowcurve (int windowfunc, unsigned int len, int elem, float alpha)
{
float out;
out = 1.0;
@@ -98,6 +91,7 @@ float M_vocoder::windowcurve (int windowfunc, int len, int elem, float alpha)
return (out);
}
+
M_vocoder::M_vocoder(QWidget* parent, int id)
: Module(M_type_vocoder, id, 5, parent, tr("FFT Vocoder"))
{
@@ -160,6 +154,7 @@ M_vocoder::M_vocoder(QWidget* parent, int id)
modbuf[l1] = (float *)malloc( fftsize * sizeof(float));
memset( modbuf[l1], 0, fftsize * sizeof(float));
}
+
carrbuf = (float **)malloc(synthdata->poly * sizeof(float *));
for (l1 = 0; l1 < synthdata->poly; l1++) {
carrbuf[l1] = (float *)malloc( fftsize * sizeof(float));
@@ -175,38 +170,48 @@ M_vocoder::M_vocoder(QWidget* parent, int id)
window[l2] = windowcurve (whichwin, fftsize, l2, 0.25);
// FFTW setup stuff
- carrinforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- carrinbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- carroutforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- carroutbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- modinforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- modinbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- modoutforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- modoutbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex)
- * fftsize);
- fftw_set_timelimit (5.0);
- planmodforward = fftw_plan_dft_1d (fftsize, modinforward,
- modoutforward, FFTW_FORWARD, FFTW_MEASURE);
- planmodbackward = fftw_plan_dft_1d (fftsize, modinbackward,
- modoutbackward, FFTW_BACKWARD, FFTW_MEASURE);
- plancarrforward = fftw_plan_dft_1d (fftsize, carrinforward,
- carroutforward, FFTW_FORWARD, FFTW_MEASURE);
- plancarrbackward = fftw_plan_dft_1d (fftsize, carrinbackward,
- carroutbackward, FFTW_BACKWARD, FFTW_MEASURE);
+ carrinforward.reserve(fftsize);
+ carrinbackward.reserve(fftsize);
+ carroutforward.reserve(fftsize);
+ carroutbackward.reserve(fftsize);
+ modinforward.reserve(fftsize);
+ modinbackward.reserve(fftsize);
+ modoutforward.reserve(fftsize);
+ modoutbackward.reserve(fftsize);
+
+ fftw_set_timelimit(5.0);
+
+ planmodforward = fftw_plan_dft_1d(fftsize,
+ reinterpret_cast<fftw_complex*> (modinforward.data()),
+ reinterpret_cast<fftw_complex*> (modoutforward.data()),
+ FFTW_FORWARD, FFTW_MEASURE);
+
+ planmodbackward = fftw_plan_dft_1d(fftsize,
+ reinterpret_cast<fftw_complex*> (modinbackward.data()),
+ reinterpret_cast<fftw_complex*> (modoutbackward.data()),
+ FFTW_BACKWARD, FFTW_MEASURE);
+
+ plancarrforward = fftw_plan_dft_1d(fftsize,
+ reinterpret_cast<fftw_complex*> (carrinforward.data()),
+ reinterpret_cast<fftw_complex*> (carroutforward.data()),
+ FFTW_FORWARD, FFTW_MEASURE);
+
+ plancarrbackward = fftw_plan_dft_1d(fftsize,
+ reinterpret_cast<fftw_complex*> (carrinbackward.data()),
+ reinterpret_cast<fftw_complex*> (carroutbackward.data()),
+ FFTW_BACKWARD, FFTW_MEASURE);
}
+
M_vocoder::~M_vocoder() {
- int l1;
+ // Clean up FFTW stuff.
+ fftw_destroy_plan (plancarrforward);
+ fftw_destroy_plan (plancarrbackward);
+ fftw_destroy_plan (planmodforward);
+ fftw_destroy_plan (planmodbackward);
- for (l1 = 0; l1 < synthdata->poly; l1++) {
+ for (int l1 = 0; l1 < synthdata->poly; l1++) {
free(modbuf[l1]);
free(carrbuf[l1]);
}
@@ -215,29 +220,14 @@ M_vocoder::~M_vocoder() {
free (window);
free (modmap);
free (armodmap);
-
- //#define FFTW_CLEANUP
-#ifdef FFTW_CLEANUP
- // Clean up FFTW stuff.
- fftw_destroy_plan (plancarrforward);
- fftw_destroy_plan (plancarrbackward);
- fftw_destroy_plan (planmodforward);
- fftw_destroy_plan (planmodbackward);
- fftw_free (carrinforward);
- fftw_free (carrinbackward);
- fftw_free (carroutforward);
- fftw_free (carroutbackward);
- fftw_free (modinforward);
- fftw_free (modinbackward);
- fftw_free (modoutforward);
- fftw_free (modoutbackward);
-#endif
}
+
void M_vocoder::generateCycle() {
int l1; // l1 indexes along polyphony.
unsigned int l2; // l2 indexes along the cycle
+ const std::complex<double> I(0.0, 1.0);
inModulator = port_M_modulator->getinputdata();
inPitchShift = port_M_pitchshift->getinputdata();
@@ -272,7 +262,7 @@ void M_vocoder::generateCycle() {
// Did the user change the FFT windowing function?
if (myFFTWindowFunc != whichwin) {
whichwin = myFFTWindowFunc;
- for (l2 = 0; l2 < (unsigned int) fftsize; l2++)
+ for (l2 = 0; l2 < fftsize; l2++)
window[l2] = windowcurve (whichwin, fftsize, l2, 0.25);
}
@@ -294,7 +284,7 @@ void M_vocoder::generateCycle() {
}
// window the input buffer to modinforward
- for (l2 = 0; l2 < (unsigned int)fftsize ; l2++) {
+ for (l2 = 0; l2 < fftsize ; l2++) {
modinforward[l2] = modbuf[l1][l2] * window[l2];
}
@@ -310,17 +300,18 @@ void M_vocoder::generateCycle() {
fftw_execute (planmodforward);
// copy the FFT of the modulator to modinbackward.
- for (l2 = 0; l2 < (unsigned int)fftsize; l2++)
- modinbackward[l2] = modoutforward[l2];
+ //for (l2 = 0; l2 < fftsize; l2++)
+ // modinbackward[l2] = modoutforward[l2];
+ modinbackward = modoutforward;
// Send the FFT of the modulator to the output for giggles
// and get an approximation of the first harmonic too.
float firstharmonicval;
int firstharmonicindex;
firstharmonicval = 0.0;
- firstharmonicindex = 1.0;
+ firstharmonicindex = 1;
for (l2 = 1; l2 < (unsigned int) synthdata->cyclesize; l2++) {
- data[2][l1][l2] = logf(fabs (creal (modoutforward[l2])) + 1.0);
+ data[2][l1][l2] = logf(fabs(modoutforward[l2].real()) + 1.0);
if (data[2][l1][l2] > firstharmonicval) {
firstharmonicindex = l2;
firstharmonicval = data[2][l1][l2] ;
@@ -333,35 +324,38 @@ void M_vocoder::generateCycle() {
// intermediate frequency-domain munging of modulator
// Frequency (additive, Bode-style) shifting first
- for (l2 = 0; l2 < (unsigned int)fftsize; l2++)
- modinbackward[l2] = 0;
+ for (l2 = 0; l2 < fftsize; l2++)
+ modinbackward[l2] = 0.0;
+
int lclfrq;
- for (l2 = 0; l2 < (unsigned int)fftsize/2; l2++) {
+ for (l2 = 0; l2 < fftsize/2; l2++) {
// positive frequencies (first half) of the FFT result
lclfrq = l2 + (int)freqshift + vcfreqshift * inFreqShift[l1][0];
lclfrq = lclfrq > 0 ? lclfrq : 0;
- lclfrq = lclfrq < ((fftsize/2)-1) ? lclfrq : (fftsize/2)-1;
+ lclfrq = lclfrq < (int)((fftsize/2)-1) ? lclfrq : (fftsize/2)-1;
modinbackward [lclfrq] = modoutforward [l2];
// Negative frequencies (second half of the fft result)
- modinbackward [fftsize - lclfrq] = modoutforward [ fftsize - l2];
+ modinbackward [fftsize - lclfrq] = modoutforward [fftsize - l2];
}
- // Pitchshifting (multiplicative, harmonic-retaining) shifting.
- // Note that we reuse the modoutforward as working space
- for (l2 = 0; l2 < (unsigned int) fftsize; l2++) {
- modoutforward[l2] = modinbackward[l2];
- };
- for (l2 = 0; l2 < (unsigned int)fftsize; l2++)
- modinbackward[l2] = 0;
+ // Pitchshifting (multiplicative, harmonic-retaining) shifting.
+ // Note that we reuse the modoutforward as working space
+ //for (l2 = 0; l2 < fftsize; l2++) {
+ // modoutforward[l2] = modinbackward[l2];
+ //};
+ modoutforward = modinbackward;
+
+ for (l2 = 0; l2 < fftsize; l2++)
+ modinbackward[l2] = 0.0;
float psmod, psfactor;
psmod = (pitchshift + vcpitch * inPitchShift[l1][0]);
psfactor = pow (2.0, psmod);
- for (l2 = 0; l2 < (unsigned int)fftsize/2; l2++) {
+ for (l2 = 0; l2 < fftsize/2; l2++) {
// positive frequencies (first half) of the FFT result
lclfrq = l2 * psfactor;
lclfrq = lclfrq > 0 ? lclfrq : 0;
- lclfrq = lclfrq < ((fftsize/2)-1) ? lclfrq : (fftsize/2)-1;
+ lclfrq = lclfrq < (int)((fftsize/2)-1) ? lclfrq : (fftsize/2)-1;
// Old way to pitch shift: just move the bucket. But this puts
// nulls wherever the energy is split between two buckets with
// a 180 degree phase difference.
@@ -375,12 +369,12 @@ void M_vocoder::generateCycle() {
// Better way: move freq. bin, multiply angle by octave motion.
//
modinbackward[lclfrq] +=
- cabs (modoutforward [l2])
- * cexp (I * ( carg (modoutforward [l2])
+ std::abs(modoutforward[l2])
+ * std::exp (I * ( std::arg (modoutforward [l2])
+ (l2 * phaseshift * psfactor)));
modinbackward[fftsize - lclfrq] +=
- cabs (modoutforward [ fftsize - l2])
- * cexp (I * ( carg (modoutforward [ fftsize - l2])
+ std::abs (modoutforward [ fftsize - l2])
+ * std::exp (I * ( std::arg (modoutforward [ fftsize - l2])
+ (l2 * phaseshift * psfactor)));
};
}
@@ -389,9 +383,9 @@ void M_vocoder::generateCycle() {
fftw_execute (planmodbackward);
// renormalize the time-domain modulator output
- for (l2 = 0; l2 < (unsigned)fftsize; l2++) {
- modoutbackward [l2] = modoutbackward[l2] / float (fftsize) ;
- modoutbackward [l2] = modoutbackward[l2] / window[l2];
+ for (l2 = 0; l2 < fftsize; l2++) {
+ modoutbackward [l2] = modoutbackward[l2] / (double) fftsize;
+ modoutbackward [l2] = modoutbackward[l2] / (double) window[l2];
}
unsigned int i;
@@ -400,13 +394,11 @@ void M_vocoder::generateCycle() {
// Splicing the new output to the results
- if (dynsplice == 0.0)
- {
+ if (dynsplice == 0.0) {
// output it as the altered modulator.
for (l2 = 0; l2 < synthdata->cyclesize; l2++) {
- data[0][l1][l2] = creal ( modoutbackward [l2 +
- fftsize/2 -
- synthdata->cyclesize/2 ]);
+ data[0][l1][l2] =
+ modoutbackward[l2 + fftsize/2 - synthdata->cyclesize/2].real();
}
clomatch_index = fftsize - synthdata->cyclesize;
}
@@ -421,18 +413,21 @@ void M_vocoder::generateCycle() {
float tval, dtval;
int searchstart;
float spliceval, dspliceval;
- searchstart = fftsize/2 - synthdata->cyclesize;
- if (searchstart < 1) searchstart = 1;
- clomatch_index = searchstart;
+
+ searchstart = fftsize/2 - synthdata->cyclesize;
+ if (searchstart < 1)
+ searchstart = 1;
+
+ clomatch_index = searchstart;
spliceval = data[0][l1][synthdata->cyclesize - 1];
dspliceval = spliceval - data[0][l1][synthdata->cyclesize - 2];
- clov_sofar= fabs(creal(modoutbackward[clomatch_index])-spliceval );
+ clov_sofar= fabs(modoutbackward[clomatch_index].real()-spliceval);
for (l2 = searchstart;
l2 < (searchstart + synthdata->cyclesize);
l2++)
{
- tval = creal (modoutbackward[l2]);
- dtval = tval - creal (modoutbackward [l2-1]);
+ tval = modoutbackward[l2].real();
+ dtval = tval - modoutbackward [l2-1].real();
if (
((fabs (tval - spliceval )) < clov_sofar )
&& ((dtval * dspliceval ) >= 0)
@@ -445,15 +440,15 @@ void M_vocoder::generateCycle() {
};
// fprintf (stderr, "%d %f %f ",
// clomatch_index, clov_sofar, clodv_sofar);
-
+
// What's our residual error, so that we can splice this
// with minimal "click"?
- residual = + spliceval - creal( modoutbackward[clomatch_index]);
+ residual = + spliceval - modoutbackward[clomatch_index].real();
// Move our wave, with the best match so far established, to
// the output buffer area.
for (l2 = 0; l2 < synthdata->cyclesize; l2++) {
- data[0][l1][l2] = creal ( modoutbackward [ clomatch_index + l2])
+ data[0][l1][l2] = modoutbackward[clomatch_index + l2].real()
+ ((1.0 - (float(l2) / float(synthdata->cyclesize))) * residual);
};
@@ -466,17 +461,18 @@ void M_vocoder::generateCycle() {
for (l2 = 0; l2 < fftsize - synthdata->cyclesize; l2++) {
carrbuf [l1][l2] = carrbuf [l1][l2 + synthdata->cyclesize];
}
+
for (l2 = 0; l2 < synthdata->cyclesize; l2++) {
carrbuf [l1][l2 + fftsize - synthdata->cyclesize] = inCarrier[l1][l2];
}
- for (l2 = 0; l2 < unsigned (fftsize); l2++) {
+ for (l2 = 0; l2 < fftsize; l2++) {
carrinforward [l2] = carrbuf [l1][l2] * window[l2];
}
fftw_execute (plancarrforward);
- for (l2 = 0; l2 < (unsigned) fftsize; l2++) {
+ for (l2 = 0; l2 < fftsize; l2++) {
carrinbackward[l2] = carroutforward[l2];
};
@@ -486,34 +482,37 @@ void M_vocoder::generateCycle() {
// Group the modulator into channels, and multipy the channels
// over the carrier.
- int localchannels;
- localchannels = channels + vcchannels * inChannels[l1][0];
- if (localchannels < 1) localchannels = 1;
- if (localchannels > fftsize - 1) localchannels = fftsize - 1;
- for (l2 = 0; l2 < (unsigned) fftsize; l2++) {
+ unsigned int localchannels = channels + vcchannels * inChannels[l1][0];
+ if (localchannels < 1)
+ localchannels = 1;
+
+ if (localchannels > fftsize - 1)
+ localchannels = fftsize - 1;
+
+ for (l2 = 0; l2 < fftsize; l2++) {
modmap[l2] = 0;
// initial conditions...
if (l2 == 0)
for (i = 0; i < channels; i++)
- modmap[l2] += cabs (modoutforward[l2 + i]);
+ modmap[l2] += std::abs(modoutforward[l2 + i]);
else
modmap [l2] = modmap[l2 - 1];
// add the heads, subtract the tails
i = l2 + channels;
- if (l2 < (unsigned)fftsize - 2)
- modmap[l2] += cabs( modoutforward [i] );
+ if (l2 < fftsize - 2)
+ modmap[l2] += std::abs(modoutforward[i]);
i = l2 - channels;
if (l2 >= channels)
- modmap[l2] -= cabs( modoutforward [i] );
+ modmap[l2] -= std::abs(modoutforward[i]);
}
// Normalize the modmap
- for (l2 = 0; l2 < (unsigned) fftsize; l2++)
+ for (l2 = 0; l2 < fftsize; l2++)
modmap[l2] = modmap[l2] / localchannels;
// Do attack/release
- for (l2 = 0; l2 < (unsigned) fftsize; l2++) {
+ for (l2 = 0; l2 < fftsize; l2++) {
if (modmap [l2] > armodmap[l2])
armodmap [l2] += (1 - attack) * (modmap[l2] - armodmap[l2]);
if (modmap [l2] < armodmap[l2])
@@ -521,8 +520,8 @@ void M_vocoder::generateCycle() {
}
// multiply the carrier by the modulation map.
- for (l2 = 0; l2 < (unsigned) fftsize; l2++) {
- carrinbackward[l2] = carroutforward[l2] * armodmap[l2];
+ for (l2 = 0; l2 < fftsize; l2++) {
+ carrinbackward[l2] = carroutforward[l2] * (double) armodmap[l2];
}
// reverse transform to final output, and renormalize by 1/fftsize.
@@ -532,8 +531,7 @@ void M_vocoder::generateCycle() {
for (l2 = 0; l2 < synthdata->cyclesize; l2++) {
offset = l2 + (fftsize/2) - (synthdata->cyclesize / 2);
data[1][l1][l2]=
- (creal(carroutbackward[offset]/window[offset])) / (fftsize * 100);
+ (carroutbackward[offset].real()/window[offset]) / (fftsize * 100);
};
};
}
-
diff --git a/src/m_vocoder.h b/src/m_vocoder.h
index 38eac58..32c8521 100644
--- a/src/m_vocoder.h
+++ b/src/m_vocoder.h
@@ -1,4 +1,4 @@
-/*
+/*
Vocoder - derived from m_delay.cpp
Copyright (C) 2011 Bill Yerazunis <yerazunis@yahoo.com>
@@ -22,7 +22,9 @@
#define M_VOCODER_H
#include "module.h"
-#include <complex.h>
+
+#include <vector>
+#include <ccomplex>
#include <fftw3.h>
#define MODULE_VOCODER_WIDTH 105
@@ -30,7 +32,7 @@
class M_vocoder : public Module
{
- Q_OBJECT
+ Q_OBJECT
float channels, vcchannels;
float attack, release;
@@ -42,21 +44,20 @@ class M_vocoder : public Module
Port *port_M_modulator, *port_M_pitchshift, *port_M_freqshift,
*port_M_channels, *port_M_carrier;
+
Port *port_modfft_out, *port_firstharmonic_out,
- *port_altmodulator_out,
- *port_vocoder_out;
+ *port_altmodulator_out, *port_vocoder_out;
- fftw_plan planmodforward, planmodbackward,
+ fftw_plan planmodforward, planmodbackward,
plancarrforward, plancarrbackward;
- fftw_complex *carrinforward, *carroutforward,
- *carrinbackward, *carroutbackward,
- *modinforward, *modoutforward,
- *modinbackward, *modoutbackward;
+ std::vector<std::complex<double>> carrinforward, carroutforward,
+ carrinbackward, carroutbackward,
+ modinforward, modoutforward,
+ modinbackward, modoutbackward;
- public:
- int fftsize;
- float **inModulator, **inPitchShift, **inFreqShift,
+ unsigned int fftsize;
+ float **inModulator, **inPitchShift, **inFreqShift,
**inChannels, **inCarrier;
// the previous time-based samples, for overlapping
float **modbuf, **carrbuf;
@@ -68,10 +69,10 @@ class M_vocoder : public Module
float *armodmap;
public:
- float windowcurve (int windowfunc, int len, int elem, float alpha );
+ float windowcurve (int windowfunc, unsigned int len, int elem, float alpha );
M_vocoder(QWidget* parent=0, int id = 0);
~M_vocoder();
void generateCycle();
};
-
+
#endif

View file

@ -0,0 +1,13 @@
--- 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

@ -0,0 +1,13 @@
--- 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

@ -0,0 +1,40 @@
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}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
- TEST_BEFORE_INSTALL
- 1
- TEST_COMMAND
- ctest # or `ctest -T memcheck`
)
# Run the functional tests
@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS)
BearSource
CMAKE_CACHE_ARGS
-DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
- TEST_BEFORE_INSTALL
- 1
INSTALL_COMMAND
""
- TEST_COMMAND
- ctest --verbose
)
endif ()
--
2.29.2

View file

@ -25,7 +25,7 @@ index 8be2362..48716f2 100755
-wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
-gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
-gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-echo -n 51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-echo -n 5e69f9bfd1a35decdae8d4b28da8100820e58b429f539fa9884802347631cf53 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-
-echo Extracting Firefox tarball
-tar -xf firefox-${FFVERSION}esr.source.tar.xz
@ -37,7 +37,7 @@ index 8be2362..48716f2 100755
+# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
+# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
+# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
+# echo -n 51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+# echo -n 5e69f9bfd1a35decdae8d4b28da8100820e58b429f539fa9884802347631cf53 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+#
+# echo Extracting Firefox tarball
+# tar -xf firefox-${FFVERSION}esr.source.tar.xz

View file

@ -0,0 +1,58 @@
From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 24 Nov 2019 09:52:01 +0100
Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7
This is a patch pulled down from the following:
https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch
This issue is being hit on OpenBMC code when pulling the latest
libffi tag and building on a P8 ppc64le machine. I verified this
patch fixes the issue we are seeing.
Below is the original commit message:
Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7
fails on:
In file included from ../src/powerpc/ffi.c:33:0:
../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target
typedef _Float128 float128;
^~~~~~~~~
Fix this build failure by checking for __HAVE_FLOAT128 before using
_Float128, as _Float128 is enabled only on specific conditions, see
output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h:
/* Defined to 1 if the current compiler invocation provides a
floating-point type with the IEEE 754 binary128 format, and this glibc
includes corresponding *f128 interfaces for it. */
#if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \
&& defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH
# define __HAVE_FLOAT128 1
#else
# define __HAVE_FLOAT128 0
#endif
Fixes:
- http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
src/powerpc/ffi_powerpc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
index 8e2f2f0e..960a5c42 100644
--- a/src/powerpc/ffi_powerpc.h
+++ b/src/powerpc/ffi_powerpc.h
@@ -57,7 +57,7 @@ typedef union
double d;
} ffi_dblfl;
-#if defined(__FLOAT128_TYPE__)
+#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128)
typedef _Float128 float128;
#elif defined(__FLOAT128__)
typedef __float128 float128;

View file

@ -1,41 +1,39 @@
Allow the purescript dependencies to better match the available packages in
Guix.
diff --git purescript-0.13.6/purescript.cabal purescript-0.13.6/purescript.cabal.orig
index 7e38070..0724a0b 100644
--- purescript-0.13.6/purescript.cabal
+++ purescript-0.13.6/purescript.cabal.orig
@@ -1167,1 +1167,1 @@ library
--- purescript-0.13.8/purescript.cabal
+++ purescript-0.13.8/purescript.cabal.orig
@@ -1091 +1091 @@ library
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1171,1 +1171,1 @@ library
@@ -1095 +1095 @@ library
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1180,1 +1180,1 @@ library
@@ -1105 +1105 @@ library
- clock <0.8,
+ clock ==0.8.*,
@@ -1246,1 +1246,1 @@ executable purs
@@ -1173 +1173 @@ executable purs
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1250,1 +1250,1 @@ executable purs
@@ -1177 +1177 @@ executable purs
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1260,1 +1260,1 @@ executable purs
@@ -1188 +1188 @@ executable purs
- clock <0.8,
+ clock ==0.8.*,
@@ -1281,1 +1281,1 @@ executable purs
@@ -1209 +1209 @@ executable purs
- network >=3.0.1.1 && <3.1,
+ network >=2.8 && <3.1,
@@ -1358,1 +1358,1 @@ test-suite tests
@@ -1288 +1288 @@ test-suite tests
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1363,1 +1363,1 @@ test-suite tests
@@ -1293 +1293 @@ test-suite tests
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1372,1 +1372,1 @@ test-suite tests
@@ -1303 +1303 @@ test-suite tests
- clock <0.8,
+ clock ==0.8.*,
@@ -1384,2 +1384,2 @@ test-suite tests
@@ -1315,2 +1315,2 @@ test-suite tests
- hspec <2.7,
- hspec-discover <2.7,
+ hspec ==2.7.*,

View file

@ -0,0 +1,370 @@
See the discussion about the issues fixed here at:
http://bugs.python.org/issue20868 .
diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py
--- a/Lib/ctypes/test/test_callbacks.py
+++ b/Lib/ctypes/test/test_callbacks.py
@@ -3,6 +3,7 @@ import unittest
from ctypes import *
from ctypes.test import need_symbol
import _ctypes_test
+import platform
class Callbacks(unittest.TestCase):
functype = CFUNCTYPE
@@ -176,6 +177,8 @@ class SampleCallbacksTestCase(unittest.TestCase):
self.assertLess(diff, 0.01, "%s not less than 0.01" % diff)
+ @unittest.skipIf(platform.machine() in ['mips64'],
+ "This test fails on this platform")
def test_issue_8959_a(self):
from ctypes.util import find_library
libc_path = find_library("c")
diff --git a/Lib/ctypes/test/test_libc.py b/Lib/ctypes/test/test_libc.py
--- a/Lib/ctypes/test/test_libc.py
+++ b/Lib/ctypes/test/test_libc.py
@@ -2,6 +2,7 @@ import unittest
from ctypes import *
import _ctypes_test
+import platform
lib = CDLL(_ctypes_test.__file__)
@@ -17,6 +18,8 @@ class LibTest(unittest.TestCase):
import math
self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0))
+ @unittest.skipIf(platform.machine() in ['mips64'],
+ "This test fails on this platform")
def test_qsort(self):
comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char))
lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc
diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -333,6 +333,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
self.assertEqual(os.path.basename(res), 'archive.tar.xz')
self.assertEqual(self._tarinfo(res), self._created_files)
+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
def test_make_archive_owner_group(self):
# testing make_archive with owner and group, with various combinations
# this works even if there's not gid/uid support
@@ -362,6 +363,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
@unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib")
@unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
def test_tarfile_root_owner(self):
tmpdir = self._create_files()
base_name = os.path.join(self.mkdtemp(), 'archive')
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -443,6 +443,7 @@ class SDistTestCase(BasePyPIRCCommandTestCase):
"The tar command is not found")
@unittest.skipIf(find_executable('gzip') is None,
"The gzip command is not found")
+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
def test_make_distribution_owner_group(self):
# now building a sdist
dist, cmd = self.get_cmd()
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -1473,6 +1473,7 @@ class _TestCondition(BaseTestCase):
if pid is not None:
os.kill(pid, signal.SIGINT)
+ @unittest.skipIf(True, "This fails for unknown reasons on Guix")
def test_wait_result(self):
if isinstance(self, ProcessesMixin) and sys.platform != 'win32':
pid = os.getpid()
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1323,6 +1323,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
self._test_create_connection_ip_addr(m_socket, False)
@patch_socket
+ @unittest.skipUnless(support.is_resource_enabled('network'),
+ 'network is not enabled')
def test_create_connection_service_name(self, m_socket):
m_socket.getaddrinfo = socket.getaddrinfo
sock = m_socket.socket.return_value
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -34,6 +34,7 @@ class SignalAndYieldFromTest(unittest.TestCase):
else:
return "FAILED"
+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment')
def test_raise_and_yield_from(self):
gen = self.generator1()
gen.send(None)
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -2134,8 +2134,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase):
self.assertEqual(given, expect)
self.assertEqual(set(p.rglob("FILEd*")), set())
- @unittest.skipUnless(hasattr(pwd, 'getpwall'),
- 'pwd module does not expose getpwall()')
+ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests")
def test_expanduser(self):
P = self.cls
support.import_module('pwd')
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1150,11 +1150,11 @@ def test_pdb_issue_20766():
> <doctest test.test_pdb.test_pdb_issue_20766[0]>(6)test_function()
-> print('pdb %d: %s' % (i, sess._previous_sigint_handler))
(Pdb) continue
- pdb 1: <built-in function default_int_handler>
+ pdb 1: Handlers.SIG_IGN
> <doctest test.test_pdb.test_pdb_issue_20766[0]>(5)test_function()
-> sess.set_trace(sys._getframe())
(Pdb) continue
- pdb 2: <built-in function default_int_handler>
+ pdb 2: Handlers.SIG_IGN
"""
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -762,6 +762,7 @@ class ArgsTestCase(BaseTestCase):
output = self.run_tests('--fromfile', filename)
self.check_executed_tests(output, tests)
+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.')
def test_interrupted(self):
code = TEST_INTERRUPTED
test = self.create_test('sigint', code=code)
@@ -779,6 +780,7 @@ class ArgsTestCase(BaseTestCase):
% (self.TESTNAME_REGEX, len(tests)))
self.check_line(output, regex)
+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.')
def test_slowest_interrupted(self):
# Issue #25373: test --slowest with an interrupted test
code = TEST_INTERRUPTED
diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -145,6 +145,7 @@ class ResourceTest(unittest.TestCase):
@unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit')
@support.requires_linux_version(2, 6, 36)
+ @unittest.skipIf(True, "Bug: the PermissionError is not raised")
def test_prlimit(self):
self.assertRaises(TypeError, resource.prlimit)
self.assertRaises(ProcessLookupError, resource.prlimit,
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1428,6 +1428,7 @@ class TestArchives(BaseTest, unittest.TestCase):
self.assertRaises(ValueError, make_archive, base_name, 'xxx')
@support.requires_zlib()
+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
def test_make_archive_owner_group(self):
# testing make_archive with owner and group, with various combinations
# this works even if there's not gid/uid support
@@ -1456,6 +1457,7 @@ class TestArchives(BaseTest, unittest.TestCase):
@support.requires_zlib()
+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
@unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
def test_tarfile_root_owner(self):
root_dir, base_dir = self._create_files()
diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py
--- a/Lib/test/test_unicodedata.py
+++ b/Lib/test/test_unicodedata.py
@@ -320,6 +320,7 @@ class NormalizationTest(unittest.TestCase):
data = [int(x, 16) for x in data.split(" ")]
return "".join([chr(x) for x in data])
+ @unittest.skipIf(True, 'Network is not available in the Guix build environment')
def test_normalization(self):
TESTDATAFILE = "NormalizationTest.txt"
TESTDATAURL = f"http://www.pythontest.net/unicode/{unicodedata.unidata_version}/{TESTDATAFILE}"
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -875,6 +875,8 @@ class GeneralModuleTests(unittest.TestCase):
if not fqhn in all_host_names:
self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names)))
+ @unittest.skipUnless(support.is_resource_enabled('network'),
+ 'network is not enabled')
def test_host_resolution(self):
for addr in [support.HOSTv4, '10.0.0.1', '255.255.255.255']:
self.assertEqual(socket.gethostbyname(addr), addr)
@@ -1004,6 +1006,8 @@ class GeneralModuleTests(unittest.TestCase):
self.assertWarns(DeprecationWarning, socket.ntohs, k)
self.assertWarns(DeprecationWarning, socket.htons, k)
+ @unittest.skipUnless(os.path.exists("/etc/services"),
+ "getservbyname uses /etc/services, which is not in the chroot")
def testGetServBy(self):
eq = self.assertEqual
# Find one service that exists, then check all the related interfaces.
@@ -1358,6 +1362,8 @@ class GeneralModuleTests(unittest.TestCase):
raise
self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None)
+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"),
+ "getaddrinfo() will fail")
def testGetaddrinfo(self):
try:
socket.getaddrinfo('localhost', 80)
@@ -1440,6 +1446,8 @@ class GeneralModuleTests(unittest.TestCase):
# only IP addresses are allowed
self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0)
+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"),
+ "getaddrinfo() will fail")
@unittest.skipUnless(support.is_resource_enabled('network'),
'network is not enabled')
def test_idna(self):
diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py
--- a/Lib/test/test_spwd.py
+++ b/Lib/test/test_spwd.py
@@ -5,8 +5,7 @@ from test import support
spwd = support.import_module('spwd')
-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0,
- 'root privileges required')
+@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow')
class TestSpwdRoot(unittest.TestCase):
def test_getspall(self):
@@ -56,8 +55,7 @@ class TestSpwdRoot(unittest.TestCase):
self.assertRaises(TypeError, spwd.getspnam, bytes_name)
-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0,
- 'non-root user required')
+@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow')
class TestSpwdNonRoot(unittest.TestCase):
def test_getspnam_exception(self):
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -2509,9 +2509,12 @@ def root_is_uid_gid_0():
import pwd, grp
except ImportError:
return False
- if pwd.getpwuid(0)[0] != 'root':
- return False
- if grp.getgrgid(0)[0] != 'root':
+ try:
+ if pwd.getpwuid(0)[0] != 'root':
+ return False
+ if grp.getgrgid(0)[0] != 'root':
+ return False
+ except KeyError:
return False
return True
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1249,6 +1249,7 @@ class MiscTestCase(unittest.TestCase):
class InterruptMainTests(unittest.TestCase):
+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.')
def test_interrupt_main_subthread(self):
# Calling start_new_thread with a function that executes interrupt_main
# should raise KeyboardInterrupt upon completion.
@@ -1260,6 +1261,8 @@ class InterruptMainTests(unittest.TestCase):
t.join()
t.join()
+
+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.')
def test_interrupt_main_mainthread(self):
# Make sure that if interrupt_main is called in main thread that
# KeyboardInterrupt is raised instantly.
diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py
--- a/Tools/scripts/run_tests.py
+++ b/Tools/scripts/run_tests.py
@@ -39,7 +39,7 @@ def main(regrtest_args):
if not any(is_multiprocess_flag(arg) for arg in regrtest_args):
args.extend(['-j', '0']) # Use all CPU cores
if not any(is_resource_use_flag(arg) for arg in regrtest_args):
- args.extend(['-u', 'all,-largefile,-audio,-gui'])
+ args.extend(['-u', 'all,-largefile,-audio,-gui,-network'])
args.extend(regrtest_args)
print(' '.join(args))
if sys.platform == 'win32':
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 1474624..887f8ee 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3801,6 +3801,7 @@ class _TestSharedMemory(BaseTestCase):
sms.close()
@unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms")
+ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device")
def test_shared_memory_SharedMemoryServer_ignores_sigint(self):
# bpo-36368: protect SharedMemoryManager server process from
# KeyboardInterrupt signals.
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index d41e94b..a1c15e7 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -78,6 +78,7 @@ class PosixTests(unittest.TestCase):
self.assertLess(len(s), signal.NSIG)
@unittest.skipUnless(sys.executable, "sys.executable required.")
+ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device")
def test_keyboard_interrupt_exit_code(self):
"""KeyboardInterrupt triggers exit via SIGINT."""
process = subprocess.run(
@@ -128,6 +129,7 @@ class WindowsSignalTests(unittest.TestCase):
signal.signal(7, handler)
@unittest.skipUnless(sys.executable, "sys.executable required.")
+ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device")
def test_keyboard_interrupt_exit_code(self):
"""KeyboardInterrupt triggers an exit using STATUS_CONTROL_C_EXIT."""
# We don't test via os.kill(os.getpid(), signal.CTRL_C_EVENT) here
@@ -1245,6 +1247,7 @@ class StressTest(unittest.TestCase):
class RaiseSignalTest(unittest.TestCase):
+ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device")
def test_sigint(self):
with self.assertRaises(KeyboardInterrupt):
signal.raise_signal(signal.SIGINT)
@@ -1279,6 +1279,7 @@ class PidfdSignalTest(unittest.TestCase):
hasattr(signal, "pidfd_send_signal"),
"pidfd support not built in",
)
+ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device")
def test_pidfd_send_signal(self):
with self.assertRaises(OSError) as cm:
signal.pidfd_send_signal(0, signal.SIGINT)
diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py
index 92ac184..49eec2c 100644
--- a/Lib/ctypes/test/test_find.py
+++ b/Lib/ctypes/test/test_find.py
@@ -116,6 +116,7 @@ class FindLibraryLinux(unittest.TestCase):
with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None):
self.assertNotEqual(find_library('c'), None)
+ @unittest.skipIf(True, "This fails for unknown reasons on Guix")
def test_find_library_with_ld(self):
with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \
unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None):

View file

@ -0,0 +1,36 @@
From ed09f3c91e915c3b436854a7936566edceb3e8de Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 15 Dec 2020 10:09:45 +0200
Subject: [PATCH] remove blas-src dependency
---
Cargo.toml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 1f3e1b6..36bc816 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,10 +37,6 @@ debug = true
name = "ndarray"
test = true
bench = false
-[dependencies.blas-src]
-version = "0.2.0"
-optional = true
-default-features = false
[dependencies.cblas-sys]
version = "0.1.4"
@@ -78,7 +74,7 @@ default-features = false
version = "0.1"
[features]
-blas = ["cblas-sys", "blas-src"]
+blas = ["cblas-sys"]
docs = ["rustc-serialize", "serde-1"]
serde-1 = ["serde"]
test = ["test-blas-openblas-sys"]
--
2.29.2

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,29 @@
Fix build with Python 3 scons.
Patch taken from Arch Linux:
https://github.com/archlinux/svntogit-packages/blob/packages/serf/trunk/scons-python3.patch
--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000
+++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000
@@ -163,9 +163,9 @@
suffix='.def', src_suffix='.h')
})
-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
- 'SERF_MINOR_VERSION ([0-9]+).*'
- 'SERF_PATCH_VERSION ([0-9]+)',
+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
+ b'SERF_MINOR_VERSION ([0-9]+).*'
+ b'SERF_PATCH_VERSION ([0-9]+)',
env.File('serf.h').get_contents(),
re.DOTALL)
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
@@ -183,7 +183,7 @@
unknown = opts.UnknownVariables()
if unknown:
- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
+ print ('Warning: Used unknown variables:', ', '.join(unknown.keys()))
apr = str(env['APR'])
apu = str(env['APU'])

View file

@ -1,45 +0,0 @@
# HG changeset patch
# User Todd C. Miller <Todd.Miller@sudo.ws>
# Date 1606767492 25200
# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9
# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76
Fix build when configured using --without-sendmail
Bug #947
diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c
--- a/lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700
+++ b/lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700
@@ -78,7 +78,7 @@
static FILE *eventlog_stub_open_log(int type, const char *logfile);
static void eventlog_stub_close_log(int type, FILE *fp);
-/* Eventlog config settings */
+/* Eventlog config settings (default values). */
static struct eventlog_config evl_conf = {
EVLOG_NONE, /* type */
EVLOG_SUDO, /* format */
@@ -91,7 +91,11 @@
false, /* omit_hostname */
_PATH_SUDO_LOGFILE, /* logpath */
"%h %e %T", /* time_fmt */
+#ifdef _PATH_SUDO_SENDMAIL
_PATH_SUDO_SENDMAIL, /* mailerpath */
+#else
+ NULL, /* mailerpath (disabled) */
+#endif
"-t", /* mailerflags */
NULL, /* mailfrom */
MAILTO, /* mailto */
@@ -1436,8 +1440,10 @@
evl_conf.logpath = _PATH_SUDO_LOGFILE;
if (evl_conf.time_fmt == NULL)
evl_conf.time_fmt = "%h %e %T";
+#ifdef _PATH_SUDO_SENDMAIL
if (evl_conf.mailerpath == NULL)
evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
+#endif
if (evl_conf.mailerflags == NULL)
evl_conf.mailerflags = "-t";
if (evl_conf.mailto == NULL)

View file

@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.")
(define-public patchwork
(package
(name "patchwork")
(version "2.2.2")
(version "2.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.")
(file-name (git-file-name name version))
(sha256
(base32
"1cr3lhm589zhvcgfm8gni036866k2livq1rcxbnigjxlw9p5znaf"))))
"0rc1ylg2p4mlj1gsz4cgk6kwijdzgzdk29w3bnzywsvyxrdn4bc3"))))
(build-system python-build-system)
(arguments
`(;; TODO: Tests require a running database

View file

@ -1712,7 +1712,7 @@ and objects.")
(define-public perl-common-sense
(package
(name "perl-common-sense")
(version "3.74")
(version "3.75")
(source
(origin
(method url-fetch)
@ -1720,7 +1720,7 @@ and objects.")
"common-sense-" version ".tar.gz"))
(sha256
(base32
"1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"))))
"0zhfp8f0czg69ycwn7r6ayg6idm5kyh2ai06g5s6s07kli61qsm8"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/common-sense")
(synopsis "Sane defaults for Perl programs")
@ -2033,14 +2033,14 @@ CPAN::Meta object are present.")
(define-public perl-cpanel-json-xs
(package
(name "perl-cpanel-json-xs")
(version "4.18")
(version "4.25")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/"
"Cpanel-JSON-XS-" version ".tar.gz"))
(sha256
(base32 "1dnnf6bjz0fi9hk8gzmsklmh5y0z137vk62k3d7s88q30maf3rk3"))))
(base32 "061940vyj9y3rzwq47z2a3f5i5rfpa90ccz7fgz228zr7njkvfpr"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-common-sense" ,perl-common-sense)))
@ -5553,18 +5553,18 @@ installed.")
(define-public perl-json-maybexs
(package
(name "perl-json-maybexs")
(version "1.004000")
(version "1.004003")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
(uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"JSON-MaybeXS-" version ".tar.gz"))
(sha256
(base32
"09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"))))
"1grg8saa318bs4x2wqnww7y0nra7azrzg35bk5pgvkwxzwbkpvjv"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-without-module" ,perl-test-without-module)))
`(("perl-test-needs" ,perl-test-needs)))
(inputs
`(("perl-cpanel-json-xs" ,perl-cpanel-json-xs)))
(home-page "https://metacpan.org/release/JSON-MaybeXS")
@ -8368,14 +8368,14 @@ for a given module is comprehensive.")
(define-public perl-pod-simple
(package
(name "perl-pod-simple")
(version "3.35")
(version "3.42")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/K/KH/KHW/"
"Pod-Simple-" version ".tar.gz"))
(sha256
(base32
"0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"))))
"1icagrjqw1azmff82h17cbrhqgql7rg21gz64mjpiqqq0cpfpz59"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Pod-Simple")
(synopsis "Parsing library for text in Pod format")

View file

@ -522,7 +522,7 @@ module-gsettings is loaded in the sound server.")
(define-public rnnoise
(package
(name "rnnoise")
(version "0.9")
(version "0.91")
(source
(origin
(method git-fetch)
@ -531,7 +531,7 @@ module-gsettings is loaded in the sound server.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "18bq5b50xw3d4r1ildinafpg3isb9y216430h4mm9wr3ir7h76a7"))))
(base32 "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"))))
(build-system cmake-build-system)
(arguments
;; No tests.
@ -555,7 +555,7 @@ The plugin is made to work with 1 or 2 channels (ladspa plugin),
(define-public noisetorch
(package
(name "noisetorch")
(version "0.7.2-beta")
(version "0.8.3")
(source
(origin
(method git-fetch)
@ -564,7 +564,7 @@ The plugin is made to work with 1 or 2 channels (ladspa plugin),
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "06xlqjma8h7lcnqgc9226blps6m9dp487hk71lslfxj0jkay548k"))))
(base32 "115sq4waq048bv82lnq5sblf62m50yvyakx7x06qq359v7qf5ji1"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/lawl/NoiseTorch"

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -47,7 +48,7 @@
(define-public purescript
(package
(name "purescript")
(version "0.13.6")
(version "0.13.8")
(source
(origin
(method url-fetch)
@ -57,7 +58,7 @@
".tar.gz"))
(sha256
(base32
"1xss3wpv6wb38gsh9r635s09cxzmiz81hhssdxzdba2pw6ifzx8j"))
"0sh9z3ir3jiwmi5h95v9p7j746xxidg1hrxha89c0zl6vr4sq7vh"))
(patches (search-patches "purescript-relax-dependencies.patch"))))
(build-system haskell-build-system)
(inputs
@ -70,6 +71,7 @@
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-bower-json" ,ghc-bower-json)
("ghc-boxes" ,ghc-boxes)
("ghc-cborg" ,ghc-cborg)
("ghc-cheapskate" ,ghc-cheapskate)
("ghc-clock" ,ghc-clock)
("ghc-cryptonite" ,ghc-cryptonite)
@ -95,6 +97,7 @@
("ghc-scientific" ,ghc-scientific)
("ghc-semialign" ,ghc-semialign)
("ghc-semigroups" ,ghc-semigroups)
("ghc-serialise" ,ghc-serialise)
("ghc-sourcemap" ,ghc-sourcemap)
("ghc-split" ,ghc-split)
("ghc-stringsearch" ,ghc-stringsearch)

View file

@ -1153,3 +1153,30 @@ execute @code{unittest} test suites using multiple processes to split up
execution of a test suite. It will also store a history of all test runs to
help in debugging failures and optimizing the scheduler to improve speed.")
(license license:asl2.0)))
;; This is only used by python-sanic
(define-public python-pytest-sanic
(package
(name "python-pytest-sanic")
(version "1.6.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest-sanic" version))
(sha256
(base32
"02ajd8z77ahi69kzkz200qgxrb4s2j4qb6k8j9ds1kz6qa6fsa34"))))
(build-system python-build-system)
(arguments
;; Tests depend on python-sanic.
`(#:tests? #f))
(propagated-inputs
`(("python-aiohttp" ,python-aiohttp)
("python-async-generator"
,python-async-generator)
("python-pytest" ,python-pytest)))
(home-page
"https://github.com/yunstanford/pytest-sanic")
(synopsis "Pytest plugin for Sanic")
(description "A pytest plugin for Sanic. It helps you to test your
code asynchronously.")
(license license:expat)))

View file

@ -39,6 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -3015,16 +3016,34 @@ library.")
@code{Requests} with @code{Gevent} to make asynchronous HTTP Requests easily")
(license license:bsd-2)))
(define-public python-dpkt
(package
(name "python-dpkt")
(version "1.9.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dpkt" version))
(sha256
(base32
"1d28r8pmhzjjd6hrn1xcddinfhwv8lcl1s59ygmqa8kfmz5pkrgl"))))
(build-system python-build-system)
(home-page "https://github.com/kbandla/dpkt")
(synopsis "Packet generator and parser for TCP/IP protocols")
(description "The dpkt module is a fast, simple packet generator and parser
for the basic TCP/IP protocols.")
(license license:bsd-3)))
(define-public python-geventhttpclient
(package
(name "python-geventhttpclient")
(version "1.3.1")
(version "1.4.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "geventhttpclient" version))
(sha256
(base32
"07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))
"1hy4qm9d3r69n5199i7qjji1v7718n7cxbj8ggi0njify99m37pm"))
(modules '((guix build utils)))
(snippet
'(begin
@ -3052,7 +3071,8 @@ library.")
"-k" (string-append "not test_cookielib_compatibility"))
#t)))))
(native-inputs
`(("python-pytest" ,python-pytest)))
`(("python-dpkt" ,python-dpkt)
("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-certifi" ,python-certifi)
("python-gevent" ,python-gevent)
@ -3063,9 +3083,6 @@ library.")
concurrent HTTP client library for python using @code{gevent}.")
(license license:expat)))
(define-public python2-geventhttpclient
(package-with-python2 python-geventhttpclient))
(define-public python-requests-oauthlib
(package
(name "python-requests-oauthlib")
@ -3473,9 +3490,6 @@ documentation builder.")
specs from your Flask-Restful projects.")
(license license:expat)))
(define-public python2-flask-restful-swagger
(package-with-python2 python-flask-restful-swagger))
(define-public python-htmlmin
(package
(name "python-htmlmin")
@ -3760,9 +3774,6 @@ and other command-line tasks that belong outside the web application
itself.")
(license license:bsd-3)))
(define-public python2-flask-script
(package-with-python2 python-flask-script))
(define-public python-flask-migrate
(package
(name "python-flask-migrate")
@ -3836,9 +3847,6 @@ Flask. It supports managing both authentication and authorization data in a
thread-local variable.")
(license license:expat)))
(define-public python2-flask-principal
(package-with-python2 python-flask-principal))
(define-public python-flask-httpauth
(package
(name "python-flask-httpauth")
@ -3859,9 +3867,6 @@ thread-local variable.")
authentication for Flask routes.")
(license license:expat)))
(define-public python2-flask-httpauth
(package-with-python2 python-flask-httpauth))
(define-public python-uritemplate
(package
(name "python-uritemplate")
@ -3940,14 +3945,14 @@ List. Forked from and using the same API as the publicsuffix package.")
(define-public python-werkzeug
(package
(name "python-werkzeug")
(version "1.0.0")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Werkzeug" version))
(sha256
(base32
"15kh0z61klp62mrc1prka13xsshxn0rsp1j1s2964iw86yisi6qn"))))
"0z74sa1xw5h20yin9faj0vvdbq713cgbj84klc72jr9nmpjv303c"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -3962,7 +3967,7 @@ List. Forked from and using the same API as the publicsuffix package.")
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-timeout" ,python-pytest-timeout)))
(home-page "https://www.palletsprojects.org/p/werkzeug/")
(home-page "https://palletsprojects.com/p/werkzeug/")
(synopsis "Utilities for WSGI applications")
(description "One of the most advanced WSGI utility modules. It includes a
powerful debugger, full-featured request and response objects, HTTP utilities to
@ -3971,9 +3976,6 @@ uploads, a powerful URL routing system and a bunch of community-contributed
addon modules.")
(license license:x11)))
(define-public python2-werkzeug
(package-with-python2 python-werkzeug))
(define-public python-bottle
(package
(name "python-bottle")
@ -4914,7 +4916,7 @@ and serve updated contents upon changes to the directory.")
(define-public python-httpcore
(package
(name "python-httpcore")
(version "0.11.0")
(version "0.12.2")
(source
(origin
;; PyPI tarball does not contain tests.
@ -4924,33 +4926,21 @@ and serve updated contents upon changes to the directory.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "01bhajcxqgkdzg7b7x0fqs2lwcfsajlgqwi1nlxx58jss7g2kxn9"))))
(base32 "1nrwwfdqjfc2a1k3j41cdwkprwvplf95fwmypdl2aq2qgp3209q0"))))
(build-system python-build-system)
(arguments
`(#:phases
`(#:tests? #f ; Tests hang at 98%
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-unavailable-tests
(lambda _
;; These tests require 'mitmproxy' which is not packaged.
(for-each (lambda (f)
(delete-file f))
'("tests/conftest.py"
"tests/sync_tests/test_interfaces.py"
"tests/async_tests/test_interfaces.py"))
#t))
(add-after 'remove-unavailable-tests 'force-h11-version
;; Allow build with h11 >= 0.10.
(lambda _
(substitute* "setup.py" (("h11>=0.8,<0.10") "h11"))
#t))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv" "--cov=httpcore"
"--cov=tests" "tests"))))))
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv" "--cov=httpcore"
"--cov=tests" "tests"))
#t)))))
(native-inputs
`(;; ("mitmproxy" ,mitmproxy) ;; TODO: Package this.
("python-autoflake" ,python-autoflake)
`(("python-autoflake" ,python-autoflake)
("python-flake8" ,python-flake8)
("python-flake8-bugbear" ,python-flake8-bugbear)
("python-flake8-pie" ,python-flake8-pie)
@ -5653,3 +5643,84 @@ over IMAP:
@item Work with mailbox folders (list, set, get, create, exists, rename, delete, status)
@end itemize")
(license license:asl2.0)))
(define-public python-hstspreload
(package
(name "python-hstspreload")
(version "2020.10.20")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hstspreload" version))
(sha256
(base32
"1qah80p2xlib1rhivvdj9v5y3girxrj7dwp1mnh8mwaj5wy32y8a"))))
(build-system python-build-system)
(home-page
"https://github.com/sethmlarson/hstspreload")
(synopsis
"Chromium HSTS Preload list as a Python package")
(description
"@code{python-hstspreload} contains Chromium HSTS Preload list
as a Python package.")
(license license:bsd-3)))
(define-public python-sanic
(package
(name "python-sanic")
(version "20.9.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sanic" version))
(sha256
(base32
"06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'use-recent-pytest
;; Allow using recent dependencies.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "setup.py"
(("httpcore==0.3.0") "httpcore")
(("pytest==5.2.1") "pytest")
(("multidict==5.0.0") "multidict")
(("httpx==0\\.15\\.4") "httpx"))
#t))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv" "./tests" "-k"
"not test_zero_downtime and not test_gunicorn_worker"))))))
(propagated-inputs
`(("python-aiofiles" ,python-aiofiles)
("python-httptools" ,python-httptools)
("python-httpx" ,python-httpx)
("python-multidict" ,python-multidict)
("python-ujson" ,python-ujson)
("python-uvloop" ,python-uvloop)
("python-websockets" ,python-websockets)))
(native-inputs
`(("gunicorn" ,gunicorn)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-hstspreload" ,python-hstspreload)
("python-httpcore" ,python-httpcore)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-benchmark" ,python-pytest-benchmark)
("python-pytest-sanic" ,python-pytest-sanic)
("python-pytest-sugar" ,python-pytest-sugar)
("python-urllib3" ,python-urllib3)
("python-uvicorn" ,python-uvicorn)))
(home-page
"https://github.com/huge-success/sanic/")
(synopsis
"Async Python 3.6+ web server/framework")
(description
"Sanic is a Python 3.6+ web server and web framework
that's written to go fast. It allows the usage of the
@code{async/await} syntax added in Python 3.5, which makes
your code non-blocking and speedy.")
(license license:expat)))

View file

@ -15,7 +15,7 @@
;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2017 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
@ -983,13 +983,13 @@ to users of that module.")
(define-public python-license-expression
(package
(name "python-license-expression")
(version "0.999")
(version "1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "license-expression" version))
(sha256
(base32 "08ppb0bxbrsxazy88sgpl9yffvdsabw6dkk1nc332wcz2mphwwyf"))))
(base32 "1g0sgphss8hbi1rpl4avy1nmbixmy9v194xdbvkjgl90vzgy2q3r"))))
(build-system python-build-system)
(propagated-inputs
`(("python-boolean.py" ,python-boolean.py)))
@ -1736,14 +1736,6 @@ The event dispatch is implicit, which means you can easily use @code{Eventlet}
from the Python interpreter, or as a small part of a larger application.")
(license license:expat)))
(define-public python2-eventlet
(let ((base (package-with-python2
(strip-python2-variant python-eventlet))))
(package (inherit base)
(propagated-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
(define-public python-six
(package
(name "python-six")
@ -3018,9 +3010,6 @@ of state and cooperation between execution units, which makes it
easier to build concurrent applications.")
(license license:asl2.0)))
(define-public python2-pykka
(package-with-python2 python-pykka))
(define-public python-pymsgbox
(package
(name "python-pymsgbox")
@ -4131,14 +4120,14 @@ Server (PLS).")
(define-public python-language-server
(package
(name "python-language-server")
(version "0.36.1")
(version "0.36.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-language-server" version))
(sha256
(base32
"0ljzc50z5v08is8fis1fg2dk9sb6275jlvzxb6nij0w6ys772pf8"))))
"1c0pnk2aibfhfaanrs0a5gkabkvz81gj20z7r0152b7fcx5ci14r"))))
(build-system python-build-system)
(propagated-inputs
`(("python-autopep8" ,python-autopep8)
@ -4750,14 +4739,17 @@ color scales, and color space conversion easy. It has support for:
("texinfo" ,texinfo)
("perl" ,perl)
("scipy-sphinx-theme"
,(origin ; The build script expects scipy-sphinx-theme as a git submodule
(method git-fetch)
(uri (git-reference
(url "https://github.com/scipy/scipy-sphinx-theme")
(commit "c466764e2231ba132c09826b5b138fffa1cfcec3")))
(sha256
(base32
"0q2y87clwlsgc7wvlsn9pzyssybcq10plwhq2w1ydykfsyyqbmkl"))))
,(let ((commit "c466764e2231ba132c09826b5b138fffa1cfcec3"))
(origin ;the build script expects scipy-sphinx-theme as a git submodule
(method git-fetch)
(uri (git-reference
(url "https://github.com/scipy/scipy-sphinx-theme")
(commit commit)))
(file-name (git-file-name "python-scipy-sphinx-theme"
(string-take commit 7)))
(sha256
(base32
"0q2y87clwlsgc7wvlsn9pzyssybcq10plwhq2w1ydykfsyyqbmkl")))))
,@(package-native-inputs python-numpy)))
(arguments
`(#:tests? #f ; we're only generating the documentation
@ -10418,13 +10410,13 @@ config files.")
(define-public python-configargparse
(package
(name "python-configargparse")
(version "0.14.0")
(version "1.2.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "ConfigArgParse" version))
(sha256
(base32
"149fy4zya0rsnlkvxbbq43cyr8lscb5k4pj1m6n7f1grwcmzwbif"))))
"1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"))))
(build-system python-build-system)
(native-inputs
`(("python-pyyaml" ,python-pyyaml)))
@ -10446,9 +10438,6 @@ be set via config files and/or environment variables.")
(home-page "https://github.com/bw2/ConfigArgParse")
(license license:expat)))
(define-public python2-configargparse
(package-with-python2 python-configargparse))
(define-public python-argparse-manpage
(package
(name "python-argparse-manpage")
@ -12461,13 +12450,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc).
(define-public python-greenlet
(package
(name "python-greenlet")
(version "0.4.16")
(version "0.4.17")
(source (origin
(method url-fetch)
(uri (pypi-uri "greenlet" version))
(sha256
(base32
"0v2571d0av1hz3yx63gvmnrinyn57nnvibg4zkl9frv74b3yl1kf"))))
"0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21"))))
(build-system python-build-system)
(home-page "https://greenlet.readthedocs.io/")
(synopsis "Lightweight in-process concurrent programming")
@ -12478,9 +12467,6 @@ pseudo-concurrently (typically in a single or a few OS-level threads) and
are synchronized with data exchanges on \"channels\".")
(license (list license:psfl license:expat))))
(define-public python2-greenlet
(package-with-python2 python-greenlet))
(define-public python-objgraph
(package
(name "python-objgraph")
@ -12511,13 +12497,13 @@ graphviz.")
(define-public python-gevent
(package
(name "python-gevent")
(version "20.6.2")
(version "20.9.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "gevent" version))
(sha256
(base32
"1ldmppgghfphdaazjw6wq2i17xcmsjb2jsizfa4cjlg812zjlg52"))
"13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"))
(modules '((guix build utils)))
(snippet
'(begin
@ -12576,24 +12562,10 @@ graphviz.")
(add-before 'check 'adjust-tests
(lambda _
(let ((disabled-tests
'(;; These tests rely on networking which is not
;; available in the build container.
"test_urllib2net.py"
"test__server.py"
"test__server_pywsgi.py"
"test_socket.py"
"test__socket.py"
"test__socket_ssl.py"
"test__socket_dns.py"
"test__socket_dns6.py"
"test___example_servers.py"
'(;; These tests relies on networking which is
;; not available in the build container.
"test__getaddrinfo_import.py"
"test__examples.py"
"test_httplib.py"
"test_https.py"
"test_urllib2_localnet.py"
"test_ssl.py"
"test__ssl.py"
"test__server_pywsgi.py"
;; XXX: These tests borrow functionality from the
;; Python builtin 'test' module, but it is not
;; installed with the Guix Python distribution.
@ -12632,7 +12604,7 @@ graphviz.")
;; Use the build daemons configured number of workers.
(setenv "NWORKERS" (number->string (parallel-job-count)))
(invoke "python" "-m" "gevent.tests" "--config"
(invoke "python" "-m" "gevent.tests" "-unone" "--config"
"known_failures.py" "--ignore" "skipped_tests.txt"))))))
(propagated-inputs
`(("python-greenlet" ,python-greenlet)
@ -12648,22 +12620,13 @@ graphviz.")
(inputs
`(("c-ares" ,c-ares)
("libev" ,libev)))
(home-page "http://www.gevent.org/")
(home-page "https://www.gevent.org/")
(synopsis "Coroutine-based network library")
(description
"gevent is a coroutine-based Python networking library that uses greenlet
to provide a high-level synchronous API on top of the libev event loop.")
(license license:expat)
(properties `((python2-variant . ,(delay python2-gevent))))))
(define-public python2-gevent
(let ((base (package-with-python2
(strip-python2-variant python-gevent))))
(package
(inherit base)
(native-inputs `(,@(package-native-inputs base)
("python-mock" ,python2-mock)
("python2-selectors2" ,python2-selectors2))))))
"@code{gevent} is a coroutine-based Python networking library that uses
@code{greenlet} to provide a high-level synchronous API on top of the
@code{libev} event loop.")
(license license:expat)))
(define-public python-fastimport
(package
@ -12838,9 +12801,6 @@ It includes Python implementations of Kafka producers and consumers, which
are optionally backed by a C extension built on librdkafka.")
(license license:asl2.0)))
(define-public python2-pykafka
(package-with-python2 python-pykafka))
(define-public python-wcwidth
(package
(name "python-wcwidth")
@ -13346,27 +13306,40 @@ until the object is actually required, and caches the result of said call.")
(define-public python-dnspython
(package
(name "python-dnspython")
(version "1.16.0")
(source (origin
(method url-fetch)
(uri (string-append "http://www.dnspython.org/kits/"
version "/dnspython-" version ".tar.gz"))
(sha256
(base32
"1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; XXX: requires internet access
(home-page "http://www.dnspython.org")
(synopsis "DNS toolkit for Python")
(description
"dnspython is a DNS toolkit for Python. It supports almost all record
(name "python-dnspython")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "dnspython" version ".zip"))
(sha256
(base32
"1dyip5ygqqhrgcaiy7qzjpndl9xciip186paxqwkm726fj9z0jh4"))))
(build-system python-build-system)
(native-inputs `(("unzip" ,unzip)))
(arguments '(#:tests? #f)) ; XXX: requires internet access
(home-page "https://www.dnspython.org")
(synopsis "DNS toolkit for Python")
(description
"dnspython is a DNS toolkit for Python. It supports almost all record
types. It can be used for queries, zone transfers, and dynamic updates.
It supports TSIG authenticated messages and EDNS0.")
(license license:expat)))
(license license:expat)))
(define-public python2-dnspython
(package-with-python2 python-dnspython))
(define-public python-dnspython-1.16
(package
(inherit python-dnspython)
(version "1.16.0")
(source (origin
(method url-fetch)
(uri (string-append "http://www.dnspython.org/kits/"
version "/dnspython-" version ".tar.gz"))
(sha256
(base32
"1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
(native-inputs '())))
(define-public python2-dnspython-1.16
(package-with-python2 python-dnspython-1.16))
(define-public python-py3dns
(package
@ -14190,9 +14163,6 @@ should be noted that the code is a exact port of the original
from Facebook.")
(license license:expat)))
(define-public python2-graphql-relay
(package-with-python2 python-graphql-relay))
(define-public python-graphene
(package
(name "python-graphene")
@ -14219,17 +14189,8 @@ from Facebook.")
"Graphene is a Python library for building GraphQL schemas/types.
A GraphQL schema describes your data model, and provides a GraphQL server
with an associated set of resolve methods that know how to fetch data.")
(properties `((python2-variant . ,(delay python2-graphene))))
(license license:expat)))
(define-public python2-graphene
(let ((base (package-with-python2
(strip-python2-variant python-graphene))))
(package (inherit base)
(native-inputs
`(("python2-sqlalchemy" ,python2-sqlalchemy)
,@(package-native-inputs base))))))
(define-public python-nautilus
(package
(name "python-nautilus")
@ -18262,37 +18223,6 @@ interpreter. bpython's main features are
@end enumerate")
(license license:expat)))
(define-public bpython2
(let ((base (package-with-python2
(strip-python2-variant bpython))))
(package (inherit base)
(name "bpython2")
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-failing-test
(lambda _
;; Remove failing test. FIXME: make it pass
(delete-file "bpython/test/test_args.py")
;; Disable failing test-cases (renaming inhibits they are
;; discovered)
(substitute* "bpython/test/test_curtsies_repl.py"
(("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b)
(string-append a "xxx_off_" b))
(("^(\\s*def )(test_complex\\W)" _ a b)
(string-append a "xxx_off_" b)))
#t))
(add-before 'build 'rename-scripts
;; rename the scripts to bypthon2, bpdb2, etc.
(lambda _
(substitute* "setup.py"
(("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest)
(string-append name "2" rest "\n"))
(("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest)
(string-append name "2" (or sub "") rest "\n")))
#t))))))))
(define-public python-pyinotify
(package
(name "python-pyinotify")
@ -18596,9 +18526,6 @@ process-based child processes can safely be created anywhere within a
gevent-powered application.")
(license license:expat)))
(define-public python2-gipc
(package-with-python2 python-gipc))
(define-public python-beautifultable
(package
(name "python-beautifultable")
@ -18768,47 +18695,6 @@ interface to FUSE on various operating systems. It's just one file and is
implemented using @code{ctypes}.")
(license license:isc)))
(define-public python2-gdrivefs
(package
(name "python2-gdrivefs")
(version "0.14.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gdrivefs" version))
(sha256
(base32
"0v9sp2cfg4ki3wagkwf3rnfpjhvgf845anz3757il9z95yvvcvb7"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-setup-py
(lambda _
;; Update requirements from dependency==version
;; to dependency>=version
(substitute* "gdrivefs/resources/requirements.txt"
(("==") ">="))
#t)))))
(native-inputs
`(("python2-gipc" ,python2-gipc)
("python2-gevent" ,python2-gevent)
("python2-greenlet" ,python2-greenlet)
("python2-httplib2" ,python2-httplib2)
("python2-uritemplate" ,python2-uritemplate)
("python2-oauth2client" ,python2-oauth2client)
("python2-six" ,python2-six)))
(propagated-inputs
`(("python2-dateutil" ,python2-dateutil)
("python2-fusepy" ,python2-fusepy)
("python2-google-api-client" ,python2-google-api-client)))
(home-page "https://github.com/dsoprea/GDriveFS")
(synopsis "Mount Google Drive as a local file system")
(description "@code{gdrivefs} provides a FUSE wrapper for Google Drive
under Python 2.7.")
(license license:gpl2)))
(define-public python-userspacefs
(package
(name "python-userspacefs")
@ -23204,3 +23090,108 @@ process.")
"Gamera is a toolkit for building document image recognition systems.")
(home-page "https://gamera.informatik.hsnr.de/")
(license license:gpl2+)))
(define-public python-contextvars
(package
(name "python-contextvars")
(version "2.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "contextvars" version))
(sha256
(base32
"17n3w8c20kgkgc6khaafdhhlcdj4bzman4paxqsl7harma59137k"))))
(build-system python-build-system)
(propagated-inputs
`(("python-immutables" ,python-immutables)))
(home-page
"https://github.com/MagicStack/contextvars")
(synopsis "PEP 567 Backport")
(description "This package implements a backport of Python 3.7
@code{contextvars} module (see PEP 567) for Python 3.6.")
(license license:asl2.0)))
(define-public python-aiofiles
(package
(name "python-aiofiles")
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiofiles" version))
(sha256
(base32
"1bqmv019x16qa3zah0z915cw6z4va3fjs60fk2s7vyah3gyvrrlq"))))
(build-system python-build-system)
(home-page "https://github.com/Tinche/aiofiles")
(synopsis "File support for @code{asyncio}")
(description "@code{python-aiofiles} is a library for handling local
disk files in asyncio applications.")
(license license:asl2.0)))
(define-public python-pyre-extensions
(package
(name "python-pyre-extensions")
(version "0.0.18")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyre-extensions" version))
(sha256
(base32
"0c5cbbqrfyjwakdh3kbwxis6mbrbwky1z1fqslgszgpcj4g43q30"))))
(build-system python-build-system)
(propagated-inputs
`(("python-typing-extensions"
,python-typing-extensions)
("python-typing-inspect" ,python-typing-inspect)))
(home-page "https://pyre-check.org")
(synopsis
"Type system extensions for use with @code{python-pyre}")
(description
"@code{python-pyre-extensions} defines extensions to the standard
@code{typing} module that are supported by the Pyre typechecker.")
(license license:expat)))
(define-public python-dataclasses
(package
(name "python-dataclasses")
(version "0.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dataclasses" version))
(sha256
(base32
"1rh8111fbws2vxyf2qy2zw3x6p6cq1jfz8pf904gig5qwg56sjj9"))))
(build-system python-build-system)
(home-page
"https://github.com/ericvsmith/dataclasses")
(synopsis
"Backport of the @code{dataclasses} module for Python 3.6")
(description
"This is an implementation of PEP 557, Data Classes. It is a
backport of the @code{dataclasses} module for Python 3.6.")
(license license:asl2.0)))
(define-public python-pywatchman
(package
(name "python-pywatchman")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pywatchman" version))
(sha256
(base32
"1yf2gm20wc3djpb5larxii3l55xxby0il2ns3q0v1byyfnr7w16h"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;there are none
(home-page
"https://facebook.github.io/watchman/")
(synopsis "Watchman client for python")
(description "@code{python-pywatchman} is a library to connect and
query Watchman to discover file changes.")
(license license:bsd-3)))

View file

@ -521,6 +521,31 @@ data types.")
(version-major+minor version)
"/site-packages"))))))))
(define-public python-3.9
(package (inherit python-3.8)
(name "python-next")
(version "3.9.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
(patches (search-patches
"python-3.9-fix-tests.patch"
"python-3-deterministic-build-info.patch"
"python-3-search-paths.patch"))
(sha256
(base32
"1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled copy of libexpat.
(delete-file-recursively "Modules/expat")
(substitute* "Modules/Setup"
;; Link Expat instead of embedding the bundled one.
(("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n"))
#t))))))
;; Current 3.x version.
(define-public python-3 python-3.8)

View file

@ -1,78 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages sdcc)
#:use-module (gnu packages)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages flex)
#:use-module (gnu packages python)
#:use-module (gnu packages texinfo)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:))
(define-public sdcc
(package
(name "sdcc")
(version "3.7.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/sdcc/sdcc"
"/" version "/sdcc-src-" version ".tar.bz2"))
(sha256
(base32
"13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove non-free source files
(delete-file-recursively "device/non-free")
#t))
(patches (search-patches "sdcc-disable-non-free-code.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
("boost" ,boost)
("flex" ,flex)
("python-2" ,python-2)
("texinfo" ,texinfo)))
(arguments
`(;; gputils is required for PIC ports
#:configure-flags
'("--disable-pic14-port" "--disable-pic16-port" "--enable-ucsim")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile
(lambda _
(substitute* (find-files "." "(\\.mk$|\\.in$)")
(("/bin/sh") (which "sh")))
#t)))))
(home-page "http://sdcc.sourceforge.net")
(synopsis "Small devices C compiler")
(description "SDCC is a retargetable, optimizing Standard C compiler suite
that targets the Intel MCS51-based microprocessors (8031, 8032, 8051, 8052, ...),
Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
HC08-based (hc08, s08), Zilog Z80-based MCUs (z80, z180, gbz80, Rabbit
2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8.
Work is in progress on supporting the Microchip PIC16 and PIC18 targets.
It can be retargeted for other microprocessors.")
(license license:gpl2+)))

View file

@ -13,6 +13,7 @@
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -597,3 +598,32 @@ translate and to apply translation to Sphinx generated document.")
documentation when a change is detected. It also includes a livereload
enabled web server.")
(license license:expat)))
(define-public python-nbsphinx
(package
(name "python-nbsphinx")
(version "0.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nbsphinx" version))
(sha256
(base32
"0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm"))))
(build-system python-build-system)
(propagated-inputs
`(("python-docutils" ,python-docutils)
("python-jinja2" ,python-jinja2)
("python-nbconvert" ,python-nbconvert)
("python-nbformat" ,python-nbformat)
("python-sphinx" ,python-sphinx)
("python-traitlets" ,python-traitlets)))
(home-page "https://nbsphinx.readthedocs.io/")
(synopsis "Jupyter Notebook Tools for Sphinx")
(description "@code{python-nbsphinx} is a Sphinx extension that
provides a source parser for @code{*.ipynb} files. Custom Sphinx
directives are used to show Jupyter Notebook code cells (and of course
their results) in both HTML and LaTeX output. Un-evaluated notebooks
- i.e. notebooks without stored output cells - will be automatically
executed during the Sphinx build process.")
(license license:expat)))

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