me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into staging

master
Marius Bakke 2020-11-15 23:45:34 +01:00
parent 2c400ae942 e1fa3ea9fe
commit 4e5e05d409
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
102 changed files with 54372 additions and 32619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.guix-authorizations
View File

@ -75,6 +75,8 @@
(;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0"
"E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025"
(name "jlicht"))
("8141 6036 E81A 5CF7 8F80 1071 ECFC 8398 8B4E 4B9F"
(name "jonsger"))
("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D"
(name "kkebreau"))
("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9"

131
NEWS
View File

@ -11,6 +11,137 @@ Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
Please send Guix bug reports to bug-guix@gnu.org.
* Changes in 1.2.0 (since 1.1.0)
** Package management
*** ‘guix pull’ now crytographically authenticates channels
*** ‘guix describe -f channels’ now shows “channel introductions”
*** ‘guix describe -f channels-sans-intro’ omits channel introductions
*** New ‘guix git authenticate’ command, to authenticate Git checkouts
*** ‘guix pull’ and ‘guix system reconfigure’ detect attempts to downgrade
*** New ‘--allow-downgrades’ option for ‘guix pull’ and ‘guix system’
*** Guix build time reduced thanks to Guile 3.0.4’s “baseline compiler”
*** New ‘--with-debug-info’ package transformation option
*** New ‘--with-c-toolchain’ package transformation option
*** New ‘--without-tests’ package transformation option
*** ‘--with-input’ & co. now also apply to implicit dependencies
*** Package transformation options are now recorded in profiles
*** New fakechroot “execution engine” for packs produced by ‘guix pack -RR’
*** New ‘--cache-bypass-threshold’ option for ‘guix publish’
*** New ‘--diff’ option for ‘guix challenge’, to compare substitutes
*** New ‘--exclude’ option for ‘guix lint’, to exclude checkers
*** New ‘check-for-collisions’ checker in ‘guix lint’
*** All of Guix and Guix System now runs on Guile 3.0
*** ‘guix pull’ and ‘--with-git-url’ now support authenticated SSH repos
*** ‘guix pull’ now honors $http_proxy and $https_proxy
*** New ‘--path’ option for ‘guix graph’, showing the shortest path
*** ‘guix repl’ can now be passed a script to execute
*** ‘guix help’ finally shows command descriptions
*** ‘guix install’ etc. no longer list items to download by default
*** ‘guix search’ etc. now automatically invoke the pager
*** New ‘--hash’ option for ‘guix hash’
*** New ‘--list-formats’ option for ‘guix describe’
*** New “Getting Started” section in the manual
** Distribution
*** Bootstrap binary seeds reduced to 60 MiB on x86_64/i686
*** New ‘--target’ option for ‘guix system’, for cross-compilation
*** New ‘--image-type’ option for ‘guix system disk-image’
*** New ‘--label’ option for ‘guix system disk-image’
*** Guix System can now boot from a Btrfs subvolume
*** New ‘hurd’ field of ‘operating-system’, for GNU/Hurd support
*** Guix System can be cross-compiled to GNU/Hurd with ‘--target=i586-pc-gnu’
*** New ‘hurd-vm-service-type’ to spawn a GNU/Hurd VM on GNU/Linux
*** /etc/guix/acl on Guix System is now built from the OS configuration
*** ‘rottlog-service-type’ is now part of ‘%base-services’
*** Linux-libre modules are now gzip-compressed
*** The efivarfs file system is now part of ‘%base-file-systems’
*** mcron job specs are now statically checked at OS build time
*** ‘swap-devices’ field of ‘operating-system’ can contains UUIDs and labels
*** Graphical installer uses UUIDs for unencrypted swap partitions
*** Graphical installer now supports NTFS file systems
*** New services
autossh, ganeti, gmnisrv, guix-build-coordinator,
guix-build-coordinator-agent, guix-build-coordinator-queue-builds, hostapd,
hurd-console, hurd-getty, hurd-vm, lxqt, rshiny, secret-service,
simulated-wifi, udev-rules, unattended-upgrade, webssh, zram
*** XXX new packages
*** XXX package updates
** Programming interfaces
*** New ‘maven-build-system’, for packages built with Maven
*** ‘haskell-build-system’ now always adds a “static” output
*** New (gnu image) module, to build system images
*** New (guix git-authenticate) module, for Git checkout authentication
*** New (guix openpgp) module with a minimal OpenPGP implementation
*** New (guix transformations) module, for package transformations
*** New (gnu services hurd) module providing GNU/Hurd services
*** (guix json) removed in favor of Guile-JSON’s (json) module
*** (guix zlib) and (guix lzlib) removed in favor of Guile-{Zlib,Lzlib}
*** ‘local-file’ warns about non-literal relative file names
*** Daemon now supports more hash algorithms: SHA3 and BLAKE2s
*** New <content-hash> record type for use in ‘origin’
*** New ‘let-system’ for in (guix gexp), for system-dependent code
*** New lowerable <profile> record type in (guix profiles)
*** (gnu build secret-service) can share secrets with a guest OS
*** “Programming Interface” section of the manual greatly expounded
** Noteworthy bug fixes
*** ‘guix pull’ now shows a progress bar while fetching from Git
(<https://bugs.gnu.org/39260>)
*** ‘guix copy’ and ‘guix deploy’ show a progress bar while copying
*** Bootloader messages are now localized
(<https://issues.guix.gnu.org/35394>)
*** ‘guix system reconfigure’ now starts services not currently running
(<https://bugs.gnu.org/43720>)
*** Offloading and copying small items is now much faster
(<https://issues.guix.gnu.org/43340>)
*** GCC switched back to C_INCLUDE_PATH & co. from CPATH
(<https://bugs.gnu.org/30756>)
*** Graphical installer no longer hangs while connecting to WiFi network
(<https://issues.guix.gnu.org/40682>)
*** GNU Aspell truly honors ASPELL_DICT_DIR (<https://bugs.gnu.org/29686>)
*** Fix overly aggressive memoization of “commencement” packages
(<https://bugs.gnu.org/40482>)
*** Duplicate /etc entries are now reported (<https://bugs.gnu.org/40729>)
*** ‘guix pack -R’ wrapper correctly reports exit code
(<https://bugs.gnu.org/40816>)
*** Fix time travel to pre-Guile 3.0 revisions
(<https://bugs.gnu.org/41028>)
*** ‘package-grafts’ returns grafts for all the relevant outputs
(<https://bugs.gnu.org/41796>)
*** ‘guix pull’ and related commands authenticate Git checkouts
(<https://bugs.gnu.org/22883>)
*** Fix GNU libstdc++ misconfiguration in recent ‘gcc-toolchain’ versions
(<https://bugs.gnu.org/42392>)
*** ‘guix pack -R’ wraps propagated inputs as well
(<https://bugs.gnu.org/42510>)
*** ‘guix pack -R’ wrapper leaves root available to child processes
(<https://bugs.gnu.org/44261>)
*** ‘lib/guix/package.cache’ generated by ‘guix pull’ is now bit-reproducible
(<https://bugs.gnu.org/42009>)
*** Graphical installer now properly detects disks containing an LVM partition
(<https://issues.guix.gnu.org/42683>)
*** Fix possible crash when copying store items over SSH
(<https://bugs.gnu.org/42740>)
*** ‘gcc’ is now a “deprecated” alias for ‘gcc-toolchain’
(<https://bugs.gnu.org/43303>)
*** ‘package-input-rewriting’ & co. no longer yield unnecessary rebuilds
(<https://bugs.gnu.org/42156>)
*** Offloading better normalizes build machine load
(<https://issues.guix.gnu.org/43773>)
*** ‘guix build --check’ now honors ‘--rounds’
(<https://issues.guix.gnu.org/40144>)
*** ‘guix-install.sh’ now installs shell completion files
(<https://bugs.gnu.org/43744>)
*** ‘guix-install.sh’ now warns about lack of ‘nscd’
(<https://bugs.gnu.org/43744>)
** Native language support
*** TODO populate
* Changes in 1.1.0 (since 1.0.1)
** Package management
*** New ‘guix deploy’ command to deploy several machines at once

29
doc/guix.texi
View File

@ -83,6 +83,7 @@ Copyright @copyright{} 2020 pinoaffe@*
Copyright @copyright{} 2020 André Batista@*
Copyright @copyright{} 2020 Alexandru-Sergiu Marton@*
Copyright @copyright{} 2020 raingloom@*
Copyright @copyright{} 2020 Daniel Brooks@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@ -405,7 +406,7 @@ using a different distro underneath!}. @xref{GNU Distribution}.
@cindex user interfaces
Guix provides a command-line package management interface
(@pxref{Package Management}), tools to help with software development
(@pxref{Development}), command-line utilities for more advanced usage,
(@pxref{Development}), command-line utilities for more advanced usage
(@pxref{Utilities}), as well as Scheme programming interfaces
(@pxref{Programming Interface}).
@cindex build daemon
@ -1398,6 +1399,11 @@ install and run it, which lifts it into the @code{guix_daemon_t} domain.
At that point SELinux could not prevent it from accessing files that are
allowed for processes in that domain.
You will need to relabel the store directory after all upgrades to
@file{guix-daemon}, such as after running @code{guix pull}. Assuming the
store is in @file{/gnu}, you can do this with @code{restorecon -vR /gnu},
or by other means provided by your operating system.
We could generate a much more restrictive policy at installation time,
so that only the @emph{exact} file name of the currently installed
@code{guix-daemon} executable would be labelled with
@ -6835,6 +6841,18 @@ commit:
@end lisp
@end deftp
For Mercurial repositories, the module @code{(guix hg-download)} defines
the @code{hg-fetch} origin method and @code{hg-reference} data type for
support of the Mercurial version control system.
@deffn {Scheme Procedure} hg-fetch @var{ref} @var{hash-algo} @var{hash} @
[name]
Return a fixed-output derivation that fetches @var{ref}, a
@code{<hg-reference>} object. The output is expected to have recursive
hash @var{hash} of type @var{hash-algo} (a symbol). Use @var{name} as
the file name, or a generic name if @code{#false}.
@end deffn
@node Defining Package Variants
@section Defining Package Variants
@ -14525,6 +14543,9 @@ the name of the log-in program.
When set to @code{#t} in conjunction with @var{auto-login}, the user
will have to press a key before the log-in shell is launched.
@item @code{clear-on-logout?} (default: @code{#t})
When set to @code{#t}, the screen will be cleared after logout.
@item @code{mingetty} (default: @var{mingetty})
The Mingetty package to use.
@ -29220,18 +29241,18 @@ the password from can also be specified, and this is more secure.
A file containing the password to use when connecting to the
coordinator.
@item @code{systems} (default: @var{#f})
@item @code{systems} (default: @code{#f})
The systems for which this agent should fetch builds. The agent process
will use the current system it's running on as the default.
@item @code{max-parallel-builds} (default: @code{1})
The number of builds to perform in parallel.
@item @code{derivation-substitute-urls} (default: @code{1})
@item @code{derivation-substitute-urls} (default: @code{#f})
URLs from which to attempt to fetch substitutes for derivations, if the
derivations aren't already available.
@item @code{non-derivation-substitute-urls} (default: @code{1})
@item @code{non-derivation-substitute-urls} (default: @code{#f})
URLs from which to attempt to fetch substitutes for build inputs, if the
input store items aren't already available.

6
etc/guix-install.sh
View File

@ -6,6 +6,7 @@
# Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
#
# This file is part of GNU Guix.
#
@ -60,6 +61,7 @@ INF="[ INFO ] "
DEBUG=0
GNU_URL="https://ftp.gnu.org/gnu/guix/"
#GNU_URL="https://alpha.gnu.org/gnu/guix/"
OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5"
# This script needs to know where root's home directory is. However, we
@ -228,11 +230,11 @@ guix_get_bin_list()
# Filter only version and architecture
bin_ver_ls=("$(wget -qO- "$gnu_url" \
| sed -n -e 's/.*guix-binary-\([0-9.]*\)\..*.tar.xz.*/\1/p' \
| sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \
| sort -Vu)")
latest_ver="$(echo "$bin_ver_ls" \
| grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}" \
| grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}[a-z0-9]*" \
| tail -n1)"
default_ver="guix-binary-${latest_ver}.${ARCH_OS}"

10
etc/release-manifest.scm
View File

@ -49,6 +49,12 @@ TARGET."
'("bootstrap-tarballs" "gcc-toolchain" "nss-certs"
"openssh" "emacs" "vim" "python" "guile" "guix")))
(define %base-packages/hurd
;; XXX: For now we are less demanding of "i586-gnu".
(map specification->package
'("coreutils" "grep" "findutils" "gawk" "make"
"gcc-toolchain" "tar" "xz")))
(define %system-packages
;; Key packages proposed by the Guix System installer.
(append (map specification->package
@ -94,7 +100,9 @@ TARGET."
(manifest
(append-map (lambda (system)
(map (cut package->manifest-entry* <> system)
%base-packages))
(if (string=? system "i586-gnu")
%base-packages/hurd
%base-packages)))
%hydra-supported-systems)))
(define %system-manifest

18
gnu/local.mk
View File

@ -802,14 +802,14 @@ dist_patch_DATA = \
%D%/packages/patches/audiofile-CVE-2015-7747.patch \
%D%/packages/patches/audiofile-CVE-2018-13440.patch \
%D%/packages/patches/audiofile-CVE-2018-17095.patch \
%D%/packages/patches/audiofile-Check-the-number-of-coefficients.patch \
%D%/packages/patches/audiofile-check-number-of-coefficients.patch \
%D%/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch \
%D%/packages/patches/audiofile-Fix-index-overflow-in-IMA.cpp.patch \
%D%/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch \
%D%/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch \
%D%/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch \
%D%/packages/patches/audiofile-hurd.patch \
%D%/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch \
%D%/packages/patches/audiofile-multiply-overflow.patch \
%D%/packages/patches/audiofile-overflow-in-MSADPCM.patch \
%D%/packages/patches/audiofile-division-by-zero.patch \
%D%/packages/patches/audiofile-hurd.patch \
%D%/packages/patches/audiofile-function-signature.patch \
%D%/packages/patches/automake-skip-amhello-tests.patch \
%D%/packages/patches/avahi-localstatedir.patch \
%D%/packages/patches/avogadro-boost148.patch \
@ -1200,6 +1200,7 @@ dist_patch_DATA = \
%D%/packages/patches/jsoncpp-fix-inverted-case.patch \
%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/libvirt-create-machine-cgroup.patch \
%D%/packages/patches/libziparchive-add-includes.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \
@ -1355,7 +1356,6 @@ dist_patch_DATA = \
%D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/multipath-tools-sans-systemd.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mumps-shared-libseq.patch \
%D%/packages/patches/mumps-shared-mumps.patch \
@ -1385,7 +1385,6 @@ dist_patch_DATA = \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch \
%D%/packages/patches/nyacc-binary-literals.patch \
%D%/packages/patches/oath-toolkit-glibc-compat.patch \
%D%/packages/patches/ocaml-bitstring-fix-configure.patch \
%D%/packages/patches/ocaml-CVE-2015-8869.patch \
%D%/packages/patches/ocaml-Add-a-.file-directive.patch \
@ -1448,6 +1447,7 @@ dist_patch_DATA = \
%D%/packages/patches/perl-text-markdown-discount-unbundle.patch \
%D%/packages/patches/perl-module-pluggable-search.patch \
%D%/packages/patches/perl-reproducible-build-date.patch \
%D%/packages/patches/perl-www-curl-fix-struct-void.patch \
%D%/packages/patches/perl-www-curl-remove-symbol.patch \
%D%/packages/patches/picard-fix-id3-rename-test.patch \
%D%/packages/patches/picprog-non-intel-support.patch \
@ -1523,7 +1523,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-paste-remove-timing-test.patch \
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python-pycrypto-time-clock.patch \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python2-pygobject-2-deprecation.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \

6
gnu/machine/ssh.scm
View File

@ -37,6 +37,7 @@
#:use-module (guix ssh)
#:use-module (guix store)
#:use-module (guix utils)
#:use-module ((guix self) #:select (make-config.scm))
#:use-module (gcrypt pk-crypto)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
@ -353,8 +354,9 @@ of MACHINE's system profile, ordered from most recent to oldest."
(define remote-exp
(with-extensions (list guile-gcrypt)
(with-imported-modules (source-module-closure '((guix config)
(guix profiles)))
(with-imported-modules (source-module-closure
`(((guix config) => ,(make-config.scm))
(guix profiles)))
#~(begin
(use-modules (guix config)
(guix profiles)

18
gnu/packages/admin.scm
View File

@ -1494,7 +1494,7 @@ commands and their arguments.")
(define-public opendoas
(package
(name "opendoas")
(version "6.6.1")
(version "6.8")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1503,7 +1503,7 @@ commands and their arguments.")
(file-name (git-file-name name version))
(sha256
(base32
"07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"))))
"1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1511,19 +1511,17 @@ commands and their arguments.")
(replace 'configure
;; The configure script doesn't accept most of the default flags.
(lambda* (#:key configure-flags #:allow-other-keys)
;; The configure script can only be told which compiler to use
;; The configure script can be told which compiler to use only
;; through environment variables.
(setenv "CC" ,(cc-for-target))
(apply invoke "./configure" configure-flags)))
(add-before 'install 'fix-makefile
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "bsd.prog.mk"
(substitute* "GNUmakefile"
(("^\tchown.*$") ""))
#t)))
#:configure-flags
(list (string-append "--prefix=" (assoc-ref %outputs "out"))
;; Nothing is done with this value (yet?) but it's supported.
;; (string-append "--target=" (or ,(%current-target-system) ""))
"--with-timestamp")
;; Compiler choice is not carried over from the configure script.
#:make-flags
@ -1842,7 +1840,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
(define-public acpica
(package
(name "acpica")
(version "20200717")
(version "20200925")
(source (origin
(method url-fetch)
(uri (string-append
@ -1850,7 +1848,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
version ".tar.gz"))
(sha256
(base32
"0jyy71szjr40c8v40qqw6yh3gfk8d6sl3nay69zrn5d88i3r0jca"))))
"18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)
("bison" ,bison)))
@ -3591,7 +3589,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
(version "3.1.08-1")
(version "3.1.09-1")
(source
(origin
(method git-fetch)
@ -3600,7 +3598,7 @@ Python loading in HPC environments.")
(commit version)))
(file-name (git-file-name real-name version))
(sha256
(base32 "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a"))))
(base32 "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)

4
gnu/packages/algebra.scm
View File

@ -355,7 +355,7 @@ precision.")
(define-public giac
(package
(name "giac")
(version "1.6.0-25")
(version "1.6.0-31")
(source
(origin
(method url-fetch)
@ -367,7 +367,7 @@ precision.")
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
(base32 "11kik2csdg9wy0npiih21kaag0nc89i9ldgk7ak7gvf9ycddm6mh"))))
(base32 "1dr1y88sx2gzldn0zl6p8b1ngjjcmh89iv4kzyhi2cf74j3yw85m"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)

10
gnu/packages/audio.scm
View File

@ -862,16 +862,16 @@ tools.")
"audiofile-Fix-index-overflow-in-IMA.cpp.patch"
;; CVE-2017-6827, CVE-2017-6828, CVE-2017-6832, CVE-2017-6835,
;; CVE-2017-6837:
"audiofile-Check-the-number-of-coefficients.patch"
"audiofile-check-number-of-coefficients.patch"
;; CVE-2017-6839:
"audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch"
"audiofile-overflow-in-MSADPCM.patch"
;; CVE-2017-6830, CVE-2017-6834, CVE-2017-6836, CVE-2017-6838:
"audiofile-Fix-multiply-overflow-sfconvert.patch"
"audiofile-signature-of-multiplyCheckOverflow.patch"
"audiofile-multiply-overflow.patch"
"audiofile-function-signature.patch"
;; CVE-2017-6831:
"audiofile-Fail-on-error-in-parseFormat.patch"
;; CVE-2017-6833:
"audiofile-division-by-zero-BlockCodec-runPull.patch"
"audiofile-division-by-zero.patch"
"audiofile-CVE-2018-13440.patch"
"audiofile-CVE-2018-17095.patch"))))
(properties `((lint-hidden-cve . ("CVE-2017-6829"

16
gnu/packages/authentication.scm
View File

@ -33,26 +33,14 @@
(define-public oath-toolkit
(package
(name "oath-toolkit")
(version "2.6.2")
(version "2.6.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
name "/" name "-" version ".tar.gz"))
(patches
(append (search-patches "oath-toolkit-glibc-compat.patch")
(list (origin
;; This huge commit updates gnulib for GCC 7 compatibility.
(method url-fetch)
(uri (string-append
"https://gitlab.com/oath-toolkit/oath-toolkit/commit/"
"2fffce2a471f74a585939c84cce16ef3015e5d3d.diff"))
(file-name "oath-toolkit-update-gnulib.patch")
(sha256
(base32
"088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0"))))))
(sha256
(base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"))))
(base32 "1cjial8njck2sd7452jcxspbi5h5fnp3n8v3wbmlw8fzqmgzvxx1"))))
(build-system gnu-build-system)
(arguments
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.

4
gnu/packages/benchmark.scm
View File

@ -47,14 +47,14 @@
(define-public fio
(package
(name "fio")
(version "3.23")
(version "3.24")
(source (origin
(method url-fetch)
(uri (string-append "https://brick.kernel.dk/snaps/"
"fio-" version ".tar.bz2"))
(sha256
(base32
"0cy32431hv0i84yrryna5byj4r610n6i1rm8nfflnrznbf051axs"))))
"0qshbyqpvm01hmpkmk0v0jhjz23sngqhy291kiz38z04s2df4vxn"))))
(build-system gnu-build-system)
(arguments
'(#:test-target "test"

77
gnu/packages/bioinformatics.scm
View File

@ -354,6 +354,28 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
;; The sources are dual MIT/GPL, but becomes GPL-only when USE_GPL=1.
(license (list license:gpl3+ license:expat))))
(define-public bcftools-1.9
(package (inherit bcftools)
(name "bcftools")
(version "1.9")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/samtools/bcftools/"
"releases/download/"
version "/bcftools-" version ".tar.bz2"))
(sha256
(base32
"1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg"))
(modules '((guix build utils)))
(snippet '(begin
;; Delete bundled htslib.
(delete-file-recursively "htslib-1.9")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("htslib" ,htslib-1.9)
("perl" ,perl)))))
(define-public bedops
(package
(name "bedops")
@ -437,7 +459,7 @@ computational cluster.")
(native-inputs
`(("python" ,python-wrapper)))
(inputs
`(("samtools" ,samtools)
`(("samtools" ,samtools-1.9)
("zlib" ,zlib)))
(home-page "https://github.com/arq5x/bedtools2")
(synopsis "Tools for genome analysis and arithmetic")
@ -1955,7 +1977,7 @@ multiple sequence alignments.")
;; FIXME: tests keep timing out on some systems.
(invoke "nosetests" "-v" "--processes" "1")))))))
(propagated-inputs
`(("htslib" ,htslib))) ; Included from installed header files.
`(("htslib" ,htslib-1.9))) ; Included from installed header files.
(inputs
`(("ncurses" ,ncurses)
("curl" ,curl)
@ -1963,8 +1985,8 @@ multiple sequence alignments.")
(native-inputs
`(("python-cython" ,python-cython)
;; Dependencies below are are for tests only.
("samtools" ,samtools)
("bcftools" ,bcftools)
("samtools" ,samtools-1.9)
("bcftools" ,bcftools-1.9)
("python-nose" ,python-nose)))
(home-page "https://github.com/pysam-developers/pysam")
(synopsis "Python bindings to the SAMtools C API")
@ -4250,6 +4272,19 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and
;; the rest is released under the Expat license
(license (list license:expat license:bsd-3))))
(define-public htslib-1.9
(package (inherit htslib)
(name "htslib")
(version "1.9")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/samtools/htslib/releases/download/"
version "/htslib-" version ".tar.bz2"))
(sha256
(base32
"16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"))))))
;; This package should be removed once no packages rely upon it.
(define htslib-1.3
(package
@ -5686,6 +5721,31 @@ variant calling (in conjunction with bcftools), and a simple alignment
viewer.")
(license license:expat)))
(define-public samtools-1.9
(package (inherit samtools)
(name "samtools")
(version "1.9")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://sourceforge/samtools/samtools/"
version "/samtools-" version ".tar.bz2"))
(sha256
(base32
"10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8"))
(modules '((guix build utils)))
(snippet '(begin
;; Delete bundled htslib.
(delete-file-recursively "htslib-1.9")
#t))))
(inputs
`(("htslib" ,htslib-1.9)
("ncurses" ,ncurses)
("perl" ,perl)
("python" ,python)
("zlib" ,zlib)))))
(define-public samtools-0.1
;; This is the most recent version of the 0.1 line of samtools. The input
;; and output formats differ greatly from that used and produced by samtools
@ -15376,7 +15436,7 @@ patterns.")
(define-public methyldackel
(package
(name "methyldackel")
(version "0.4.0")
(version "0.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -15385,7 +15445,7 @@ patterns.")
(file-name (git-file-name name version))
(sha256
(base32
"10gh8k0ca92kywnrw5pkacq3g6r8s976s12k8jhp8g3g49q9a97g"))))
"1sfhf2ap75qxpnmy1ifgmxqs18rq8mah9mcgkby73vc6h0sw99ws"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -15398,11 +15458,14 @@ patterns.")
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"
(("-lhts ") "-lhts -lBigWig ")
(("install MethylDackel \\$\\(prefix\\)" match)
(string-append "install -d $(prefix); " match)))
#t)))))
(inputs
`(("htslib" ,htslib)
`(("curl" ,curl) ; XXX: needed by libbigwig
("htslib" ,htslib-1.9)
("libbigwig" ,libbigwig)
("zlib" ,zlib)))
;; Needed for tests
(native-inputs

4
gnu/packages/chromium.scm
View File

@ -301,7 +301,7 @@
"/svntogit-packages/" revision "/trunk/" name))
(sha256 (base32 hash))))
(define %chromium-version "86.0.4240.193")
(define %chromium-version "86.0.4240.198")
(define %ungoogled-revision "b68e17f32e9eff56615a07b44e457835bb9460c6")
(define %debian-revision "debian/84.0.4147.105-1")
(define %arch-revision "2cbe439471932d30ff2c8ded6b3dfd51b312bbc9")
@ -455,7 +455,7 @@
%chromium-version ".tar.xz"))
(sha256
(base32
"0d55xkw3fygqpa3a5bvz7vqmzb0d9w1kis72h54cnwsqgw4xag90"))
"0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0"))
(modules '((guix build utils)))
(snippet (force ungoogled-chromium-snippet))))
(build-system gnu-build-system)

15
gnu/packages/cross-base.scm
View File

@ -539,19 +539,20 @@ and the cross tool chain."
;; FIXME: 'static-bash' should really be an input, not a native input, but
;; to do that will require building an intermediate cross libc.
(inputs '())
(inputs (if (hurd-triplet? target)
`(;; TODO: move to glibc in the next rebuild cycle
("hurd-mach-print.patch"
,(search-patch "glibc-hurd-mach-print.patch"))
("hurd-gettyent.patch"
,(search-patch "glibc-hurd-gettyent.patch")))
'()))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
,@(if (hurd-triplet? target)
`(("cross-mig"
,@(assoc-ref (package-native-inputs xheaders)
"cross-mig"))
;; TODO: move to glibc in the next rebuild cycle
("hurd-mach-print.patch"
,@(search-patches "glibc-hurd-mach-print.patch"))
("hurd-gettyent.patch"
,@(search-patches "glibc-hurd-gettyent.patch")))
"cross-mig")))
'())
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))

17
gnu/packages/debug.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@ -566,7 +566,7 @@ error reporting, better tracing, profiling, and a debugger.")
(define-public rr
(package
(name "rr")
(version "5.3.0")
(version "5.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -574,18 +574,19 @@ error reporting, better tracing, profiling, and a debugger.")
(commit version)))
(sha256
(base32
"1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64"))
"1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
;; The 'rr_exec_stub' is a static binary, which leads CMake to fail
;; with:
;;
;; file RPATH_CHANGE could not write new RPATH:
;;
;; with ‘file RPATH_CHANGE could not write new RPATH: ...’.
;; Clear CMAKE_INSTALL_RPATH to avoid that problem.
(list "-DCMAKE_INSTALL_RPATH="
;; Satisfy the ‘validate-runpath’ phase. This isn't a direct
;; consequence of clearing CMAKE_INSTALL_RPATH.
(string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "capnproto") "/lib")
,@(if (and (not (%current-target-system))
(member (%current-system)
'("x86_64-linux" "aarch64-linux")))
@ -613,7 +614,7 @@ error reporting, better tracing, profiling, and a debugger.")
("which" ,which)))
(inputs
`(("gdb" ,gdb)
("cpanproto" ,capnproto)
("capnproto" ,capnproto)
("python" ,python)
("python-pexpect" ,python-pexpect)))
(home-page "https://rr-project.org/")

4
gnu/packages/dns.scm
View File

@ -807,7 +807,7 @@ Extensions} (DNSSEC).")
(define-public knot
(package
(name "knot")
(version "3.0.1")
(version "3.0.2")
(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 "10mlzldxqvbaw78nghkr0s73rlbpz9wg16z14321xw2l9xfibkad"))
(base32 "1cinzz8p86fzknnr2z6b49yqr4y05mmnr0l2q3lwzcfhc6dcl8di"))
(modules '((guix build utils)))
(snippet
'(begin

6
gnu/packages/docker.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
@ -671,7 +671,7 @@ provisioning etc.")
(define-public cqfd
(package
(name "cqfd")
(version "5.1.0")
(version "5.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -680,7 +680,7 @@ provisioning etc.")
(file-name (git-file-name name version))
(sha256
(base32
"1xhydz01f2rrnw7rmnaxh3f3q1ariq7j2ig0i0w1p3wn10l3q0nv"))))
"1zqgznfl7slfrddfpy2pfmablbvyf7296d3b3vcprilqb93cc7li"))))
(build-system gnu-build-system)
(arguments
;; The test suite requires a docker daemon and connectivity.

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

@ -7469,63 +7469,68 @@ navigate code in a tree-like fashion.")
(license license:gpl3+)))
(define-public emacs-lispy
(package
(name "emacs-lispy")
(version "0.27.0")
(home-page "https://github.com/abo-abo/lispy")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/abo-abo/lispy")
(commit version)))
(sha256
(base32
"1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ace-window" ,emacs-ace-window)
("emacs-hydra" ,emacs-hydra)
("emacs-iedit" ,emacs-iedit)
("emacs-swiper" ,emacs-swiper)
("emacs-zoutline" ,emacs-zoutline)))
(native-inputs
`(("emacs-clojure-mode" ,emacs-clojure-mode)
("emacs-undercover" ,emacs-undercover)))
(arguments
`(#:include (cons* "^lispy-clojure\\.clj$"
"^lispy-python\\.py$"
%default-include)
#:phases
;; XXX: one failing test involving python evaluation
(modify-phases %standard-phases
(add-before 'check 'make-test-writable
(lambda _
(make-file-writable "lispy-test.el")
#t))
(add-before 'check 'remove-python-eval-test
(lambda _
(emacs-batch-edit-file "lispy-test.el"
`(progn
(progn
(goto-char (point-min))
(re-search-forward
"ert-deftest lispy-eval-python-str")
(beginning-of-line)
(kill-sexp))
(basic-save-buffer)))
#t)))
#:tests? #t
#:test-command '("make" "test")))
(synopsis "Modal S-expression editing")
(description
"Due to the structure of Lisp syntax it's very rare for the programmer
;; No release since May 2019 and tons of fixes have landed on master.
;; https://github.com/abo-abo/lispy/issues/513
(let ((commit "5c8a59ae7dd3dd342e7c86a8c0acdbd13e2989f3"))
(package
(name "emacs-lispy")
(version (git-version "0.27.0" "1" commit))
(home-page "https://github.com/abo-abo/lispy")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/abo-abo/lispy")
(commit commit)))
(sha256
(base32
"0738v9bp4dlxbwsnykvc35yh4dl4pvw25jl8srb7r3744ydvgyii"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ace-window" ,emacs-ace-window)
("emacs-hydra" ,emacs-hydra)
("emacs-iedit" ,emacs-iedit)
("emacs-swiper" ,emacs-swiper)
("emacs-zoutline" ,emacs-zoutline)))
(native-inputs
`(("which" ,which)
("emacs-clojure-mode" ,emacs-clojure-mode)
("emacs-undercover" ,emacs-undercover)))
(arguments
`(#:include (cons* "^lispy-clojure\\.clj$"
"^lispy-python\\.py$"
%default-include)
#:phases
;; XXX: Some failing tests
(modify-phases %standard-phases
(add-before 'check 'make-test-writable
(lambda _
(make-file-writable "lispy-test.el")
#t))
(add-before 'check 'remove-failing-test
(lambda _
(emacs-batch-edit-file "lispy-test.el"
`(progn
(dolist (test '("lispy-eval-python-str" "lispy--clojure-dot-object"))
(goto-char (point-min))
(re-search-forward
(concat "ert-deftest " test))
(beginning-of-line)
(kill-sexp))
(basic-save-buffer)))
#t)))
#:tests? #t
;; Set BEMACS to prevent the test suite from loading straight.el.
#:test-command '("make" "test" "BEMACS=emacs -batch")))
(synopsis "Modal S-expression editing")
(description
"Due to the structure of Lisp syntax it's very rare for the programmer
to want to insert characters right before \"(\" or right after \")\". Thus
unprefixed printable characters can be used to call commands when the point is
at one of these special locations. Lispy provides unprefixed keybindings for
S-expression editing when point is at the beginning or end of an
S-expression.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-lispyville
(let ((commit "1bf38088c981f5ab4ef2e2684952ab6af96378db")
@ -9504,8 +9509,8 @@ extensions.")
(license license:gpl3+)))
(define-public emacs-evil-collection
(let ((commit "910c1f4507d91a4790e26ddccf73ad1e5a12f68d")
(revision "17"))
(let ((commit "8c256263ad100fecd6246c6c55cbb19dab717c39")
(revision "18"))
(package
(name "emacs-evil-collection")
(version (git-version "0.0.3" revision commit))
@ -9517,7 +9522,7 @@ extensions.")
(file-name (git-file-name name version))
(sha256
(base32
"0bkx1bwgw1n3fbd95z8i32i1yvv8w8bgzsxsybm1lcgv1v23qn8l"))))
"0hz1yfv5g016dm99bwnibbmyhbi21qlc39ckd7p3s82az89hgf2n"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)
@ -10707,46 +10712,42 @@ Yasnippet.")
(license license:gpl2+))))
(define-public emacs-helm-system-packages
;; There won't be a new release after 1.10.1 until
;; https://github.com/emacs-helm/helm-system-packages/issues/25 is fixed,
;; and latest commits fix import issues with Guix.
(let ((commit "6572340f41611ef1991e9612d34d59130957ee4a"))
(package
(name "emacs-helm-system-packages")
(version (git-version "1.10.1" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-system-packages")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0mcz6vkpk12vsyd37xv1rbg4v442sxc3lj8yxskqg294xbdaclz4"))))
(build-system emacs-build-system)
(inputs
`(("recutils" ,recutils)))
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((recutils (assoc-ref inputs "recutils")))
;; Specify the absolute file names of the various
;; programs so that everything works out-of-the-box.
(substitute* "helm-system-packages-guix.el"
(("recsel") (string-append recutils "/bin/recsel")))))))))
(home-page "https://github.com/emacs-helm/helm-system-packages")
(synopsis "Helm System Packages is an interface to your package manager")
(description "List all available packages in Helm (with installed
(package
(name "emacs-helm-system-packages")
(version "1.10.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-system-packages")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa"))))
(build-system emacs-build-system)
(inputs
`(("recutils" ,recutils)))
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((recutils (assoc-ref inputs "recutils")))
;; Specify the absolute file names of the various
;; programs so that everything works out-of-the-box.
(substitute* "helm-system-packages-guix.el"
(("recsel") (string-append recutils "/bin/recsel")))))))))
(home-page "https://github.com/emacs-helm/helm-system-packages")
(synopsis "Helm System Packages is an interface to your package manager")
(description "List all available packages in Helm (with installed
packages displayed in their own respective face). Fuzzy-search, mark and
execute the desired action over any selections of packages: Install,
uninstall, display packages details (in Org Mode) or insert details at point,
find files owned by packages... And much more, including performing all the
above over the network.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-helm-org-rifle
(package
@ -11131,7 +11132,7 @@ abbreviation of the mode line displays (lighters) of minor modes.")
(define-public emacs-use-package
(package
(name "emacs-use-package")
(version "2.4")
(version "2.4.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -11140,7 +11141,7 @@ abbreviation of the mode line displays (lighters) of minor modes.")
(file-name (git-file-name name version))
(sha256
(base32
"1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"))))
"088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9"))))
(build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
@ -11174,14 +11175,14 @@ performance-oriented and tidy.")
(define-public emacs-leaf
(package
(name "emacs-leaf")
(version "4.2.5")
(version "4.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"leaf-" version ".tar"))
(sha256
(base32 "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw"))))
(base32 "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi"))))
(build-system emacs-build-system)
(home-page "https://github.com/conao3/leaf.el")
(synopsis "Simplify your init.el configuration, extended use-package")
@ -15008,6 +15009,34 @@ and @code{erc-send-modify-hook} to download and show images.")
(description "This package provides a list manipulation library for Emacs.")
(license license:gpl3+)))
(define-public emacs-parsec
;; Last release is too old (2016).
(let ((revision "0")
(commit "2cbbbc2254aa7bcaa4fb5e07c8c1bf2f381dba26"))
(package
(name "emacs-parsec")
(version (git-version "0.1.3" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cute-jumper/parsec.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1g1s8s45g3kkbi3h7w0pmadmzdswb64mkdvdpg2lihg341kx37gm"))))
(build-system emacs-build-system)
(home-page "https://github.com/cute-jumper/parsec.el")
(synopsis "Parser combinator library for Emacs Lisp")
(description
"Parsec is a parser combinator library for Emacs Lisp, similar to
Haskell's Parsec library. It contains most of the parser combinators in
Text.Parsec.Combinator, and more combinators can be added if necessary! Most
of the parser combinators have the same behavior as their Haskell
counterparts. Parsec also comes with a simple error handling mechanism so
that it can display an error message showing how the parser fails.")
(license license:gpl3+))))
(define-public emacs-move-text
(package
(name "emacs-move-text")
@ -19312,7 +19341,7 @@ correctly.")
(define-public emacs-helm-sly
(package
(name "emacs-helm-sly")
(version "0.4.1")
(version "0.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -19321,7 +19350,7 @@ correctly.")
(file-name (git-file-name name version))
(sha256
(base32
"0b2dx9nzh5233lkix3lz81c9cv626lk2hjpcjiikwvyp6y0q92ys"))))
"1690rxwwg69jbcjhi51nyjlx3gziaiaa8ssyal71gmc6schq2592"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
@ -19331,11 +19360,12 @@ correctly.")
(description "Helm-SLY defines a few new commands:
@itemize
@item helm-sly-list-connections: Yet another Lisp connection list with Helm.
@item: helm-sly-apropos: Yet another @command{apropos} with Helm.
@item helm-sly-mini: Like @command{helm-sly-list-connections}, but include an
extra source of Lisp-related buffers, like the events buffer or the scratch
buffer.
@item @code{helm-sly-list-connections}: Yet another Lisp connection list with
Helm.
@item @code{helm-sly-apropos}: Yet another @command{apropos} with Helm.
@item @code{helm-sly-mini}: Like @command{helm-sly-list-connections}, but
include an extra source of Lisp-related buffers, like the events buffer or the
scratch buffer.
@end itemize\n")
(license license:gpl3+)))

1
gnu/packages/emacs.scm
View File

@ -59,7 +59,6 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
#:use-module (gnu packages multiprecision)

6
gnu/packages/emulators.scm
View File

@ -61,7 +61,6 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages libedit)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
@ -477,14 +476,14 @@ V2.")
(define-public mednafen
(package
(name "mednafen")
(version "1.24.3")
(version "1.26.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://mednafen.github.io/releases/files/"
"mednafen-" version ".tar.xz"))
(sha256
(base32 "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"))))
(base32 "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -567,7 +566,6 @@ The following systems are supported:
(native-inputs `(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs `(("ffmpeg" ,ffmpeg)
("imagemagick" ,imagemagick)
("libedit" ,libedit)
("libelf" ,libelf)
("libepoxy" ,libepoxy)

21
gnu/packages/engineering.scm
View File

@ -754,8 +754,8 @@ fonts to gEDA.")
(license license:gpl2+))))
(define-public libfive
(let ((commit "6e39254e57c179459bb929df49ae96a6017a0ed6")
(revision "3"))
(let ((commit "8ca1b8685ef3fac7b64e66b10459b8421a3020c6")
(revision "4"))
(package
(name "libfive")
(version (git-version "0" revision commit))
@ -766,7 +766,7 @@ fonts to gEDA.")
(commit commit)))
(sha256
(base32
"0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim"))
"1c762cd70iv2b9av0l9lq0py9138y98wk3dirhdmil7jncdhvq98"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@ -784,7 +784,7 @@ fonts to gEDA.")
("libpng" ,libpng)
("qtbase" ,qtbase)
("eigen" ,eigen)
("guile" ,guile-2.2)))
("guile" ,guile-3.0)))
(home-page "https://libfive.com")
(synopsis "Tool for programmatic computer-aided design")
(description
@ -810,7 +810,14 @@ language.")
(file-name (git-file-name name version))
(sha256
(base32
"0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4"))))
"0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4"))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure.ac"
(("2\\.2") "3.0 2.2"))
#t))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -829,10 +836,10 @@ language.")
("pkg-config" ,pkg-config)))
(inputs
`(("mesa" ,mesa)
("guile" ,guile-2.2)))
("guile" ,guile-3.0)))
(propagated-inputs
`(("libfive" ,libfive)
("guile-opengl" ,guile-opengl)))
("guile-opengl" ,guile3.0-opengl)))
(home-page "https://gitlab.com/kavalogic-inc/inspekt3d/")
(synopsis "Lightweight 3D viewer for Libfive written in Guile Scheme")
(description

4
gnu/packages/enlightenment.scm
View File

@ -566,14 +566,14 @@ directories.
(define-public evisum
(package
(name "evisum")
(version "0.5.6")
(version "0.5.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.enlightenment.org/rel/apps/"
"evisum/evisum-" version ".tar.xz"))
(sha256
(base32 "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97"))))
(base32 "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"))))
(build-system meson-build-system)
(arguments
'(#:tests? #f)) ; no tests

15
gnu/packages/finance.scm
View File

@ -727,7 +727,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
(version "0.17.1.1")
(version "0.17.1.4")
(source
(origin
(method git-fetch)
@ -736,7 +736,7 @@ the Monero command line client and daemon.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"))))
(base32 "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@ -748,8 +748,6 @@ the Monero command line client and daemon.")
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtlocation" ,qtlocation)
("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2",qtquickcontrols2)
("qtsvg" ,qtsvg)
@ -761,7 +759,7 @@ the Monero command line client and daemon.")
"-DENABLE_PASS_STRENGTH_METER=ON"
(string-append "-DReadline_ROOT_DIR="
(assoc-ref %build-inputs "readline"))
"-DCMAKE_BUILD_TYPE=Release")
"-DCMAKE_PREFIX_PATH=\"\"")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'extract-monero-sources
@ -774,9 +772,6 @@ the Monero command line client and daemon.")
#t))
(add-after 'extract-monero-sources 'fix-build
(lambda _
(substitute* "monero/src/version.cpp.in"
(("@VERSION_IS_RELEASE@")
"false"))
(substitute* "src/version.js.in"
(("@VERSION_TAG_GUI@")
,version))
@ -1096,13 +1091,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ")
(define-public python-duniterpy
(package
(name "python-duniterpy")
(version "0.60.0")
(version "0.60.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "duniterpy" version))
(sha256
(base32 "0djn6ykmqbp8l2xbg6z8r7rkz9ijgygp2pr0gc6i7dsrlsqmjh32"))))
(base32 "1cwda5mk05zmpar7fpk9m4bziyz2s5pd0922h22fns5hw7vfsybh"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required

18
gnu/packages/fonts.scm
View File

@ -1761,24 +1761,30 @@ This package provides the TrueType fonts.")
(define-public font-jetbrains-mono
(package
(name "font-jetbrains-mono")
(version "2.002")
(version "2.210")
(source
(origin
(method url-fetch)
(uri
(string-append "https://download.jetbrains.com/fonts/"
"JetBrainsMono-" version ".zip"))
(string-append "https://github.com/JetBrains/JetBrainsMono/releases/"
"download/v" version "/JetBrainsMono-" version ".zip"))
(sha256
(base32 "0lcsl718jhkqgld1xqll7fsv8j968jlf292541fkqxwm8i5g93sn"))))
(base32 "19wbggnmqs3k1wdqy7l7imnx23g7hh159pl32nz3mzz8s8sqfdix"))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install-license-files 'change-directory-to-archive-root
;; Find the LICENSE file outside of the default subdirectory.
;; Find the license file outside of the default subdirectory.
(lambda _
(chdir "..")
#t)))))
#t))
(replace 'install-license-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(install-file "OFL.txt" doc)
#t))))))
(home-page "https://www.jetbrains.com/lp/mono/")
(synopsis "Mono typeface for developers")
(description

23
gnu/packages/freedesktop.scm
View File

@ -1385,17 +1385,22 @@ different sorts of messages in different formats.")
(define-public telepathy-idle
(package
(name "telepathy-idle")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://telepathy.freedesktop.org/releases/"
name "/" name "-" version ".tar.bz2"))
(sha256
(base32
"1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"))))
(version "0.2.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TelepathyIM/telepathy-idle")
(commit (string-append "telepathy-idle-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("xsltproc" ,libxslt)
("python" ,python-2)

39
gnu/packages/games.scm
View File

@ -54,6 +54,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2020 Lu hux <luhux@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -6590,7 +6591,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(define-public tome4
(package
(name "tome4")
(version "1.7.0")
(version "1.7.2")
(synopsis "Single-player, RPG roguelike game set in the world of Eyal")
(source
(origin
@ -6598,7 +6599,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-"
version ".tar.bz2"))
(sha256
(base32 "1fs0320n3ndd5kd6j9y22jsd1hbn356d4dr11kl3iy5ssix7832s"))
(base32 "1xa0pdn9pggwf7hnqb87ya2qxqhjahkdjwf8cr2y01gixgrkj9lv"))
(modules '((guix build utils)))
(snippet
'(begin
@ -6620,7 +6621,9 @@ Crowther & Woods, its original authors, in 1995. It has been known as
("vorbis" ,libvorbis)
("luajit" ,luajit)))
(arguments
`(#:make-flags '("CC=gcc" "config=release")
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target))
"config=release")
;; XXX: Building in parallel occasionally causes this build failure:
;; ../src/luajit2/src/host/buildvm.c:73:10: fatal error: buildvm_arch.h:
;; No such file or directory
@ -11940,3 +11943,33 @@ inside the Zenith Colony.")
X11 that won't set your CPU on fire, drain your laptop battery, or lower video
game FPS.")
(license license:unlicense))))
(define-public curseofwar
(package
(name "curseofwar")
(version "1.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/a-nikolaev/curseofwar")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure))))
(inputs `(("ncurses" ,ncurses)))
(home-page "https://a-nikolaev.github.io/curseofwar/")
(synopsis "Fast-paced action strategy game")
(description "Curse of War is a fast-paced action strategy game originally
implemented using ncurses user interface. An SDL graphical version is also
available.")
(license license:gpl3+)))

3
gnu/packages/glib.scm
View File

@ -698,8 +698,7 @@ useful for C++.")
(sha256
(base32
"0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"))
(patches (search-patches
"python2-pygobject-2-gi-info-type-error-domain.patch"))))
(patches (search-patches "python2-pygobject-2-deprecation.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)

13
gnu/packages/gnome.scm
View File

@ -11482,7 +11482,7 @@ and toolbars.")
(define-public setzer
(package
(name "setzer")
(version "0.3.5")
(version "0.3.6")
(source
(origin
(method git-fetch)
@ -11491,7 +11491,7 @@ and toolbars.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1qdffi6hws1a104bqzpaxbbjimjcwwmhgb3baiwh0w0b8nhbmhjl"))))
(base32 "118gip6bv4mcsq4nrai7kl0vmqqbyzpsd4ky9vhxb1x2cvg048s8"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@ -11980,17 +11980,17 @@ developed with the aim of being used with the Librem 5 phone.")
(define-public libgda
(package
(name "libgda")
(version "5.2.9")
(version "5.2.10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/GNOME/libgda.git/")
(commit "LIBGDA_5_2_9")))
(commit (string-append "LIBGDA_" (string-replace-substring
version "." "_")))))
(file-name (git-file-name name version))
(sha256
(base32
"122anbk15vj2dfxrw7s48b6zwlpp7cyppshxizynvf3zmc0ygw3j"))))
(base32 "18rg773gq9v3cdywpmrp12c5xyp97ir9yqjinccpi22sksb1kl8a"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-vala")
@ -12035,6 +12035,7 @@ developed with the aim of being used with the Librem 5 phone.")
("vala" ,vala)))
(native-inputs
`(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("glib:bin" ,glib "bin")
("gnome-common" ,gnome-common)

12
gnu/packages/gnuzilla.scm
View File

@ -550,8 +550,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
(define %icecat-version "78.4.0-guix0-preview1")
(define %icecat-build-id "20201019000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "78.4.1-guix0-preview1")
(define %icecat-build-id "20201110000000") ;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 +573,11 @@ from forcing GEXP-PROMISE."
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f"))))
"0q57b0s6xhps4dzp2cih4ajdj6hdas0j6jx0sidzj72vjzfywy0r"))))
(upstream-icecat-base-version "78.4.0") ; maybe older than base-version
(upstream-icecat-base-version "78.4.1") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "05adddbf87a5ee11de7cd90794c331a178bcfd5c")
(gnuzilla-commit "df2c2e22a0c6ea5b4dcaed52884223bfa6ffacde")
(gnuzilla-source
(origin
(method git-fetch)
@ -589,7 +589,7 @@ from forcing GEXP-PROMISE."
(string-take gnuzilla-commit 8)))
(sha256
(base32
"128h0gnn1adinjkfmskxdjkvyh60li8czlar2xdjn2b6myiq5yny"))))
"1y1p2g9xvqsg0im58lhdkrp8z0zlxw6i3qqplqdpbidmjwibmqjz"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.

9
gnu/packages/gpodder.scm
View File

@ -177,21 +177,20 @@ downloading episode status changes.")
(define-public python-podcastparser
(package
(name "python-podcastparser")
(version "0.6.5")
(version "0.6.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "podcastparser" version))
(sha256
(base32 "0k62ppg20i41gcc5x8ddjn7zbpy47hqpxzrq9257g2c71m4qw07b"))))
(base32 "0m24r2qhck0win44xfhxajbppkss4ha6am0042s0xyq3408883m3"))))
(native-inputs
`(("python-coverage" ,python-coverage)
("python-nose" ,python-nose)))
`(("python-pytest" ,python-pytest)))
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _ (invoke "nosetests"))))))
(lambda _ (invoke "pytest"))))))
(build-system python-build-system)
(home-page "http://gpodder.org/podcastparser")
(synopsis "Simplified and fast RSS parser Python library")

4
gnu/packages/gps.scm
View File

@ -184,7 +184,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
(define-public gpxsee
(package
(name "gpxsee")
(version "7.35")
(version "7.36")
(source (origin
(method git-fetch)
(uri (git-reference
@ -193,7 +193,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
(file-name (git-file-name name version))
(sha256
(base32
"1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5"))))
"18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"))))
(build-system gnu-build-system)
(arguments
'(#:phases

89
gnu/packages/graphics.scm
View File

@ -90,6 +90,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages stb)
#:use-module (gnu packages swig)
#:use-module (gnu packages tbb)
#:use-module (gnu packages upnp)
@ -855,26 +856,102 @@ other vector formats such as:
@end itemize")
(license license:gpl2+)))
(define-public dear-imgui
(package
(name "dear-imgui")
(version "1.79")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocornut/imgui")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0x26igynxp6rlpp2wfc5dr7x6yh583ajb7p23pgycn9vqikn318q"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "VERSION=" ,version))
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-debian-files
(lambda* (#:key inputs #:allow-other-keys)
(invoke "tar" "xvf" (assoc-ref inputs "debian-files"))
(apply invoke "patch" "-Np1" "-i"
(find-files "debian/patches" "\\.patch$"))
(substitute* "Makefile"
(("<stb/") "<") ; Guix doesn't use this subdirectory
;; Don't build or install the static library.
(("^all: .*") "all: $(SHLIB) $(PCFILE)"))
(substitute* (list "imgui.pc.in"
"Makefile")
;; Don't link against a non-existent library.
(("-lstb") ""))
#t))
(delete 'configure) ; no configure script
(replace 'install
;; The default ‘install’ target installs the static library. Don't.
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "install-shared" "install-header"
make-flags))))))
(native-inputs
`(("debian-files"
;; Upstream doesn't provide a build system. Use Debian's.
,(origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/i/imgui/imgui_"
version "+ds-1.debian.tar.xz"))
(sha256
(base32 "1xhk34pzpha6k5l2j150capq66y8czhmsi04ib09wvb34ahqxpby"))))
("pkg-config" ,pkg-config)))
(inputs
`(("freetype" ,freetype)
("stb-rect-pack" ,stb-rect-pack)
("stb-truetype" ,stb-truetype)))
(home-page "https://github.com/ocornut/imgui")
(synopsis "Immediate-mode C++ GUI library with minimal dependencies")
(description
"Dear ImGui is a @acronym{GUI, graphical user interface} library for C++.
It creates optimized vertex buffers that you can render anytime in your
3D-pipeline-enabled application. It's portable, renderer-agnostic, and
self-contained, without external dependencies.
Dear ImGui is aimed at content creation, visualization, and debugging tools as
opposed to average end-user interfaces. Hence it favors simplicity and
productivity but lacks certain features often found in higher-level libraries.
It is particularly suited to integration in game engine tooling, real-time 3D
applications, full-screen applications, and embedded platforms without standard
operating system features.")
(license license:expat))) ; some examples/ use the zlib licence
(define-public ogre
(package
(name "ogre")
(version "1.12.6")
(version "1.12.9")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OGRECave/ogre")
(commit (string-append "v" version))
(recursive? #t))) ;for Dear ImGui submodule
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1ap3krrl55hswv1n2r3ijf3xrb3kf9dnqvwyrc0fgnc7j7vd45sk"))))
(base32 "0b0pwh31nykrfhka6jqwclfx1pxzhj11vkl91951d63kwr5bbzms"))))
(build-system cmake-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'configure 'unpack-dear-imgui
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "dear-imgui-source")
"../dear-imgui-source")
#t))
(add-before 'configure 'pre-configure
;; CMakeLists.txt forces CMAKE_INSTALL_RPATH value. As
;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As
;; a consequence, we cannot suggest ours in configure flags. Fix
;; it.
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -888,6 +965,7 @@ other vector formats such as:
(string-append out "/lib/OGRE"))
";")))
(list (string-append "-DCMAKE_INSTALL_RPATH=" runpath)
"-DIMGUI_DIR=../dear-imgui-source"
"-DOGRE_BUILD_DEPENDENCIES=OFF"
"-DOGRE_BUILD_TESTS=TRUE"
"-DOGRE_INSTALL_DOCS=TRUE"
@ -895,6 +973,7 @@ other vector formats such as:
"-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE"))))
(native-inputs
`(("boost" ,boost)
("dear-imgui-source" ,(package-source dear-imgui))
("doxygen" ,doxygen)
("googletest" ,googletest-1.8)
("pkg-config" ,pkg-config)))

20
gnu/packages/julia.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,8 +52,8 @@
#:use-module (ice-9 match))
(define libuv-julia
(let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1")
(revision "1"))
(let ((commit "1fcc6d66f9df74189c74d3d390f02202bb7db953")
(revision "2"))
;; When upgrading Julia, also upgrade this. Get the commit from
;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version
(package
@ -67,7 +68,7 @@
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0dn3v6fdp1z382pqg3nhjzk60l61ky9b65mfgaj29fv2da95rwjs"))))
"040l7f1hk7xyza11sry5cj4fhw05na949865axqqhxnifdvnmfji"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments libuv)
@ -104,7 +105,7 @@
"/deps/patches/" name ".patch"))
(define (julia-patch name sha)
(let ((version "1.5.2"))
(let ((version "1.5.3"))
(origin (method url-fetch)
(uri (julia-patch-url version name))
(sha256 (base32 sha))
@ -195,14 +196,15 @@
"1bpa0fcqpa3ai3hm8mz0p13bf76fsq53wsfcx5qw302zh22108xr"))))
(arguments
`(#:make-flags
(list "CC=gcc")
(list (string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'check 'set-ld-library-path
(lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref inputs "zlib") "/lib"))))
(string-append (assoc-ref (or native-inputs inputs) "zlib")
"/lib"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -221,7 +223,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(define-public julia
(package
(name "julia")
(version "1.5.2")
(version "1.5.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -229,7 +231,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
version "/julia-" version ".tar.gz"))
(sha256
(base32
"08wazf3f1lb2c2c5s700kyak8llfqwki8xlnqyrbwmwxjj801p2n"))
"1zmim82x9kkdcgn0cdi01hmzi59zbszy1sqlygb86xq4hc1n66dy"))
(patches
(search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"))))
(build-system gnu-build-system)

24
gnu/packages/libffi.scm
View File

@ -1,8 +1,8 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -55,7 +55,25 @@
(arguments
`(;; Prevent the build system from passing -march and -mtune to the
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")))
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")
;; TODO: Inline patch on next rebuild cycle.
,@(if (string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'apply-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs
"powerpc-patch")))
(invoke "patch" "--batch" "-p1"
"-i" patch))))))
'())))
(inputs
(if (string-prefix? "powerpc-" (or (%current-target-system)
(%current-system)))
`(("powerpc-patch" ,@(search-patches
"libffi-3.3-powerpc-fixes.patch")))
'()))
(outputs '("out" "debug"))
(synopsis "Foreign function call interface library")
(description

45
gnu/packages/linux.scm
View File

@ -352,15 +352,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernel. That is, the most recently released major
;; version.
(define-public linux-libre-5.9-version "5.9.6")
(define-public linux-libre-5.9-version "5.9.8")
(define deblob-scripts-5.9
(linux-libre-deblob-scripts
linux-libre-5.9-version
(base32 "1l0iw2lp6alk0a8nvdafklyks83iiyw4b2r5xif84z47qfbydsis")
(base32 "0is78bvpx6mrhibpspz4iqnsa1xplh11q1cnalkkm4hpsiy0fi4g")))
(base32 "0wp0mx5d2qhv7brc595qj34phiaxz9z5gf26w5369nh9mll5cbw6")))
(define-public linux-libre-5.9-pristine-source
(let ((version linux-libre-5.9-version)
(hash (base32 "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc")))
(hash (base32 "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.9)))
@ -368,20 +368,20 @@ 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.75")
(define-public linux-libre-5.4-version "5.4.77")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
(base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25")
(base32 "1h6gbc9cfhb7dqx669iq26a23whka6km5av0ysk61aaz2z57vkrk")))
(base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj")))
(hash (base32 "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.155")
(define-public linux-libre-4.19-version "4.19.157")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@ -389,12 +389,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb")))
(hash (base32 "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.204")
(define-public linux-libre-4.14-version "4.14.206")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@ -402,12 +402,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy")))
(hash (base32 "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.241")
(define-public linux-libre-4.9-version "4.9.243")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
@ -415,12 +415,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4")))
(hash (base32 "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.241")
(define-public linux-libre-4.4-version "4.4.243")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
@ -428,7 +428,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij")))
(hash (base32 "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -4447,7 +4447,7 @@ arrays when needed.")
(define-public multipath-tools
(package
(name "multipath-tools")
(version "0.8.4")
(version "0.8.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -4456,8 +4456,7 @@ arrays when needed.")
(file-name (git-file-name name version))
(sha256
(base32
"14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn"))
(patches (search-patches "multipath-tools-sans-systemd.patch"))
"0gipg0z79h76j0f449cx4wcrfsv69ravjlpphsac11h302g3nrvg"))
(modules '((guix build utils)))
(snippet
'(begin
@ -4515,6 +4514,18 @@ arrays when needed.")
(("-lmultipath -lcmocka")
"-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))
#t))
(add-after 'unpack 'skip-failing-tests
(lambda _
;; This test and the module's setup() test an arbitrary block
;; device node name, but the build environment has none.
(substitute* "tests/devt.c"
(("return get_one_devt.*") "return 0;\n")
(("cmocka_unit_test\\(test_devt2devname_devt_good\\),") ""))
;; The above triggers -Werror=unused-function. Ignore it.
(substitute* "tests/Makefile"
(("CFLAGS \\+= " match)
(string-append match "-Wno-error=unused-function ")))
#t))
(delete 'configure)))) ; no configure script
(native-inputs
`(("perl" ,perl)

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

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@ -2192,6 +2192,12 @@ non-consing thread safe queues and fibonacci priority queues.")
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-arm-support
(lambda _
;; This is apparently deprecated since libffi-3.3.
(substitute* "libffi/libffi-types.lisp"
(("\\\(\\\(:unix64.*") ")\n"))
#t))
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libffi/libffi.lisp"

114
gnu/packages/llvm.scm
View File

@ -16,6 +16,7 @@
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -602,11 +603,10 @@ of programming tools as well as libraries with equivalent functionality.")
(sha256
(base32
"16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"))
(patch-flags '("-p2"))
(patches (search-patches
"llvm-9-fix-bitcast-miscompilation.patch"
"llvm-9-fix-scev-miscompilation.patch"
"llvm-9-fix-lpad-miscompilation.patch"))))))
"llvm-9-fix-bitcast-miscompilation.patch"
"llvm-9-fix-scev-miscompilation.patch"
"llvm-9-fix-lpad-miscompilation.patch"))))))
(define-public clang-runtime-9
(clang-runtime-from-llvm
@ -1045,48 +1045,96 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public python-llvmlite
(package
(name "python-llvmlite")
(version "0.30.0")
(version "0.34.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "llvmlite" version))
(sha256
(base32
"01wspdc0xhnydl66jyhyr4ii16h3fnw6mjihiwnnxdxg9j6kkajf"))))
"0qqzs6h34002ig2jn31vk08q9hh5kn84lhmv4bljz3yakg8y0gph"))))
(build-system python-build-system)
(arguments
;; FIXME: One test fails unable to find libm.so
;; https://github.com/numba/llvmlite/issues/537
`(#:tests? #f))
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-reference-to-llvmlite.so
;; ctypes.CDLL uses dlopen to load libllvmlite.so, which
;; fails, so locate it by its absolute path. Change it in
;; ffi.py, not utils.py, because setup.py relies on the
;; output of get_library_name for proper installation.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(libllvmlite.so (string-append out "/lib/python"
,(version-major+minor
(package-version python))
"/site-packages/llvmlite/"
"binding/libllvmlite.so")))
(substitute* "llvmlite/binding/ffi.py"
(("_lib_name = get_library_name\\(\\)")
(format #f "_lib_name = ~s" libllvmlite.so)))
#t)))
(add-after 'unpack 'skip-failing-tests
(lambda _
(substitute* "llvmlite/tests/test_binding.py"
((" def test_libm\\(self\\).*" all)
(string-append " @unittest.skip('Fails on Guix')\n" all)))
#t))
(add-before 'build 'set-compiler/linker-flags
(lambda* (#:key inputs #:allow-other-keys)
(let ((llvm (assoc-ref inputs "llvm")))
;; Refer to ffi/Makefile.linux.
(setenv "CPPFLAGS" "-fPIC")
(setenv "LDFLAGS" (string-append "-Wl,-rpath="
llvm "/lib"))
#t))))))
(inputs
`(("llvm"
,(let ((patches-commit "486edd5fb2a6667feb5c865f300c0da73785434a"))
(package
(inherit llvm-7)
(source
(origin
(inherit (package-source llvm-7))
(patches
,(let* ((patches-commit "061ab39e1d4591f3aa842458252a19ad01858167")
(patch-uri (lambda (name)
(string-append
"https://raw.githubusercontent.com/numba/"
"llvmlite/" patches-commit "/conda-recipes/"
name)))
(patch-origin (lambda (name hash)
(origin
(method url-fetch)
(uri (patch-uri name))
(sha256 (base32 hash)))))
(arch-independent-patches
(list
(patch-origin
"partial-testing.patch"
"1cwy4jsmijd838q0bylxl77vrwrb7ksijfly5062ay32303jmj86")
(patch-origin
"0001-Revert-Limit-size-of-non-GlobalValue-name.patch"
"0n4k7za0smx6qwdipsh6x5lm7bfvzzb3p9r8q1zq1dqi4na21295"))))
(if (string=? "aarch64-linux" (%current-system))
(package
(inherit llvm-9)
(source
(origin
(method url-fetch)
(uri (string-append
"https://raw.githubusercontent.com/numba/"
"llvmlite/" patches-commit "/conda-recipes/"
"D47188-svml-VF.patch"))
(sha256
(base32
"0wxhgb61k17f0zg2m0726sf3hppm41f8jar2kkg2n8sl5cnjj9mr")))
(inherit (package-source llvm-9))
(patches
`(,(patch-origin
"intel-D47188-svml-VF_LLVM9.patch"
"1f9ld7wc8bn4gbvdsmk07w1rq371h42vy05rxsq9a22f57rljqbd")
,@arch-independent-patches
,@(origin-patches (package-source llvm-9)))))))
(package
(inherit llvm-10)
(source
(origin
(method url-fetch)
(uri (string-append
"https://raw.githubusercontent.com/numba/"
"llvmlite/" patches-commit "/conda-recipes/"
"twine_cfg_undefined_behavior.patch"))
(sha256
(base32
"07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))))))))))))
(home-page "http://llvmlite.pydata.org")
(inherit (package-source llvm-10))
(patches
`(,(patch-origin
"intel-D47188-svml-VF.patch"
"0n46qjwfl7i12bl7wp0cyxl277axfvaaz5lxx5kdlgwjcpa582dg")
,(patch-origin
"expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch"
"0jxhjkkwwi1cy898l2n57l73ckpw0v73lqnrifp7r1mwpsh624nv")
,@arch-independent-patches
,@(origin-patches (package-source llvm-10))))))))))))
(home-page "https://llvmlite.pydata.org")
(synopsis "Wrapper around basic LLVM functionality")
(description
"This package provides a Python binding to LLVM for use in Numba.")

8
gnu/packages/lua.scm
View File

@ -883,7 +883,7 @@ on numbers.")
(define-public lua-resty-core
(package
(name "lua-resty-core")
(version "0.1.17")
(version "0.1.18")
(source (origin
(method git-fetch)
(uri (git-reference
@ -892,7 +892,7 @@ on numbers.")
(file-name (git-file-name name version))
(sha256
(base32
"11fyli6yrg7b91nv9v2sbrc6y7z3h9lgf4lrrhcjk2bb906576a0"))))
"1c58hykwpg5zqbyhrcb703pzwbkih409v3bh2gady6z2kj9q32dw"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -920,7 +920,7 @@ on numbers.")
(define-public lua-resty-lrucache
(package
(name "lua-resty-lrucache")
(version "0.09")
(version "0.10")
(source (origin
(method git-fetch)
(uri (git-reference
@ -929,7 +929,7 @@ on numbers.")
(file-name (git-file-name name version))
(sha256
(base32
"1mwiy55qs8bija1kpgizmqgk15ijizzv4sa1giaz9qlqs2kqd7q2"))))
"1bsc54v1rvxmkwg7a2c01p192lvw5g576f589is8fy1m1c6v4ap8"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))

122
gnu/packages/mail.scm
View File

@ -28,7 +28,7 @@
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2019, 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;; Copyright © 2020 Eric Brown <ecbrown@ericcbrown.com>
@ -748,6 +748,44 @@ MIME-encoded email package.")
(home-page "https://github.com/inflex/ripMIME")
(license license:bsd-3))))
(define-public mailcap
(let* ((version "2.1.49")
(tag ;; mailcap tags their releases like this: rMajor-minor-patch
(string-append "r" (string-join (string-split version #\.) "-"))))
(package
(name "mailcap")
(version version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://pagure.io/mailcap.git")
(commit tag)))
(file-name (git-file-name name version))
(sha256
(base32
"0ck1fw6gqn51phcfakhfpfq1yziv3gnmgjvswzhj9x0p162n6alj"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'install 'set-dest-dir
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "DESTDIR" out)
(substitute* "Makefile"
(("/usr") "")) ; This allows the man page to install.
#t))))))
(native-inputs
`(("python" ,python))) ; for tests
(synopsis "MIME type associations for file types")
(description
"This package provides MIME type associations for file types.")
(home-page "https://pagure.io/mailcap")
(license (list license:expat ; mailcap.5
license:public-domain))))) ; mailcap and mime.types
(define-public bogofilter
(package
(name "bogofilter")
@ -966,7 +1004,7 @@ attachments, create new maildirs, and so on.")
(define-public alot
(package
(name "alot")
(version "0.5.1")
(version "0.9.1")
(source (origin
(method url-fetch)
;; package author intends on distributing via github rather
@ -977,27 +1015,47 @@ attachments, create new maildirs, and so on.")
(file-name (string-append "alot-" version ".tar.gz"))
(sha256
(base32
"0wax30hjzmkqfml7hig1dqw1v1y63yc0cgbzl96x58b9h2ggqx3a"))))
"1r0x3n2fxi6sfq3paz8a4vn2mmyqaznj1207wa7jl0ixnjqilb7f"))))
(build-system python-build-system)
(arguments
`(;; python 3 is currently unsupported, more info:
;; https://github.com/pazz/alot/blob/master/docs/source/faq.rst
#:python ,python-2))
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((gnupg (assoc-ref inputs "gnupg")))
(substitute* "tests/test_crypto.py"
(("gpg2") (string-append gnupg "/bin/gpg")))
#t)))
(add-before 'check 'disable-failing-tests
;; FIXME: Investigate why these tests are failing.
(lambda _
(substitute* "tests/test_helper.py"
(("def test_env_set") "def _test_env_set"))
(substitute* "tests/commands/test_global.py"
(("def test_no_spawn_no_stdin_attached")
"def _test_no_spawn_no_stdin_attached"))
#t)))))
(native-inputs
`(("python2-mock" ,python2-mock)))
`(("procps" ,procps)
("python-mock" ,python-mock)))
(inputs
`(("python2-magic" ,python2-magic)
("python2-configobj" ,python2-configobj)
("python2-twisted" ,python2-twisted)
("python2-urwid" ,python2-urwid)
("python2-urwidtrees" ,python2-urwidtrees)
("python2-pygpgme" ,python2-pygpgme)
("python2-notmuch" ,python2-notmuch)))
`(("gnupg" ,gnupg)
("python-magic" ,python-magic)
("python-configobj" ,python-configobj)
("python-twisted" ,python-twisted)
("python-service-identity" ,python-service-identity)
("python-urwid" ,python-urwid)
("python-urwidtrees" ,python-urwidtrees)
("python-gpg" ,python-gpg)
("python-notmuch" ,python-notmuch)))
(home-page "https://github.com/pazz/alot")
(synopsis "Command-line MUA using @code{notmuch}")
(synopsis "Command-line MUA using Notmuch")
(description
"Alot is an experimental terminal mail user agent (@dfn{MUA}) based on
@code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.")
"Alot is a terminal-based mail user agent based on the Notmuch mail
indexer. It is written in Python using the @code{urwid} toolkit and features
a modular and command prompt driven interface to provide a full mail user
agent (@dfn{MUA}) experience as an alternative to the Emacs mode shipped with
Notmuch.")
(license license:gpl3+)))
(define-public notifymuch
@ -1208,14 +1266,14 @@ and search library.")
(define-public muchsync
(package
(name "muchsync")
(version "5")
(version "6")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.muchsync.org/src/"
"muchsync-" version ".tar.gz"))
(sha256
(base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"))))
(base32 "1s799kx16nm5ry1fcqcc0grgxrwnnp4cnzd0hzwbkvc5v2sf6g8b"))))
(build-system gnu-build-system)
(native-inputs
`(("pandoc" ,pandoc)
@ -1235,7 +1293,7 @@ broadband. Muchsync supports arbitrary pairwise synchronization among
replicas. A version-vector-based algorithm allows it to exchange only the
minimum information necessary to bring replicas up to date regardless of which
pairs have previously synchronized.")
(license license:gpl2+)))
(license license:gpl2+))) ; with OpenSSL libcrypto exception
(define-public getmail
(package
@ -1393,14 +1451,14 @@ addons which can add many functionalities to the base client.")
(define-public msmtp
(package
(name "msmtp")
(version "1.8.12")
(version "1.8.13")
(source
(origin
(method url-fetch)
(uri (string-append "https://marlam.de/msmtp/releases/"
"/msmtp-" version ".tar.xz"))
(sha256
(base32 "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"))))
(base32 "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd"))))
(build-system gnu-build-system)
(inputs
`(("libsecret" ,libsecret)
@ -2881,14 +2939,13 @@ messages with @acronym{DKIM, DomainKeys Identified Mail} (RFC 4871).")
(define-public mailman
(package
(name "mailman")
(version "3.3.1")
(version "3.3.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mailman" version))
(sha256
(base32
"0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq"))))
(base32 "0a5ckbf8hc3y28b7p5psp0d4bxk601jlr5pd3hhh545xd8d9f0dg"))))
(build-system python-build-system)
(propagated-inputs
`(("gunicorn" ,gunicorn)
@ -3424,20 +3481,23 @@ the use of a local MTA such as Sendmail.")
(define-public afew
(package
(name "afew")
(version "1.2.0")
(version "3.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "afew" version))
(sha256
(base32
"121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r"))))
"0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"))))
(build-system python-build-system)
(inputs
`(("python-chardet" ,python-chardet)
`(("notmuch" ,notmuch)
("python-chardet" ,python-chardet)
("python-dkimpy" ,python-dkimpy)
("python-notmuch" ,python-notmuch)))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
`(("python-freezegun" ,python-freezegun)
("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/afewmail/afew")
(synopsis "Initial tagging script for notmuch mail")
(description "afew is an initial tagging script for notmuch mail. It
@ -3888,7 +3948,7 @@ DKIM and ARC sign messages and output the corresponding signature headers.")
(define-public python-aiosmtpd
(package
(name "python-aiosmtpd")
(version "1.2.1")
(version "1.2.2")
(source
(origin
(method git-fetch)
@ -3896,7 +3956,7 @@ DKIM and ARC sign messages and output the corresponding signature headers.")
(url "https://github.com/aio-libs/aiosmtpd")
(commit version)))
(sha256
(base32 "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7"))
(base32 "0083d6nf75xv8nq1il6jabz36v6c452svy4p402csxwwih5pw6sk"))
(file-name (git-file-name name version))))
(build-system python-build-system)
(arguments

1
gnu/packages/mate.scm
View File

@ -903,7 +903,6 @@ icons on the MATE desktop. It works on local and remote file systems.")
("dbus-glib" ,dbus-glib)
("gajim" ,gajim) ;runtime only?
("gtk+" ,gtk+)
("imagemagick" ,imagemagick)
("graphicsmagick" ,graphicsmagick)
("mate-desktop" ,mate-desktop)
("pidgin" ,pidgin) ;runtime only?

19
gnu/packages/maths.scm
View File

@ -2470,7 +2470,18 @@ scientific applications modeled by partial differential equations.")
(uri (pypi-uri "petsc4py" version))
(sha256
(base32
"1rm1qj5wlkhxl39by9n78lh3gbmii31wsnb8j1rr5hvfr5xgbx2q"))))
"1rm1qj5wlkhxl39by9n78lh3gbmii31wsnb8j1rr5hvfr5xgbx2q"))
(modules '((guix build utils)))
(snippet
'(begin
;; Ensure source file is regenerated in the build phase.
(delete-file "src/petsc4py.PETSc.c")
;; Remove legacy GC code. See
;; https://bitbucket.org/petsc/petsc4py/issues/125.
(substitute* "src/PETSc/cyclicgc.pxi"
((".*gc_refs.*") "" )
((".*PyGC_Head.*") ""))
#t))))
(build-system python-build-system)
(arguments
`(#:phases
@ -2482,6 +2493,8 @@ scientific applications modeled by partial differential equations.")
#t))
(add-before 'check 'mpi-setup
,%openmpi-setup))))
(native-inputs
`(("python-cython" ,python-cython)))
(inputs
`(("petsc" ,petsc-openmpi)
("python-numpy" ,python-numpy)))
@ -2895,14 +2908,14 @@ easy-to-write markup language for mathematics.")
(define-public superlu
(package
(name "superlu")
(version "5.2.1")
(version "5.2.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://portal.nersc.gov/project/sparse/superlu/"
"superlu_" version ".tar.gz"))
(sha256
(base32 "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8"))
(base32 "13520vk6fqspyl22cq4ak2jh3rlmhja4czq56j75fdx65fkk80s7"))
(modules '((guix build utils)))
(snippet
;; Replace the non-free implementation of MC64 with a stub adapted

8
gnu/packages/messaging.scm
View File

@ -931,7 +931,7 @@ Encryption to Gajim.")
(define-public dino
(package
(name "dino")
(version "0.1.0")
(version "0.2.0")
(outputs '("out" "debug"))
(source
(origin
@ -940,7 +940,7 @@ Encryption to Gajim.")
version "/dino-" version ".tar.gz"))
(sha256
(base32
"0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
"0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f
@ -2373,7 +2373,7 @@ support for high performance Telegram Bot creation.")
(define-public chatty
(package
(name "chatty")
(version "0.1.16")
(version "0.1.17")
(source (origin
(method git-fetch)
(uri (git-reference
@ -2382,7 +2382,7 @@ support for high performance Telegram Bot creation.")
(file-name (git-file-name name version))
(sha256
(base32
"085hb3ii1cy0jb3f0mim25v5r5w3gpfsdpjid5dmrpw4gi88aa2x"))))
"0ba1rw8a3vif9k3570hxjfm25vqys3vk3f6g8z5irklwq4bi6lmn"))))
(build-system meson-build-system)
(arguments
'(#:phases

4
gnu/packages/mpd.scm
View File

@ -104,7 +104,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
(define-public mpd
(package
(name "mpd")
(version "0.22.2")
(version "0.22.3")
(source (origin
(method url-fetch)
(uri
@ -113,7 +113,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
"/mpd-" version ".tar.xz"))
(sha256
(base32
"0dldj7r58a3zxbvhs188p8mb4wcffnp66kpnglm4vwcp0wpmn6rn"))))
"1kvcarqijyw07bdqszjsn62plmncaid5az0q542p6rsygc1i501k"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=enabled")))

6
gnu/packages/networking.scm
View File

@ -136,7 +136,6 @@
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml)
@ -872,6 +871,7 @@ transparently check connection attempts against an access control list.")
(base32
"18km71p77jm1w7wly2a5mxvphjb0f2l6s08cg382x55f6zdqb4lx"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--disable-static")))
(home-page "https://zeromq.org")
(synopsis "Library for message-based applications")
(description
@ -1823,7 +1823,7 @@ private (reserved).")
(define-public perl-net-dns
(package
(name "perl-net-dns")
(version "1.27")
(version "1.28")
(source
(origin
(method url-fetch)
@ -1834,7 +1834,7 @@ private (reserved).")
(string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-"
version ".tar.gz")))
(sha256
(base32 "0hdx5ajr34f39rycai090y9w8gq9v0shgziynaaj0rzk21vjfdpk"))))
(base32 "0kh2qbhxv005pqb35mdk2bld7cg7xnxl12qvdwv30sgd91aqica7"))))
(build-system perl-build-system)
(inputs
`(("perl-digest-hmac" ,perl-digest-hmac)))

0
gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch → gnu/packages/patches/audiofile-check-number-of-coefficients.patch
View File

0
gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch → gnu/packages/patches/audiofile-division-by-zero.patch
View File

0
gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch → gnu/packages/patches/audiofile-function-signature.patch
View File

0
gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch → gnu/packages/patches/audiofile-multiply-overflow.patch
View File

0
gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch → gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch
View File

4
gnu/packages/patches/icecat-makeicecat.patch
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 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-echo -n 1978eedd975b1cf95bd4a04b2381560d1ad9a4223032717f23fac26e3458a760 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 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+# echo -n 1978eedd975b1cf95bd4a04b2381560d1ad9a4223032717f23fac26e3458a760 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+#
+# echo Extracting Firefox tarball
+# tar -xf firefox-${FFVERSION}esr.source.tar.xz

138
gnu/packages/patches/libffi-3.3-powerpc-fixes.patch 100644
View File

@ -0,0 +1,138 @@
This is a combination of the following 4 commits:
https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd.patch
https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326.patch
https://github.com/libffi/libffi/commit/e50b9ef8b910fa642ef158f6642e60d54d7ad740.patch
https://github.com/libffi/libffi/commit/4d6d2866ae43e55325e8ee96561221804602cd7a.patch
From 2dbfa92a95e3bacabca431b89d2a5925e48a0e40 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Thu, 28 Nov 2019 12:42:41 +0000
powerpc: fix build failure on power7 and older (#532)
Build failure looks as:
```
libtool: compile: powerpc-unknown-linux-gnu-gcc \
-O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ...
In file included from src/powerpc/ffi.c:33:
src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
65 | typedef __int128 float128;
| ^~~~~~~~
```
The fix avoids using __int128 in favour of aligned char[16].
Closes: https://github.com/libffi/libffi/issues/531
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Address platforms with no __int128.
powerpc64: Use memcpy to help platforms with no __int128. (#534)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Update powerpc sysv assembly for ffi_powerpc.h changes (#541)
Some of the flag bits were moved when adding powerpc64 vector support.
Fixes #536
---
src/powerpc/ffi_linux64.c | 12 ++++++------
src/powerpc/ffi_powerpc.h | 2 +-
src/powerpc/sysv.S | 12 +++++-------
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c
index de0d033..4d50878 100644
--- a/src/powerpc/ffi_linux64.c
+++ b/src/powerpc/ffi_linux64.c
@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack)
if (next_arg.ul == gpr_end.ul)
next_arg.ul = rest.ul;
if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs)
- *vec_base.f128++ = **p_argv.f128;
+ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128));
else
- *next_arg.f128 = **p_argv.f128;
+ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128));
if (++next_arg.f128 == gpr_end.f128)
next_arg.f128 = rest.f128;
vecarg_count++;
@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack)
{
if (vecarg_count < NUM_VEC_ARG_REGISTERS64
&& i < nfixedargs)
- *vec_base.f128++ = *arg.f128++;
+ memcpy (vec_base.f128++, arg.f128, sizeof (float128));
else
- *next_arg.f128 = *arg.f128++;
+ memcpy (next_arg.f128, arg.f128++, sizeof (float128));
if (++next_arg.f128 == gpr_end.f128)
next_arg.f128 = rest.f128;
vecarg_count++;
@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif,
do
{
if (pvec < end_pvec && i < nfixedargs)
- *to.f128 = *pvec++;
+ memcpy (to.f128, pvec++, sizeof (float128));
else
- *to.f128 = *from.f128;
+ memcpy (to.f128, from.f128, sizeof (float128));
to.f128++;
from.f128++;
}
diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
index 5ee2a70..8e2f2f0 100644
--- a/src/powerpc/ffi_powerpc.h
+++ b/src/powerpc/ffi_powerpc.h
@@ -62,7 +62,7 @@ typedef _Float128 float128;
#elif defined(__FLOAT128__)
typedef __float128 float128;
#else
-typedef __int128 float128;
+typedef char float128[16] __attribute__((aligned(16)));
#endif
void FFI_HIDDEN ffi_closure_SYSV (void);
diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S
index 1474ce7..df97734 100644
--- a/src/powerpc/sysv.S
+++ b/src/powerpc/sysv.S
@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV)
bctrl
/* Now, deal with the return value. */
- mtcrf 0x01,%r31 /* cr7 */
+ mtcrf 0x03,%r31 /* cr6-cr7 */
bt- 31,L(small_struct_return_value)
bt- 30,L(done_return_value)
#ifndef __NO_FPRS__
bt- 29,L(fp_return_value)
#endif
stw %r3,0(%r30)
- bf+ 28,L(done_return_value)
+ bf+ 27,L(done_return_value)
stw %r4,4(%r30)
- mtcrf 0x02,%r31 /* cr6 */
- bf 27,L(done_return_value)
+ bf 26,L(done_return_value)
stw %r5,8(%r30)
stw %r6,12(%r30)
/* Fall through... */
@@ -145,10 +144,9 @@ L(done_return_value):
#ifndef __NO_FPRS__
L(fp_return_value):
.cfi_restore_state
- bf 28,L(float_return_value)
+ bf 27,L(float_return_value)
stfd %f1,0(%r30)
- mtcrf 0x02,%r31 /* cr6 */
- bf 27,L(done_return_value)
+ bf 26,L(done_return_value)
stfd %f2,8(%r30)
b L(done_return_value)
L(float_return_value):
--
2.26.0

8
gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch
View File

@ -36,8 +36,8 @@ Differential Revision: https://reviews.llvm.org/D70844
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
index 2c9ba203fbf3..0af3de300e77 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
--- llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -18,6 +18,7 @@
#include "llvm/IR/DIBuilder.h"
#include "llvm/IR/PatternMatch.h"
@ -158,8 +158,8 @@ index 2c9ba203fbf3..0af3de300e77 100644
diff --git a/llvm/test/Transforms/InstCombine/cast.ll b/llvm/test/Transforms/InstCombine/cast.ll
index b6d1eda0601d..3ce8de033422 100644
--- a/llvm/test/Transforms/InstCombine/cast.ll
+++ b/llvm/test/Transforms/InstCombine/cast.ll
--- llvm/test/Transforms/InstCombine/cast.ll
+++ llvm/test/Transforms/InstCombine/cast.ll
@@ -824,7 +824,7 @@ define i64 @test59(i8 %A, i8 %B) {
define <3 x i32> @test60(<4 x i32> %call4) {

8
gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch
View File

@ -15,8 +15,8 @@ PR45261
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
index 5ac3606dc662..2638b1e8a05c 100644
--- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
--- llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -225,6 +225,21 @@ static bool isRegUsedByPhiNodes(unsigned DefReg,
return false;
}
@ -50,8 +50,8 @@ index 5ac3606dc662..2638b1e8a05c 100644
}
diff --git a/llvm/test/CodeGen/X86/sink-local-value.ll b/llvm/test/CodeGen/X86/sink-local-value.ll
index b0e511ac1189..f7d861ac9b6c 100644
--- a/llvm/test/CodeGen/X86/sink-local-value.ll
+++ b/llvm/test/CodeGen/X86/sink-local-value.ll
--- llvm/test/CodeGen/X86/sink-local-value.ll
+++ llvm/test/CodeGen/X86/sink-local-value.ll
@@ -145,6 +145,42 @@ try.cont: ; preds = %entry, %lpad
; CHECK: retl

20
gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch
View File

@ -21,8 +21,8 @@ llvm-svn: 373184
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index 354ae05bb841..c29fc5dbccfb 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
--- llvm/lib/Analysis/ScalarEvolution.cpp
+++ llvm/lib/Analysis/ScalarEvolution.cpp
@@ -4992,7 +4992,7 @@ const SCEV *ScalarEvolution::createSimpleAffineAddRec(PHINode *PN,
// overflow.
if (auto *BEInst = dyn_cast<Instruction>(BEValueV))
@ -34,8 +34,8 @@ index 354ae05bb841..c29fc5dbccfb 100644
}
diff --git a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
index db68a4f84c91..6fdf8c5df974 100644
--- a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
+++ b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
--- llvm/test/Analysis/ScalarEvolution/limit-depth.ll
+++ llvm/test/Analysis/ScalarEvolution/limit-depth.ll
@@ -46,7 +46,7 @@ define void @test_mul(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) {
define void @test_sext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) {
; CHECK-LABEL: @test_sext
@ -47,8 +47,8 @@ index db68a4f84c91..6fdf8c5df974 100644
diff --git a/llvm/test/Analysis/ScalarEvolution/nsw.ll b/llvm/test/Analysis/ScalarEvolution/nsw.ll
index 69427368625d..ca24f9d4a04b 100644
--- a/llvm/test/Analysis/ScalarEvolution/nsw.ll
+++ b/llvm/test/Analysis/ScalarEvolution/nsw.ll
--- llvm/test/Analysis/ScalarEvolution/nsw.ll
+++ llvm/test/Analysis/ScalarEvolution/nsw.ll
@@ -163,7 +163,7 @@ bb5: ; preds = %bb2
declare void @f(i32)
@ -60,8 +60,8 @@ index 69427368625d..ca24f9d4a04b 100644
%add = add nsw i32 %v, 1
diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
index 5e7d72d5e4f3..d0086ee2e6ac 100644
--- a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
+++ b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
--- llvm/test/Analysis/ScalarEvolution/trip-count12.ll
+++ llvm/test/Analysis/ScalarEvolution/trip-count12.ll
@@ -1,7 +1,7 @@
; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s
@ -73,8 +73,8 @@ index 5e7d72d5e4f3..d0086ee2e6ac 100644
define zeroext i16 @test(i16* nocapture %p, i32 %len) nounwind readonly {
diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
index c0a1d12fa00e..9a080b34743f 100644
--- a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
+++ b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
--- llvm/test/Analysis/ScalarEvolution/trip-count9.ll
+++ llvm/test/Analysis/ScalarEvolution/trip-count9.ll
@@ -179,7 +179,7 @@ exit:
}

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

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

90
gnu/packages/patches/oath-toolkit-glibc-compat.patch
View File

@ -1,90 +0,0 @@
Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28.
Based on this upstream gnulib patch:
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
--- a/liboath/gl/fflush.c
+++ b/liboath/gl/fflush.c
@@ -33,7 +33,7 @@
#undef fflush
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
@@ -72,7 +72,7 @@
#endif
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
@@ -148,7 +148,7 @@
if (stream == NULL || ! freading (stream))
return fflush (stream);
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
clear_ungetc_buffer_preserving_position (stream);
--- a/liboath/gl/fpurge.c
+++ b/liboath/gl/fpurge.c
@@ -62,7 +62,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
/* Avoid memory leak when there is an active ungetc buffer. */
--- a/libaoth/gl/freading.c
+++ b/liboath/gl/freading.c
@@ -31,7 +31,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return ((fp->_flags & _IO_NO_WRITES) != 0
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
&& fp->_IO_read_base != NULL));
--- a/liboath/gl/fseeko.c
+++ b/liboath/gl/fseeko.c
@@ -47,7 +47,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
--- a/liboath/gl/stdio-impl.h
+++ b/liboath/gl/stdio-impl.h
@@ -18,6 +18,11 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private, so define it here for now. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
+
/* BSD stdio derived implementations. */
#if defined __NetBSD__ /* NetBSD */

24
gnu/packages/patches/perl-www-curl-fix-struct-void.patch 100644
View File

@ -0,0 +1,24 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 14 Nov 2020 15:40:56 +0100
Subject: [PATCH] gnu: perl-www-curl: Fix struct void* usage.
Copied verbatim from Gentoo[0]. Fixes:
Curl.xs:76:12: error: expected ‘{’ before ‘void’
struct void *curlm;
^~~~
Curl.xs:76:12: error: two or more data types in declaration specifiers
[0]: https://694466.bugs.gentoo.org/attachment.cgi?id=595098
--- WWW-Curl-4.17/Curl.xs 2014-02-21 18:08:30.000000000 +0200
+++ WWW-Curl-4.17.new/Curl.xs 2019-11-05 21:44:55.434395739 +0200
@@ -73,7 +73,7 @@ typedef struct {
#ifdef __CURL_MULTI_H
struct CURLM *curlm;
#else
- struct void *curlm;
+ void *curlm;
#endif
} perl_curl_multi;

BIN
gnu/packages/patches/perl-www-curl-remove-symbol.patch
View File

Binary file not shown.

0
gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch → gnu/packages/patches/python2-pygobject-2-deprecation.patch
View File

2
gnu/packages/pdf.scm
View File

@ -68,7 +68,6 @@
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages javascript)
#:use-module (gnu packages lesstif)
#:use-module (gnu packages libffi)
@ -1045,7 +1044,6 @@ the PDF pages.")
("libudev" ,eudev)
("libwebp" ,libwebp)
("libdrm" ,libdrm)
("imagemagick" ,imagemagick)
("giflib" ,giflib)
("glib" ,glib)
("cairo-xcb" ,cairo-xcb)

44
gnu/packages/perl.scm
View File

@ -269,15 +269,14 @@ more.")
(define-public perl-algorithm-c3
(package
(name "perl-algorithm-c3")
(version "0.10")
(version "0.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Algorithm-C3-" version ".tar.gz"))
(sha256
(base32
"01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"))))
(base32 "02ck52cf0yyk57354rd1rp5l0kbfwi1pvg2lh3jadvjxfrkq9x5a"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Algorithm-C3")
(synopsis "Module for merging hierarchies using the C3 algorithm")
@ -1267,14 +1266,14 @@ different getters and setters.")
(define-public perl-class-c3
(package
(name "perl-class-c3")
(version "0.34")
(version "0.35")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Class-C3-" version ".tar.gz"))
(sha256
(base32 "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"))))
(base32 "0gp3czp6y0jxx4448kz37f7gdxq4vw514bvc0l98rk4glvqkq1c4"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-algorithm-c3" ,perl-algorithm-c3)))
@ -1693,15 +1692,14 @@ one.")
(define-public perl-clone-pp
(package
(name "perl-clone-pp")
(version "1.07")
(version "1.08")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-"
version ".tar.gz"))
(sha256
(base32
"15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"))))
(base32 "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Clone-PP")
(synopsis "Recursively copy Perl datatypes")
@ -5779,14 +5777,14 @@ one: logging, exceptions, and translations.")
(define-public perl-libintl-perl
(package
(name "perl-libintl-perl")
(version "1.31")
(version "1.32")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/G/GU/GUIDO/"
"libintl-perl-" version ".tar.gz"))
(sha256
(base32 "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"))))
(base32 "19gbbh9w3rl805mv6mg1q80fsrg610h098qhf7ycnkjnyac84440"))))
(build-system perl-build-system)
(arguments
`(#:phases
@ -5899,15 +5897,14 @@ intersections, unions, unique elements, complements and many more.")
(define-public perl-list-moreutils
(package
(name "perl-list-moreutils")
(version "0.428")
(version "0.430")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/"
"List-MoreUtils-" version ".tar.gz"))
(sha256
(base32
"1hkc8xkd27yzfkgaglzn77j4qjmilyva4gaz3pc64vpism2hjgki"))))
(base32 "09v5cipjf634a1176wy2wicibzz51lry0d0yim9rnbfl5j2ggcb3"))))
(build-system perl-build-system)
(arguments
`(#:phases
@ -5934,15 +5931,14 @@ functionality on lists which is not going to go into List::Util.")
(define-public perl-list-moreutils-xs
(package
(name "perl-list-moreutils-xs")
(version "0.428")
(version "0.430")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-"
version ".tar.gz"))
(sha256
(base32
"0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"))))
(base32 "0hmjkhmk1qlzbg8skq7g1zral07k1x0fk4w2fpcfr7hpgkaldkp8"))))
(build-system perl-build-system)
(native-inputs
`(("perl-config-autoconf" ,perl-config-autoconf)
@ -7280,15 +7276,14 @@ building is done in @code{MooX::ConfigFromFile::Role}---using
(define-public perl-moox-file-configdir
(package
(name "perl-moox-file-configdir")
(version "0.007")
(version "0.008")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/"
"MooX-File-ConfigDir-" version ".tar.gz"))
(sha256
(base32
"074v150wrbddhy1n0qc8s80zrb71l3c4is968cnr06ac5l9kmshz"))))
(base32 "1b033injzk9d8clgip67ps5j5bpkrnag28q89ddwhrgqx12i3m7q"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-file-configdir" ,perl-file-configdir)
@ -7304,17 +7299,16 @@ installing configuration files or for finding any piece of settings.")
(define-public perl-moox-handlesvia
(package
(name "perl-moox-handlesvia")
(version "0.001008")
(version "0.001009")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-"
"mirror://cpan/authors/id/T/TO/TOBYINK/MooX-HandlesVia-"
version
".tar.gz"))
(sha256
(base32
"137yrjn2jmw4cj0fjdajnkjgqr5arnpq72kbm6w66xskncinz55h"))))
(base32 "04kcyflg49rclxa1nm035c05jpyvhdacjyy1wklbgv4li3im6qvi"))))
(build-system perl-build-system)
(native-inputs
`(("perl-moox-types-mooselike"
@ -9837,7 +9831,7 @@ generally slower on larger files.")
(define-public perl-text-format
(package
(name "perl-text-format")
(version "0.61")
(version "0.62")
(source (origin
(method url-fetch)
(uri (string-append
@ -9845,7 +9839,7 @@ generally slower on larger files.")
version ".tar.gz"))
(sha256
(base32
"0axfyiml3zwawwd127z8rl2lm53z6dlsflzmp80m3j0myn7kp2mv"))))
"0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)

8
gnu/packages/pretty-print.scm
View File

@ -40,7 +40,6 @@
#:use-module (gnu packages gperf)
#:use-module (gnu packages groff)
#:use-module (gnu packages gv)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages lua)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -72,8 +71,7 @@
(build-system gnu-build-system)
(inputs
`(("psutils" ,psutils)
("gv" ,gv)
("imagemagick" ,imagemagick)))
("gv" ,gv)))
(native-inputs
`(("gperf" ,gperf)
("groff" ,groff)
@ -272,14 +270,14 @@ seen in a terminal.")
(define-public highlight
(package
(name "highlight")
(version "3.58")
(version "3.59")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.andre-simon.de/zip/highlight-"
version ".tar.bz2"))
(sha256
(base32 "1y25vc3nysdih4y9z6yqn1k3i6lgkbyqkmdaib2xyfpqw4djb06z"))))
(base32 "18j9q9w9l71zxaaf8klcl4f5rqcmqnz9632azabv8scfw2l6r4l5"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests

84
gnu/packages/python-crypto.scm
View File

@ -994,26 +994,34 @@ protocol (Javascript Object Signing and Encryption).")
(define-public python-pycryptodome
(package
(name "python-pycryptodome")
(version "3.7.3")
(version "3.9.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pycryptodome" version))
(sha256
(base32
"0dh6ky5ngxayyn5f6n7gdamjl49g3khz6pdx9sdnag1zwi8248hs"))))
"1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li"))))
(build-system python-build-system)
(home-page "https://www.pycryptodome.org")
(synopsis "Cryptographic library for Python")
(description "This package provides a cryptographic library for Python.
(synopsis "Low-level cryptographic Python library")
(description
"PyCryptodome is a self-contained Python package of low-level
cryptographic primitives. It's not a wrapper to a separate C library like
OpenSSL. To the largest possible extent, algorithms are implemented in pure
Python. Only the pieces that are extremely critical to performance (e.g.,
block ciphers) are implemented as C extensions.
It brings the following enhancements with respect to the last official version
of PyCrypto:
You are expected to have a solid understanding of cryptography and security
engineering to successfully use these primitives. You must also be able to
recognize that some are obsolete (e.g., TDES) or even insecure (RC4).
It provides many enhancements over the last release of PyCrypto (2.6.1):
@itemize
@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
@item Accelerated AES on Intel platforms via AES-NI
@item First class support for PyPy
@item First-class support for PyPy
@item Elliptic curves cryptography (NIST P-256 curve only)
@item Better and more compact API (nonce and iv attributes for ciphers,
automatic generation of random nonces and IVs, simplified CTR cipher mode, and
@ -1027,13 +1035,63 @@ more)
@item Random numbers get sourced directly from the OS (and not from a CSPRNG
in userspace)
@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4)
@item Major clean ups and simplification of the code base
@end itemize\n")
(license license:bsd-2)))
@item Major clean-ups and simplification of the code base
@end itemize
This package provides drop-in compatibility with PyCrypto. It is one of two
PyCryptodome variants, the other being python-pycryptodomex.")
(license (list license:bsd-2
license:public-domain)))) ; code inherited from PyCrypto
(define-public python2-pycryptodome
(package-with-python2 python-pycryptodome))
(define-public python-pycryptodomex
(package (inherit python-pycryptodome)
(name "python-pycryptodomex")
(version (package-version python-pycryptodome))
(source
(origin
(method url-fetch)
(uri (pypi-uri "pycryptodomex" version))
(sha256
(base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv"))))
(description
"PyCryptodome is a self-contained Python package of low-level
cryptographic primitives. It's not a wrapper to a separate C library like
OpenSSL. To the largest possible extent, algorithms are implemented in pure
Python. Only the pieces that are extremely critical to performance (e.g.,
block ciphers) are implemented as C extensions.
You are expected to have a solid understanding of cryptography and security
engineering to successfully use these primitives. You must also be able to
recognize that some are obsolete (e.g., TDES) or even insecure (RC4).
It provides many enhancements over the last release of PyCrypto (2.6.1):
@itemize
@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
@item Accelerated AES on Intel platforms via AES-NI
@item First-class support for PyPy
@item Elliptic curves cryptography (NIST P-256 curve only)
@item Better and more compact API (nonce and iv attributes for ciphers,
automatic generation of random nonces and IVs, simplified CTR cipher mode, and
more)
@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms
@item Salsa20 and ChaCha20 stream ciphers
@item scrypt and HKDF
@item Deterministic (EC)DSA
@item Password-protected PKCS#8 key containers
@item Shamir’s Secret Sharing scheme
@item Random numbers get sourced directly from the OS (and not from a CSPRNG
in userspace)
@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4)
@item Major clean-ups and simplification of the code base
@end itemize
PyCryptodomex is the stand-alone version of PyCryptodome that no longer
provides drop-in compatibility with PyCrypto.")))
(define-public python-m2crypto
(package
(name "python-m2crypto")
@ -1069,7 +1127,7 @@ through the Engine interface.")
(define-public python-pykeepass
(package
(name "python-pykeepass")
(version "3.2.0")
(version "3.2.1")
(source
(origin
(method git-fetch)
@ -1079,7 +1137,7 @@ through the Engine interface.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1wxbfpy7467mlnfsvmh685fhfnq4fki9y7yc9cylp30r5n3hisaj"))))
(base32 "1symxf4ahylynihnp9z4z3lh2vy65ipvg8s4hjrnn936hcaaxghk"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -1103,7 +1161,7 @@ through the Engine interface.")
("python-dateutil" ,python-dateutil)
("python-future" ,python-future)
("python-lxml" ,python-lxml)
("python-pycryptodome" ,python-pycryptodome)))
("python-pycryptodomex" ,python-pycryptodomex)))
(home-page "https://github.com/libkeepass/pykeepass")
(synopsis "Python library to interact with keepass databases")
(description

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

@ -958,19 +958,22 @@ options.")
(package
(inherit python-cssutils)
(name "python-css-parser")
(version "1.0.4")
(version "1.0.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "css-parser" version ".tar.gz"))
(sha256
(base32
"0i4xfykiffxzr4f6y0m2ggqvx1rzam6pw6krlr5k6ldf29akbay7"))))
(base32 "0bmg4kiiir6pj9x3sd12x4dz2c1xpp2bn5nn60fxnbk2lnl4im2f"))))
(home-page "https://github.com/ebook-utils/css-parser")
(synopsis "Fork of cssutils modified for parsing ebooks")
(description
"Css-parser is a fork of cssutils 1.0.2, updated and modified for parsing
ebooks, due to cssutils not receiving updates as of 1.0.2.")
"Css-parser is a Python package for parsing and building CSS
Cascading Style Sheets. Currently it provides a DOM only and no rendering
options.
It's a fork of cssutils 1.0.2, updated and modified for parsing ebooks, due to
cssutils not receiving updates as of 1.0.2.")
(license license:lgpl3+)))
(define-public python2-css-parser
@ -3520,16 +3523,15 @@ addon modules.")
(define-public python-bottle
(package
(name "python-bottle")
(version "0.12.18")
(version "0.12.19")
(source
(origin
(method url-fetch)
(uri (pypi-uri "bottle" version))
(sha256
(base32
"17pn43kzr7m6czjbm4nda7kzs4ap9mmb30qfbhifyzas2i5vf688"))))
(base32 "0b6s50vc4iad97b6bb3xnyrgajb3nj6n6jbr5p54a4vapky3zmx9"))))
(build-system python-build-system)
(home-page "http://bottlepy.org/")
(home-page "https://bottlepy.org/")
(synopsis "WSGI framework for small web-applications.")
(description "@code{python-bottle} is a WSGI framework for small web-applications.")
(license license:expat)))
@ -5140,14 +5142,13 @@ Encoding for HTTP.")
(define-public python-cloudscraper
(package
(name "python-cloudscraper")
(version "1.2.46")
(version "1.2.48")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cloudscraper" version))
(sha256
(base32
"1br4p648yassywsd7whz1c7s10rwdysnd7wdqfjq9bksqfxrac3r"))
(base32 "0qjxzb0z5bprvmdhx42ayqhlhi2h49d9dwc0vvycj817s71f2sxv"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "cloudscraper"
@ -5158,6 +5159,10 @@ Encoding for HTTP.")
"captcha/deathbycaptcha.py"
"interpreters/js2py.py"
"interpreters/v8.py"))
(substitute* "__init__.py"
;; Perhaps it's a joke, but don't promote proprietary software.
(("([Th]is feature is not available) in the .*'" _ prefix)
(string-append prefix ".'")))
#t))))
(build-system python-build-system)
(propagated-inputs

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

@ -89,6 +89,7 @@
;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 Diego N. Barbato <dnbarbato@posteo.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -138,7 +139,6 @@
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
@ -3884,14 +3884,13 @@ outside the standard library.")
(define-public python-scp
(package
(name "python-scp")
(version "0.13.2")
(version "0.13.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "scp" version))
(sha256
(base32
"1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg"))))
(base32 "1m2v09m407p097cy3xy5rxicqfzrqjwf8v5rd4qhfqkk7lllimwb"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ;tests require an SSH server
@ -5000,7 +4999,6 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
("python-cairocffi" ,python-cairocffi)))
(inputs
`(("libpng" ,libpng)
("imagemagick" ,imagemagick)
("freetype" ,freetype)
("cairo" ,cairo)
("glib" ,glib)
@ -5075,6 +5073,9 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
;; has not effect.
(setenv "LD_LIBRARY_PATH" (string-append cairo "/lib"))
(setenv "HOME" (getcwd))
;; Fix rounding errors when using the x87 FPU.
(when (string-prefix? "i686" ,(%current-system))
(setenv "CFLAGS" "-ffloat-store"))
(call-with-output-file "setup.cfg"
(lambda (port)
(format port "[directories]~%
@ -18704,79 +18705,37 @@ validation testing and application logic.")
(define-public python-numba
(package
(name "python-numba")
(version "0.46.0")
(version "0.51.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "numba" version))
(sha256
(base32
"1vnfzcq6fcnkmdms6114d49awvvj5181fl7z1wlha27qc2paxjy2"))))
"0s0777m8kq4l96i88zj78np7283v1n4878qfc1gvzb8l45bmkg8n"))))
(build-system python-build-system)
(arguments
`(#:modules ((guix build utils)
(guix build python-build-system)
(ice-9 ftw)
(srfi srfi-1)
(srfi srfi-26))
#:phases
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-proprietary-features
(lambda _
(setenv "NUMBA_DISABLE_HSA" "1")
(setenv "NUMBA_DISABLE_CUDA" "1")
#t))
(add-after 'unpack 'remove-failing-tests
(lambda _
;; FIXME: These tests fail for unknown reasons:
;; test_non_writable_pycache, test_non_creatable_pycache, and
;; test_frozen (all in numba.tests.test_dispatcher.TestCache).
(substitute* "numba/tests/test_dispatcher.py"
(("def test(_non_writable_pycache)" _ m)
(string-append "def guix_skip" m))
(("def test(_non_creatable_pycache)" _ m)
(string-append "def guix_skip" m))
(("def test(_frozen)" _ m)
(string-append "def guix_skip" m)))
;; These tests fail because we don't run the tests from the build
;; directory: test_setup_py_distutils, test_setup_py_setuptools
;; They are in numba.tests.test_pycc.TestDistutilsSupport.
(substitute* "numba/tests/test_pycc.py"
(("def test(_setup_py_distutils|_setup_py_setuptools)" _ m)
(string-append "def guix_skip" m)))
;; These tests fail because our version of Python does not have
;; a recognizable front-end for the Numba distribution to use
;; to check against.
(substitute* "numba/tests/test_entrypoints.py"
(("def test(_init_entrypoint)" _ m)
(string-append "def guix_skip" m)))
(substitute* "numba/tests/test_jitclasses.py"
(("def test(_jitclass_longlabel_not_truncated)" _ m)
(string-append "def guix_skip" m)))
#t))
(replace 'check
(lambda _
(let ((cwd (getcwd)))
(setenv "PYTHONPATH"
(string-append cwd "/build/"
(find (cut string-prefix? "lib" <>)
(scandir (string-append cwd "/build")))
":"
(getenv "PYTHONPATH")))
;; Something is wrong with the PYTHONPATH when running the
;; tests from the build directory, as it complains about not being
;; able to import certain modules.
(with-directory-excursion "/tmp"
(invoke "python3" "-m" "numba.runtests" "-v" "-m")))
#t)))))
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
;; Something is wrong with the PYTHONPATH when running the
;; tests from the build directory, as it complains about not being
;; able to import certain modules.
(with-directory-excursion "/tmp"
(setenv "HOME" (getcwd))
(invoke "python3" "-m" "numba.runtests" "-v" "-m")))))))
(propagated-inputs
`(("python-llvmlite" ,python-llvmlite)
("python-numpy" ,python-numpy)
("python-singledispatch" ,python-singledispatch)))
;; Needed for tests.
(inputs
(native-inputs ;for tests
`(("python-jinja2" ,python-jinja2)
("python-pygments" ,python-pygments)))
(home-page "https://numba.pydata.org")
@ -21878,13 +21837,13 @@ dictionaries.")
(define-public pyzo
(package
(name "pyzo")
(version "4.10.2")
(version "4.11.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyzo" version))
(sha256
(base32 "1zplxcb78qy8qibifmnsx5i9gnlfmw9n6nr4yflsabpxw57mx4m1"))))
(base32 "0vzsk6rchavlvy7ciq1z9qh3qrj9q213v2nn491fgjq3g19glj53"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -21894,8 +21853,8 @@ dictionaries.")
;; Tests fail with "Permission denied: '/homeless-shelter'".
(setenv "HOME" "/tmp")
#t)))
;; Tests fail with "Uncaught Python exception: invalid literal for
;; int() with base 10: 'test'".
;; Tests fail with "Uncaught Python exception: python: undefined
;; symbol: objc_getClass".
#:tests? #f))
(propagated-inputs
`(("python-pyqt" ,python-pyqt)))

27
gnu/packages/security-token.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
;;;
;;; This file is part of GNU Guix.
;;;
@ -43,6 +44,7 @@
#:use-module (gnu packages dns)
#:use-module (gnu packages gettext)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
@ -102,7 +104,7 @@ readers and is needed to communicate with such devices through the
(define-public eid-mw
(package
(name "eid-mw")
(version "4.4.27")
(version "5.0.8")
(source
(origin
(method git-fetch)
@ -111,13 +113,15 @@ readers and is needed to communicate with such devices through the
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"))))
(base32 "1ckini00iz9w96n9hpkx6w2ivpfkd4yyxyhnmsl9n0k8x4j6jg5a"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("libassuan" ,libassuan)
("pkg-config" ,pkg-config)
("perl" ,perl)))
(inputs
@ -132,14 +136,29 @@ readers and is needed to communicate with such devices through the
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(replace 'bootstrap
(lambda _
;; configure.ac relies on ‘git --describe’ to get the version.
;; Patch it to just return the real version number directly.
(substitute* "scripts/build-aux/genver.sh"
(("/bin/sh") (which "sh"))
(("^(GITDESC=).*" _ match) (string-append match ,version "\n")))
(invoke "sh" "./bootstrap.sh"))))))
(invoke "sh" "./bootstrap.sh")))
(add-after 'unpack 'make-reproducible
(lambda _
(substitute* "scripts/mac/create-vers.sh"
(("NOW=.*")
"NOW=1970-01-01\n"))
#t))
;; Remove failing test that was removed upstream after version 5.0.8.
;; See: https://github.com/Fedict/eid-mw/commit/3d1187b1b61118b9ae97607903d3d2fc0bad7518
(add-before 'check 'remove-failing-test
(lambda _
(substitute* "tests/unit/Makefile.am"
(("sign_state ordering cardcom_common")
"sign_state ordering #cardcom_common"))
#t))
)))
(synopsis "Belgian eID Middleware")
(description "The Belgian eID Middleware is required to authenticate with
online services using the Belgian electronic identity card.")

21
gnu/packages/stb.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -26,8 +27,8 @@
(define stb
;; stb is a collection of libraries developed within the same repository.
;; When updating this, remember to change versions below as appropriate.
(let ((commit "2c2908f50515dcd939f24be261c3ccbcd277bb49")
(revision "1"))
(let ((commit "b42009b3b9d4ca35bc703f5310eedc74f584be58")
(revision "2"))
(package
(name "stb")
(home-page "https://github.com/nothings/stb")
@ -39,7 +40,7 @@
(commit commit)))
(sha256
(base32
"1z753rscqc4clp0rd57bw68i60kz694y1z52bwv6slzmkgds1cki"))
"1gmcjhmj62mfdscrsg2hv4j4j9v447y8zj3rbrm7mqn94cx73z1i"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -92,23 +93,29 @@ the C programming language.")
;; converted to macros as outlined in <https://bugs.gnu.org/32155>.
(define-public stb-image
(make-stb-header-package
"stb-image" "2.22"
"stb-image" "2.26"
"stb-image is a small and self-contained library for image loading or
decoding from file or memory. A variety of formats are supported."))
(define-public stb-image-write
(make-stb-header-package
"stb-image-write" "1.13"
"stb-image-write" "1.15"
"stb-image-write is a small library for writing image files to the
C@tie{}@code{stdio} interface."))
(define-public stb-rect-pack
(make-stb-header-package
"stb-rect-pack" "1.00"
"stb-rect-pack is a small rectangle packing library useful for, e.g., packing
rectangular textures into an atlas. It does not do rotation."))
(define-public stb-sprintf
(make-stb-header-package
"stb-sprintf" "1.06"
"stb-sprintf" "1.09"
"stb-sprintf implements fast @code{sprintf}, @code{snprintf} for C/C++."))
(define-public stb-truetype
(make-stb-header-package
"stb-truetype" "1.22"
"stb-truetype" "1.24"
"stb-truetype is a library for parsing, decoding, and rasterizing
characters from TrueType fonts."))

7
gnu/packages/text-editors.scm
View File

@ -756,14 +756,14 @@ editors.")
(define-public texmacs
(package
(name "texmacs")
(version "1.99.13")
(version "1.99.15")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/"
"source/TeXmacs-" version "-src.tar.gz"))
(sha256
(base32 "1d590yyanh2ar88pd0ns4mf616bq1lq4cwg93m863anhir5irb82"))))
(base32 "09r88yi2k1vi9pmszw97zblw8bs79h2d5ivb6xk652zyrls2lkvd"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -773,7 +773,8 @@ editors.")
("guile" ,guile-1.8)
("perl" ,perl)
("python" ,python-wrapper)
("qt" ,qtbase)))
("qt" ,qtbase)
("qtsvg" ,qtsvg)))
(arguments
`(#:tests? #f ; no check target
#:phases

6
gnu/packages/tmux.scm
View File

@ -145,7 +145,7 @@ windows.")
(define-public python-libtmux
(package
(name "python-libtmux")
(version "0.8.3")
(version "0.8.5")
(source
(origin
(method git-fetch)
@ -155,7 +155,7 @@ windows.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "18dqqd3jmgq3jb1l3xpgywlh4x82mzjxch61gwnlhfaqx5mzvjph"))))
(base32 "1vrd99kl2gsk49mvbp6k7l1k7r96vf1fczsqclb62yd4hdpp7zaa"))))
(build-system python-build-system)
(propagated-inputs
`(("procps" ,procps))) ;tests need top
@ -171,6 +171,8 @@ windows.")
(setenv "PYTHONPATH"
(string-append (getcwd) "/build/lib:"
(getenv "PYTHONPATH")))
;; Fix <https://github.com/tmux-python/libtmux/issues/265>.
(setenv "LANG" "en_US.utf8")
;; Skip tests that I suspect fail because of a change
;; in behavior in tmux 3 from tmux 2
;; https://github.com/tmux-python/libtmux/issues/281

4
gnu/packages/tor.scm
View File

@ -54,14 +54,14 @@
(define-public tor
(package
(name "tor")
(version "0.4.4.5")
(version "0.4.4.6")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.torproject.org/tor-"
version ".tar.gz"))
(sha256
(base32
"09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54"))))
"1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

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

@ -2301,6 +2301,49 @@ collections efficiently. Mirrors decide to clone and update repositories
based on a manifest file published by servers.")
(license license:gpl3+)))
(define-public b4
(package
(name "b4")
(version "0.5.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.kernel.org/pub/scm/utils/b4/b4.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 "1w11fiyspyncz2m7njrjfylgzch4azi7560ngd8i733wvjjhg3mj"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; No tests.
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-manpages
(lambda* (#:key outputs #:allow-other-keys)
(let ((man (string-append (assoc-ref outputs "out")
"/man/man5/")))
(mkdir-p man)
(for-each (lambda (file) (install-file file man))
(find-files "man" "\\.[1-8]$")))
#t)))))
(inputs
`(("python-requests" ,python-requests)))
(home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
(synopsis "Tool for working with patches in public-inbox archives")
(description
"The @code{b4} command is designed to make it easier to participate in
patch-based workflows for projects that have public-inbox archives.
Features include:
@itemize
@item downloading a thread's mbox given a message ID
@item processing an mbox so that is ready to be fed to @code{git-am}
@item creating templated replies for processed patches and pull requests
@item submitting cryptographic attestation for patches.
@end itemize")
(license license:gpl2+)))
(define-public git-annex-remote-rclone
(package
(name "git-annex-remote-rclone")

13
gnu/packages/video.scm
View File

@ -1007,7 +1007,7 @@ H.264 (MPEG-4 AVC) video streams.")
(define-public straw-viewer
(package
(name "straw-viewer")
(version "0.1.0")
(version "0.1.1")
(source
(origin
(method git-fetch)
@ -1016,7 +1016,7 @@ H.264 (MPEG-4 AVC) video streams.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0786bppk8dhp5p2284qp7pm3b9vwh1cm4n03hiqwd2vvgv41aypy"))))
(base32 "0idp1ayqghi5bg83v9qmvzz9wj05flwrp1fxb4kqa6vwxmprvhyk"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build" ,perl-module-build)
@ -1228,6 +1228,8 @@ ASS/SSA (Advanced Substation Alpha/SubStation Alpha) subtitle format.")
(base32
"1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("freeglut" ,freeglut)
@ -2186,14 +2188,14 @@ To load this plugin, specify the following option when starting mpv:
(define-public youtube-dl
(package
(name "youtube-dl")
(version "2020.11.01.1")
(version "2020.11.12")
(source (origin
(method url-fetch)
(uri (string-append "https://youtube-dl.org/downloads/latest/"
"youtube-dl-" version ".tar.gz"))
(sha256
(base32
"06lhba4b9bm6f5yqrb5xvdr0l5shwd95djf9nlpg86prr5xihqks"))))
"0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f"))))
(build-system python-build-system)
(arguments
;; The problem here is that the directory for the man page and completion
@ -2479,7 +2481,8 @@ Both command-line and GTK2 interface are available.")
"1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-bdjava-jar")
`(#:configure-flags '("--disable-bdjava-jar"
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'refer-to-libxml2-in-.pc-file

8
gnu/packages/vim.scm
View File

@ -70,7 +70,7 @@
(define-public vim
(package
(name "vim")
(version "8.2.1964")
(version "8.2.1980")
(source (origin
(method git-fetch)
(uri (git-reference
@ -79,7 +79,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0rhx93xq5gk7lgxnm0h0lnwl6zgifcnl0c9k0f4fqb6cx81ihp4q"))))
"1l1bb4lhlivgvj4jaxkibdkcg6rh1gk80d6ni41kphyrir7xahja"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -800,7 +800,7 @@ through its msgpack-rpc API.")
(define-public vim-guix-vim
(package
(name "vim-guix-vim")
(version "0.1")
(version "0.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -809,7 +809,7 @@ through its msgpack-rpc API.")
(file-name (git-file-name name version))
(sha256
(base32
"1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk"))))
"10bfy0dgwizxr56b4272b7sqajpr6lnz332pzx055dis2zzjap8z"))))
(build-system copy-build-system)
(arguments
'(#:install-plan

14
gnu/packages/virtualization.scm
View File

@ -177,6 +177,13 @@
'("include")
input-directories)
#t)))
(add-after 'unpack 'extend-test-time-outs
(lambda _
;; These tests can time out on heavily-loaded and/or slow storage.
(substitute* (cons* "tests/qemu-iotests/common.qemu"
(find-files "tests/qemu-iotests" "^[0-9]+$"))
(("QEMU_COMM_TIMEOUT=[0-9]+" match)
(string-append match "9")))))
(add-after 'unpack 'disable-unusable-tests
(lambda _
(substitute* "tests/Makefile.include"
@ -1286,14 +1293,14 @@ domains, their live performance and resource utilization statistics.")
(define-public criu
(package
(name "criu")
(version "3.14")
(version "3.15")
(source (origin
(method url-fetch)
(uri (string-append "https://download.openvz.org/criu/criu-"
version ".tar.bz2"))
(sha256
(base32
"1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"))))
"09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -1374,7 +1381,8 @@ domains, their live performance and resource utilization statistics.")
("libcap" ,libcap)
("libnet" ,libnet)
("libnl" ,libnl)
("libbsd" ,libbsd)))
("libbsd" ,libbsd)
("nftables" ,nftables)))
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl)

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

@ -13,6 +13,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -46,6 +47,7 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages fonts)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
@ -60,6 +62,7 @@
#:use-module (gnu packages lisp)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages markup)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -341,6 +344,129 @@ access.")
(properties `((lint-hidden-cve . ("CVE-2016-9179"))))
(license license:gpl2)))
(define-public kristall
;; Fixes to the build system applied after the latest tag
;; Use tagged release when updating
(let ((commit "204b08a9303e75cd8d4c252b0554935062766f86")
(revision "1"))
(package
(name "kristall")
(version (string-append "0.3-" revision "." (string-take commit 7)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/MasterQ32/kristall")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1mymq0dh6r0829x74j0jkw8hw46amqwbznlf1b4ra6w77h9yz3lj"))
(modules '((srfi srfi-1)
(ice-9 ftw)
(guix build utils)))
(snippet
'(let ((preserved-lib-files '("luis-l-gist")))
(with-directory-excursion "lib"
(for-each
(lambda (directory)
(simple-format #t "deleting: ~A\n" directory)
(delete-file-recursively directory))
(lset-difference string=?
(scandir ".")
(cons* "." ".." preserved-lib-files))))
;; Contains executable of 7z and pscp
(delete-file-recursively "ci/tools")
;; Remove bundled fonts
(delete-file-recursively "src/fonts")
#t))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build qt-utils))
#:make-flags
(list (string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no ./configure script
(delete 'check) ; no check target
(add-before 'build 'set-program-version
(lambda _
;; configure.ac relies on ‘git --describe’ to get the version.
;; Patch it to just return the real version number directly.
(substitute* "src/kristall.pro"
(("(KRISTALL_VERSION=).*" _ match)
(string-append match ,version "\n")))
#t))
(add-before 'build 'dont-use-bundled-cmark
(lambda _
(substitute* "src/kristall.pro"
(("(^include\\(.*cmark.*)" _ match)
(string-append
"LIBS += -I" (assoc-ref %build-inputs "cmark") " -lcmark")))
#t))
(add-before 'build 'dont-use-bundled-breeze-stylesheet
(lambda _
(substitute* "src/kristall.pro"
(("../lib/BreezeStyleSheets/breeze.qrc")
(string-append
(assoc-ref %build-inputs "breeze-stylesheet") "/breeze.qrc")))
#t))
(add-before 'build 'dont-use-bundled-fonts
(lambda _
(substitute* "src/kristall.pro"
((".*fonts.qrc.*") ""))
(substitute* "src/main.cpp"
(("/fonts/OpenMoji-Color")
(string-append
(assoc-ref %build-inputs "font-openmoji")
"/share/fonts/truetype/OpenMoji-Color"))
(("/fonts/NotoColorEmoji")
(string-append
(assoc-ref %build-inputs "font-google-noto")
"/share/fonts/truetype/NotoColorEmoji")))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program out "kristall"))
#t)))))
(native-inputs
`(("breeze-stylesheet"
,(let ((commit "2d595a956f8a5f493aa51139a470b768a6d82cce")
(revision "0"))
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Alexhuszagh/BreezeStyleSheets")
(commit "2d595a956f8a5f493aa51139a470b768a6d82cce")))
(file-name (git-file-name "breeze-stylesheet"
(git-version "0" revision commit)))
(sha256
(base32
"1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))))))
(inputs
`(("cmark" ,cmark)
("font-google-noto" ,font-google-noto)
("font-openmoji" ,font-openmoji)
("openssl" ,openssl)
("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)))
(home-page "https://kristall.random-projects.net")
(synopsis "Small-internet graphical client")
(description "Graphical small-internet client with with many features
including multi-protocol support (gemini, HTTP, HTTPS, gopher, finger),
bookmarks, TSL certificates management, outline generation and a tabbed
interface.")
(license (list license:gpl3+
;; for breeze-stylesheet
license:expat)))))
(define-public qutebrowser
(package
(name "qutebrowser")
@ -461,7 +587,7 @@ driven and does not detract you from your daily work.")
(name "nyxt")
;; Package the pre-release because latest stable 1.5.0 does not build
;; anymore.
(version "2-pre-release-3")
(version "2-pre-release-4")
(source
(origin
(method git-fetch)
@ -472,7 +598,7 @@ driven and does not detract you from your daily work.")
(commit version)))
(sha256
(base32
"16crhc89hpvzkms5fypq9vdrf7glidqwh7yvy5cdmjdq4v7fkmy4"))
"00865plmvgl1nj009a4w9bcb5mf0zgqjx7w6slacyqgidjzad6qm"))
(file-name (git-file-name "nyxt" version))))
(build-system gnu-build-system)
(arguments
@ -482,28 +608,20 @@ driven and does not detract you from your daily work.")
#:strip-binaries? #f ; Stripping breaks SBCL binaries.
#:phases
(modify-phases %standard-phases
;; Version is guessed from .git which Guix does not have.
(add-after 'unpack 'patch-version
(lambda* (#:key inputs #:allow-other-keys)
(let ((version (format #f "~a" ,version))
(file "source/global.lisp"))
(chmod file #o666)
(let ((port (open-file file "a")))
(format port "(setf +version+ ~s)" version)
(close-port port)))
#t))
(add-before 'build 'make-desktop-version-number
(lambda _
(with-output-to-file "version"
(lambda _
(format #t "~a" ,version)
#t))))
(delete 'configure)
(add-before 'build 'fix-common-lisp-cache-folder
(lambda _
(setenv "HOME" "/tmp")
#t))
(add-before 'build 'set-version
(lambda _
(setenv "NYXT_VERSION" ,version)
#t))
(add-before 'check 'configure-tests
(lambda _
(setenv "NYXT_TESTS_NO_NETWORK" "1")
(setenv "NYXT_TESTS_ERROR_ON_FAIL" "1")
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin/nyxt"))

33
gnu/packages/web.scm
View File

@ -129,6 +129,7 @@
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lsof)
#:use-module (gnu packages lua)
#:use-module (gnu packages mail)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
#:use-module (gnu packages ncurses)
@ -567,7 +568,7 @@ documentation.")
(package
(inherit nginx)
(name "nginx-lua-module")
(version "0.10.15")
(version "0.10.16")
(source
(origin
(method git-fetch)
@ -576,8 +577,7 @@ documentation.")
(commit (string-append "v" version))))
(file-name (git-file-name "lua-nginx-module" version))
(sha256
(base32
"1j216isp0546hycklbr5wi8mlga5hq170hk7f2sm16sfavlkh5gz"))))
(base32 "0nwcbqm1visg1dkxav7qa16w0d0n8cgqn4881xiqn88xfkxj0dyg"))))
(build-system gnu-build-system)
(inputs
`(("nginx-sources" ,(package-source nginx-socket-cloexec))
@ -3792,15 +3792,14 @@ exists it is used instead.")
(define-public perl-lwp-protocol-https
(package
(name "perl-lwp-protocol-https")
(version "6.07")
(version "6.09")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/"
"LWP-Protocol-https-" version ".tar.gz"))
(sha256
(base32
"1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"))))
(base32 "14pm785cgyrnppks6ccasb2vkqifh0a8fz36nmnhc2v926jy3kqn"))))
(build-system perl-build-system)
(native-inputs
;; For tests.
@ -4426,14 +4425,14 @@ RFC 6570.")
(uri (string-append
"mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-"
version".tar.gz"))
(patches (search-patches "perl-www-curl-remove-symbol.patch"))
(patches (search-patches "perl-www-curl-fix-struct-void.patch"
"perl-www-curl-remove-symbol.patch"))
(sha256
(base32
"1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"))))
(build-system perl-build-system)
(arguments
'(#:tests? #f ;XXX: tests require network access
#:phases (modify-phases %standard-phases
(add-before 'configure 'set-search-path
(lambda _
@ -7717,10 +7716,11 @@ solution for any project's interface needs:
(license license:expat)))
(define-public gmnisrv
(let ((commit "a22bec51494a50c044416d469cc33e043480e7fd"))
(let ((commit "d484ba0ab0020866535a44be5948c9482b8f2b8d")
(revision "1"))
(package
(name "gmnisrv")
(version (git-version "0" "0" commit))
(version (git-version "0" revision commit))
(home-page "https://git.sr.ht/~sircmpwn/gmnisrv")
(source (origin
(method git-fetch)
@ -7729,7 +7729,7 @@ solution for any project's interface needs:
(commit commit)))
(sha256
(base32
"1k1n7cqd37jgbhxyh231bagdxdxqwpr6n5pk3gax2516w6xbzlb9"))
"11phipixsxx1jgm42agp76p5s68l0zj65kgb41vzaymgwcq79ivn"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@ -7739,19 +7739,14 @@ solution for any project's interface needs:
(lambda _
(setenv "CC" "gcc")
#t))
(delete 'check)
(add-after 'install 'install-config
(lambda* (#:key outputs #:allow-other-keys)
(let ((etc (string-append (assoc-ref outputs "out")
"/etc")))
(mkdir-p etc)
(copy-file "config.ini" (string-append etc "/gmnisrv.ini"))
#t))))))
(delete 'check))))
(inputs
`(("openssl" ,openssl)))
(native-inputs
`(("pkg-config" ,pkg-config)
("scdoc" ,scdoc)))
(propagated-inputs
`(("mailcap" ,mailcap)))
(synopsis "Simple Gemini protocol server")
(description "gmnisrv is a simple Gemini protocol server written in C.")
(license (list license:gpl3+

4
gnu/packages/wm.scm
View File

@ -611,7 +611,7 @@ Features include:
"/bin/gawk")))
(substitute* "lock"
(("$(which wmctrl)") wmctrl)
(("\\$\\(command -V wmctrl\\)") wmctrl)
(("convert") mconvert)
(("shot=\\(import") (string-append "shot=\(" mimport))
(("awk -F") (string-append awk " -F"))
@ -630,7 +630,7 @@ Features include:
(string-append bin "/i3lock-fancy"))
(copy-recursively "icons" icons)
#t))))))
(native-inputs
(inputs
`(("imagemagick" ,imagemagick)
("wmctrl" ,wmctrl)
("gawk" ,gawk)))

32
gnu/packages/xdisorg.scm
View File

@ -2550,3 +2550,35 @@ such as sway, similar to @command{rofi}.")
"@command{dex}, @dfn{DesktopEntry Execution}, is a program to generate
and execute @file{.desktop} files of the Application type.")
(license license:gpl3+)))
(define-public sx
(package
(name "sx")
(version "2.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Earnestly/sx")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0p24ghp1ygvyc2hv81byhxax7491yhcc5priq5ldv07nzl7akagc"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no tests
#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" out)))
#:phases
(modify-phases %standard-phases
;; no configure script
(delete 'configure))))
(propagated-inputs
`(("xauth" ,xauth)))
(home-page "https://github.com/Earnestly/sx")
(synopsis "Start an xorg server")
(description
"@command{sx} is a simple alternative to both @command{xinit} and
@command{startx} for starting an Xorg server.")
(license license:x11)))

8
gnu/packages/xfce.scm
View File

@ -1176,7 +1176,7 @@ A plugin for the Xfce panel is also available.")
(define-public xfce4-screensaver
(package
(name "xfce4-screensaver")
(version "0.1.10")
(version "0.1.11")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/"
@ -1186,7 +1186,7 @@ A plugin for the Xfce panel is also available.")
version ".tar.bz2"))
(sha256
(base32
"0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq"))))
"0xxcvvcch8bqd35ksq8l88a46xnidp59iq4ssyygki0a2vd20h41"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -1986,7 +1986,7 @@ lan interface (signal state, signal quality, network name (SSID)).")
(define-public xfce4-weather-plugin
(package
(name "xfce4-weather-plugin")
(version "0.10.1")
(version "0.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@ -1995,7 +1995,7 @@ lan interface (signal state, signal quality, network name (SSID)).")
"/xfce4-weather-plugin-" version ".tar.bz2"))
(sha256
(base32
"12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"))))
"1ik2qvmwylsz5vyz4np2y0mmd37s89xkayxi97490c4mj85pj5wh"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)

33
gnu/services/audio.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21,6 +22,8 @@
#:use-module (guix gexp)
#:use-module (gnu services)
#:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module (gnu packages admin)
#:use-module (gnu packages mpd)
#:use-module (guix records)
#:use-module (ice-9 match)
@ -135,19 +138,19 @@ audio_output {
(define (mpd-shepherd-service config)
(shepherd-service
(documentation "Run the MPD (Music Player Daemon)")
(requirement '(user-processes))
(provision '(mpd))
(start #~(make-forkexec-constructor
(list #$(file-append mpd "/bin/mpd")
"--no-daemon"
#$(mpd-config->file config))
#:pid-file #$(mpd-file-name config "pid")
#:environment-variables
;; Required to detect PulseAudio when run under a user account.
'(#$(string-append
"XDG_RUNTIME_DIR=/run/user/"
(number->string
(list (string-append
"XDG_RUNTIME_DIR=/run/user/"
(number->string
(passwd:uid
(getpwnam (mpd-configuration-user config))))))
(getpwnam #$(mpd-configuration-user config))))))
#:log-file #$(mpd-file-name config "log")))
(stop #~(make-kill-destructor))))
@ -158,10 +161,26 @@ audio_output {
(define %user
(getpw #$(mpd-configuration-user config)))
(let ((directory #$(mpd-file-name config "")))
(let ((directory #$(mpd-file-name config ".mpd")))
(mkdir-p directory)
(chown directory (passwd:uid %user) (passwd:gid %user))))))
(define %mpd-accounts
;; Default account and group for MPD.
(list (user-group (name "mpd") (system? #t))
(user-account
(name "mpd")
(group "mpd")
(system? #t)
(comment "Music Player Daemon (MPD) user")
;; Note: /var/run/mpd hosts one sub-directory per user, of which
;; /var/run/mpd/mpd corresponds to the "mpd" user.
(home-directory "/var/run/mpd/mpd")
(shell (file-append shadow "/sbin/nologin")))))
(define mpd-service-type
(service-type
(name 'mpd)
@ -169,6 +188,8 @@ audio_output {
(extensions
(list (service-extension shepherd-root-service-type
(compose list mpd-shepherd-service))
(service-extension account-service-type
(const %mpd-accounts))
(service-extension activation-service-type
mpd-service-activation)))
(default-value (mpd-configuration))))

28
gnu/services/base.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 David Craven <david@craven.ch>
@ -1024,20 +1024,22 @@ the tty to run, among other things."
(define-record-type* <mingetty-configuration>
mingetty-configuration make-mingetty-configuration
mingetty-configuration?
(mingetty mingetty-configuration-mingetty ;<package>
(default mingetty))
(tty mingetty-configuration-tty) ;string
(auto-login mingetty-auto-login ;string | #f
(default #f))
(login-program mingetty-login-program ;gexp
(default #f))
(login-pause? mingetty-login-pause? ;Boolean
(default #f)))
(mingetty mingetty-configuration-mingetty ;<package>
(default mingetty))
(tty mingetty-configuration-tty) ;string
(auto-login mingetty-auto-login ;string | #f
(default #f))
(login-program mingetty-login-program ;gexp
(default #f))
(login-pause? mingetty-login-pause? ;Boolean
(default #f))
(clear-on-logout? mingetty-clear-on-logout? ;Boolean
(default #t)))
(define mingetty-shepherd-service
(match-lambda
(($ <mingetty-configuration> mingetty tty auto-login login-program
login-pause?)
login-pause? clear-on-logout?)
(list
(shepherd-service
(documentation "Run mingetty on an tty.")
@ -1050,7 +1052,6 @@ the tty to run, among other things."
(start #~(make-forkexec-constructor
(list #$(file-append mingetty "/sbin/mingetty")
"--noclear"
;; Avoiding 'vhangup' allows us to avoid 'setfont'
;; errors down the path where various ioctls get
@ -1058,6 +1059,9 @@ the tty to run, among other things."
;; in Linux.
"--nohangup" #$tty
#$@(if clear-on-logout?
#~()
#~("--noclear"))
#$@(if auto-login
#~("--autologin" #$auto-login)
#~())

9
gnu/services/web.scm
View File

@ -256,7 +256,14 @@
mumi-configuration-sender
mumi-configuration-smtp
mumi-service-type))
mumi-service-type
gmnisrv-configuration
gmnisrv-configuration?
gmnisrv-configuration-package
gmnisrv-configuration-config-file
gmnisrv-service-type))
;;; Commentary:
;;;

15
gnu/system/vm.scm
View File

@ -224,6 +224,12 @@ substitutable."
(use-modules (guix build utils)
(gnu build vm))
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded
;; by 'estimated-partition-size' below.
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8")
(let* ((native-inputs
'#+(list qemu (canonical-package coreutils)))
(linux (string-append
@ -655,7 +661,14 @@ of the GNU system as described by OS."
'dce)))
(let* ((os (operating-system (inherit os)
(let* ((os (operating-system
(inherit os)
;; As in 'virtualized-operating-system', use BIOS-style GRUB.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/vda")))
;; Assume we have an initrd with the whole QEMU shebang.
;; Force our own root file system. Refer to it by UUID so that

13
gnu/tests/audio.scm
View File

@ -28,9 +28,7 @@
(define %mpd-os
(simple-operating-system
(service mpd-service-type
(mpd-configuration
(user "root")))))
(service mpd-service-type)))
(define (run-mpd-test)
"Run tests in %mpd-os, which has mpd running."
@ -62,9 +60,14 @@
(start-service 'mpd))
marionette))
(test-assert "mpc connect"
(test-assert "mpd listening"
;; Wait until mpd is actually listening before spawning 'mpc'.
(wait-for-tcp-port 6600 marionette))
(test-equal "mpc connect"
0
(marionette-eval
'(zero? (system #$(file-append mpd-mpc "/bin/mpc")))
'(system* #$(file-append mpd-mpc "/bin/mpc"))
marionette))
(test-end)

11
gnu/tests/docker.scm
View File

@ -27,8 +27,9 @@
#:use-module (gnu services networking)
#:use-module (gnu services docker)
#:use-module (gnu services desktop)
#:use-module (gnu packages docker)
#:use-module ((gnu packages base) #:select (glibc))
#:use-module (gnu packages guile)
#:use-module (gnu packages docker)
#:use-module (guix gexp)
#:use-module (guix grafts)
#:use-module (guix monads)
@ -206,7 +207,7 @@ inside %DOCKER-OS."
;; load' must be able to store the whole image into memory, hence the
;; huge memory requirements. We should avoid the volatile-root setup
;; instead.
(memory-size 3500)
(memory-size 4000)
(port-forwardings '())))
(define test
@ -298,5 +299,9 @@ inside %DOCKER-OS."
(description "Run a system image as produced by @command{guix system
docker-image} inside Docker.")
(value (with-monad %store-monad
(>>= (system-docker-image (simple-operating-system))
(>>= (system-docker-image (operating-system
(inherit (simple-operating-system))
;; Use locales for a single libc to
;; reduce space requirements.
(locale-libcs (list glibc))))
run-docker-system-test)))))

2
gnu/tests/nfs.scm
View File

@ -404,7 +404,7 @@ directories can be mounted.")
(test-end)
(exit (= (test-runner-fail-count (test-runner-current)) 0)))))
(gexp->derivation "nfs-server-test" test))
(gexp->derivation "nfs-root-fs-test" test))
(define %test-nfs-root-fs
(system-test

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

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
;;;
@ -285,6 +285,10 @@ HTTP-PORT."
'(file-exists? "/srv/git/test")
marionette))
(test-assert "fcgiwrap listens"
;; Wait for fcgiwrap to be ready before cloning.
(wait-for-tcp-port 9000 marionette))
;; Make sure we can clone the repo from the host.
(test-equal "clone"
'#$README-contents

38
guix/hg-download.scm
View File

@ -26,12 +26,14 @@
#:use-module (guix packages)
#:autoload (guix build-system gnu) (standard-packages)
#:use-module (ice-9 match)
#:use-module (ice-9 popen)
#:use-module (ice-9 rdelim)
#:export (hg-reference
hg-reference?
hg-reference-url
hg-reference-changeset
hg-reference-recursive?
hg-predicate
hg-fetch))
;;; Commentary:
@ -93,4 +95,38 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
#:recursive? #t
#:guile-for-build guile)))
(define (hg-file-list directory)
"Evaluates to a list of files contained in the repository at path
@var{directory}"
(let* ((port (open-input-pipe (format #f "hg files --repository ~s" directory)))
(files (let loop ((files '()))
(let ((line (read-line port)))
(cond
((eof-object? line) files)
(else
(loop (cons line files))))))))
(close-pipe port)
(map canonicalize-path files)))
(define (should-select? path-list candidate)
"Returns #t in case that @var{candidate} is a file that is part of the given
@var{path-list}."
(let ((canon-candidate (canonicalize-path candidate)))
(let loop ((xs path-list))
(cond
((null? xs)
;; Directories are not part of `hg files', but `local-file' will not
;; recurse if we don't return #t for directories.
(equal? (array-ref (lstat candidate) 13) 'directory))
((string-contains candidate (car xs)) #t)
(else (loop (cdr xs)))))))
(define (hg-predicate directory)
"This procedure evaluates to a predicate that reports back whether a given
@var{file} - @var{stat} combination is part of the files tracked by
Mercurial."
(let ((files (hg-file-list directory)))
(lambda (file stat)
(should-select? files file))))
;;; hg-download.scm ends here

14
guix/lint.scm
View File

@ -663,17 +663,11 @@ from ~a")
(define (check-patch-file-names package)
"Emit a warning if the patches requires by PACKAGE are badly named or if the
patch could not be found."
(guard (c ((message-condition? c) ;raised by 'search-patch'
(list
;; Use %make-warning, as condition-mesasge is already
;; translated.
(%make-warning package (condition-message c)
#:field 'patch-file-names)))
((formatted-message? c)
(guard (c ((formatted-message? c) ;raised by 'search-patch'
(list (%make-warning package
(apply format #f
(G_ (formatted-message-string c))
(formatted-message-arguments c))))))
(formatted-message-string c)
(formatted-message-arguments c)
#:field 'source))))
(define patches
(match (package-source package)
((? origin? origin) (origin-patches origin))

11
guix/scripts/archive.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -310,6 +311,16 @@ the input port."
(leave (G_ "failed to read public key: ~a: ~a~%")
(error-source err) (error-string err)))))
;; Warn about potentially volatile ACLs, but continue: system reconfiguration
;; might not be possible without (newly-authorized) substitutes.
(let ((stat (false-if-exception (lstat %acl-file))))
(when (and stat (eq? 'symlink (stat:type (lstat %acl-file))))
(warning (G_ "replacing symbolic link ~a with a regular file~%")
%acl-file)
(when (string-prefix? (%store-prefix) (readlink %acl-file))
(display-hint (G_ "On Guix System, add public keys to the
@code{authorized-keys} field of your @code{operating-system} instead.")))))
(let ((key (read-key))
(acl (current-acl)))
(unless (eq? 'public-key (canonical-sexp-nth-data key 0))

2
guix/scripts/publish.scm
View File

@ -891,6 +891,8 @@ blocking."
client))
(port (begin
(force-output client)
(setsockopt client SOL_SOCKET
SO_SNDBUF (* 128 1024))
(nar-response-port response compression))))
;; XXX: Given our ugly workaround for <http://bugs.gnu.org/21093> in
;; 'render-nar', BODY here is just the file name of the store item.

3
guix/ui.scm
View File

@ -435,6 +435,7 @@ exiting. ARGS is the list of arguments received by the 'throw' handler."
(gettext (condition-message obj) %gettext-domain)))
((formatted-message? obj)
(warning (G_ "failed to load '~a': ~a~%")
file
(apply format #f
(gettext (formatted-message-string obj)
%gettext-domain)
@ -717,7 +718,7 @@ evaluating the tests and bodies of CLAUSES."
(package-full-name package)
(build-system-name system))))
((gexp-input-error? c)
(let ((input (package-error-invalid-input c)))
(let ((input (gexp-error-invalid-input c)))
(leave (G_ "~s: invalid G-expression input~%")
(gexp-error-invalid-input c))))
((profile-not-found-error? c)

22267
po/doc/guix-manual.de.po
View File

File diff suppressed because it is too large Load Diff

23616
po/doc/guix-manual.es.po
View File

File diff suppressed because it is too large Load Diff

1200
po/guix/de.po
View File

File diff suppressed because it is too large Load Diff

1411
po/guix/es.po
View File

File diff suppressed because it is too large Load Diff

10
po/guix/fr.po
View File

@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: guix 1.2.0-pre3\n"
"Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
"POT-Creation-Date: 2020-11-05 17:27+0100\n"
"PO-Revision-Date: 2020-11-08 21:36+0100\n"
"PO-Revision-Date: 2020-11-09 16:46+0100\n"
"Last-Translator: Julien Lepiller <julien@lepiller.eu>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@ -4978,8 +4978,8 @@ msgstr "résolution de « ~a » à partir du répertoire actuel~%"
#, scheme-format
msgid "importing module~{ ~a~} from the host~%"
msgid_plural "importing modules~{ ~a~} from the host~%"
msgstr[0] "import du module~{ ~a~} à partir de l'hôte"
msgstr[1] "import des modules~{ ~a~} à partir de l'hôte"
msgstr[0] "import du module~{ ~a~} à partir de l'hôte~%"
msgstr[1] "import des modules~{ ~a~} à partir de l'hôte~%"
#: guix/gnu-maintenance.scm:699
msgid "Updater for GNU packages"
@ -6474,7 +6474,7 @@ msgstr "produit une sortie de déboguage"
#~ msgstr "argument non supporté pour le graphe de référence"
#~ msgid "~a: note: using ~a but ~a is available upstream~%"
#~ msgstr "~a: note: utilisation de ~a mais ~a est disponible en amont"
#~ msgstr "~a: note: utilisation de ~a mais ~a est disponible en amont~%"
#~ msgid "~a: not a number~%"
#~ msgstr "~a: pas un nombre~%"
@ -6486,7 +6486,7 @@ msgstr "produit une sortie de déboguage"
#~ msgstr "échec de la compilation du profil vide~%"
#~ msgid "nothing to do: already at the empty profile~%"
#~ msgstr "aucune action à faire: profil courant vide"
#~ msgstr "aucune action à faire: profil courant vide~%"
#~ msgid "(Please consider upgrading Guile to get proper progress report.)~%"
#~ msgstr "(Veuillez mettre Guile à jour pour obtenir le rapport de progression approprié.)~%"

1182
po/guix/ta.po
View File

File diff suppressed because it is too large Load Diff

7854
po/packages/de.po
View File

File diff suppressed because it is too large Load Diff

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