ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Leo Famulari 2017-07-23 03:42:12 -04:00
commit 6c1a317e29
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
132 changed files with 5502 additions and 1723 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/contributing.texi
View file

@ -31,7 +31,13 @@ choice.
@section Building from Git
If you want to hack Guix itself, it is recommended to use the latest
version from the Git repository. When building Guix from a checkout,
version from the Git repository:
@example
git clone https://git.savannah.gnu.org/git/guix.git
@end example
When building Guix from a checkout,
the following packages are required in addition to those mentioned in
the installation instructions (@pxref{Requirements}).

41
doc/guix.texi
View file

@ -2315,6 +2315,22 @@ package builds referenced by those generations can be reclaimed. This
is achieved by running @code{guix package --delete-generations}
(@pxref{Invoking guix package}).
Our recommendation is to run a garbage collection periodically, or when
you are short on disk space. For instance, to guarantee that at least
5@tie{}GB are available on your disk, simply run:
@example
guix gc -F 5G
@end example
It is perfectly safe to run as a non-interactive periodic job
(@pxref{Scheduled Job Execution}, for how to set up such a job on
GuixSD). Running @command{guix gc} with no arguments will collect as
much garbage as it can, but that is often inconvenient: you may find
yourself having to rebuild or re-download software that is ``dead'' from
the GC viewpoint but that is necessary to build other pieces of
software---e.g., the compiler tool chain.
The @command{guix gc} command has three modes of operation: it can be
used to garbage-collect any dead files (the default), to delete specific
files (the @code{--delete} option), to print garbage-collector
@ -6338,6 +6354,16 @@ The available options are:
Use substitute information from @var{urls}.
@xref{client-substitute-urls, the same option for @code{guix build}}.
@item --sort=@var{key}
Sort lines according to @var{key}, one of the following options:
@table @code
@item closure
the total size of the item's closure (the default);
@item self
the size of each item.
@end table
@item --map-file=@var{file}
Write a graphical map of disk usage in PNG format to @var{file}.
@ -6934,7 +6960,8 @@ guarantee that the store items it provides will indeed remain available
for as long as @var{ttl}.
Additionally, when @option{--cache} is used, cached entries that have
not been accessed for @var{ttl} may be deleted.
not been accessed for @var{ttl} and that no longer have a corresponding
item in the store, may be deleted.
@item --nar-path=@var{path}
Use @var{path} as the prefix for the URLs of ``nar'' files
@ -14746,6 +14773,10 @@ from source.
@item @code{one-shot?} (default: @code{#f})
Only evaluate specifications and build derivations once.
@item @code{fallback?} (default: @code{#f})
When substituting a pre-built binary fails, fall back to building
packages locally.
@item @code{load-path} (default: @code{'()})
This allows users to define their own packages and make them visible to
cuirass as in @command{guix build} command.
@ -15921,10 +15952,10 @@ The type of a bootloader configuration declaration.
@cindex UEFI, bootloader
@cindex BIOS, bootloader
The bootloader to use, as a @code{bootloader} object. For now
@code{grub-bootloader}, @code{grub-efi-bootloader} and
@code{extlinux-bootloader} are supported. @code{grub-efi-bootloader},
allows to boot on modern systems using the @dfn{Unified Extensible
Firmware Interface} (UEFI).
@code{grub-bootloader}, @code{grub-efi-bootloader},
@code{extlinux-bootloader} and @code{u-boot-bootloader} are supported.
@code{grub-efi-bootloader} allows to boot on modern systems using the
@dfn{Unified Extensible Firmware Interface} (UEFI).
Available bootloaders are described in @code{(gnu bootloader @dots{})}
modules.

2
etc/guix-daemon.conf.in
View file

@ -7,6 +7,4 @@ start on runlevel [2345]
stop on runlevel [016]
task
exec @localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild

47
gnu/bootloader/u-boot.scm Normal file
View file

@ -0,0 +1,47 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu bootloader u-boot)
#:use-module (gnu bootloader extlinux)
#:use-module (gnu bootloader)
#:use-module (gnu system)
#:use-module (gnu packages bootloaders)
#:use-module (guix gexp)
#:use-module (guix monads)
#:use-module (guix records)
#:use-module (guix utils)
#:export (u-boot-bootloader))
(define install-u-boot
#~(lambda (bootloader device mount-point)
(if bootloader
(error "Failed to install U-Boot"))))
;;;
;;; Bootloader definitions.
;;;
(define u-boot-bootloader
(bootloader
(inherit extlinux-bootloader)
(name 'u-boot)
(package #f)
(installer install-u-boot)))

44
gnu/build/vm.scm
View file

@ -76,11 +76,14 @@ (define* (load-in-linux-vm builder
(qemu (qemu-command)) (memory-size 512)
linux initrd
make-disk-image?
single-file-output?
(disk-image-size (* 100 (expt 2 20)))
(disk-image-format "qcow2")
(references-graphs '()))
"Run BUILDER, a Scheme file, into a VM running LINUX with INITRD, and copy
the result to OUTPUT.
the result to OUTPUT. If SINGLE-FILE-OUTPUT? is true, copy a single file from
/xchg to OUTPUT. Otherwise, copy the contents of /xchg to a new directory
OUTPUT.
When MAKE-DISK-IMAGE? is true, OUTPUT will contain a VM image of
DISK-IMAGE-SIZE bytes resulting from the execution of BUILDER, which may
@ -137,8 +140,17 @@ (define* (load-in-linux-vm builder
;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already.
(unless make-disk-image?
(mkdir output)
(copy-recursively "xchg" output)))
(if single-file-output?
(let ((graph? (lambda (name stat)
(member (basename name) references-graphs))))
(match (find-files "xchg" (negate graph?))
((result)
(copy-file result output))
(x
(error "did not find a single result file" x))))
(begin
(mkdir output)
(copy-recursively "xchg" output)))))
;;;
@ -157,8 +169,8 @@ (define-record-type* <partition> partition make-partition
(define (estimated-partition-size graphs)
"Return the estimated size of a partition that can store the store items
given by GRAPHS, a list of file names produced by #:references-graphs."
;; Simply add a 20% overhead.
(round (* 1.2 (closure-size graphs))))
;; Simply add a 25% overhead.
(round (* 1.25 (closure-size graphs))))
(define* (initialize-partition-table device partitions
#:key
@ -354,9 +366,9 @@ (define (install-efi grub esp config-file)
(error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target
#:key (volume-id "GuixSD") (volume-uuid #f))
#:key (volume-id "GuixSD_image") (volume-uuid #f))
"Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
Grub configuration and OS-DRV as the stuff in it."
GRUB configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue")))
(mkdir-p "/tmp/root/var/run")
(mkdir-p "/tmp/root/run")
@ -367,6 +379,19 @@ (define* (make-iso9660-image grub config-file os-drv target
"var=/tmp/root/var"
"run=/tmp/root/run"
"--"
;; Store two copies of the headers.
;; The resulting ISO-9660 image has a DOS MBR and
;; one protective partition (with type 0xCD).
;; Because GuixSD only uses actual partitions
;; rather than what /proc/partitions returns, work
;; around it by storing the primary volume
;; descriptor twice, once where it should be and
;; once in the partition.
;; Allegedly, otherwise, many other GNU tools
;; (automounters etc) would also be confused by
;; the extra partition so it makes sense to
;; store two copies in any case.
"-boot_image" "any" "partition_offset=16"
"-volid" ,(string-upcase volume-id)
,@(if volume-uuid
`("-volume_date" "uuid"
@ -427,11 +452,14 @@ (define (partition-esp? partition)
;; Create a tiny configuration file telling the embedded grub
;; where to load the real thing.
;; XXX This is quite fragile, and can prevent the image from booting
;; when there's more than one volume with this label present.
;; Reproducible almost-UUIDs could reduce the risk (not eliminate it).
(call-with-output-file grub-config
(lambda (port)
(format port
"insmod part_msdos~@
search --set=root --label GuixSD~@
search --set=root --label GuixSD_image~@
configfile /boot/grub/grub.cfg~%")))
(display "creating EFI firmware image...")

27
gnu/local.mk
View file

@ -40,6 +40,7 @@ GNU_SYSTEM_MODULES = \
%D%/bootloader.scm \
%D%/bootloader/grub.scm \
%D%/bootloader/extlinux.scm \
%D%/bootloader/u-boot.scm \
%D%/packages.scm \
%D%/packages/abduco.scm \
%D%/packages/abiword.scm \
@ -98,6 +99,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/cpio.scm \
%D%/packages/cpp.scm \
%D%/packages/cppi.scm \
%D%/packages/cran.scm \
%D%/packages/cross-base.scm \
%D%/packages/crypto.scm \
%D%/packages/cryptsetup.scm \
@ -149,6 +151,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/fonts.scm \
%D%/packages/fontutils.scm \
%D%/packages/fpga.scm \
%D%/packages/forth.scm \
%D%/packages/freedesktop.scm \
%D%/packages/freeipmi.scm \
%D%/packages/ftp.scm \
@ -163,7 +166,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gdb.scm \
%D%/packages/geo.scm \
%D%/packages/gettext.scm \
%D%/packages/gforth.scm \
%D%/packages/ghostscript.scm \
%D%/packages/gimp.scm \
%D%/packages/gkrellm.scm \
@ -264,6 +266,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/maths.scm \
%D%/packages/mc.scm \
%D%/packages/mcrypt.scm \
%D%/packages/medical.scm \
%D%/packages/mes.scm \
%D%/packages/messaging.scm \
%D%/packages/mingw.scm \
@ -327,7 +330,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/pv.scm \
%D%/packages/python.scm \
%D%/packages/tryton.scm \
%D%/packages/qemu.scm \
%D%/packages/qt.scm \
%D%/packages/ragel.scm \
%D%/packages/rails.scm \
@ -363,6 +365,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/skribilo.scm \
%D%/packages/slang.scm \
%D%/packages/smalltalk.scm \
%D%/packages/sml.scm \
%D%/packages/speech.scm \
%D%/packages/spice.scm \
%D%/packages/ssh.scm \
@ -397,6 +400,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/version-control.scm \
%D%/packages/video.scm \
%D%/packages/vim.scm \
%D%/packages/virtualization.scm \
%D%/packages/vpn.scm \
%D%/packages/w3m.scm \
%D%/packages/wdiff.scm \
@ -518,7 +522,6 @@ dist_patch_DATA = \
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-completion-directories.patch \
%D%/packages/patches/bigloo-gc-shebangs.patch \
%D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blast+-fix-makefile.patch \
@ -534,6 +537,7 @@ dist_patch_DATA = \
%D%/packages/patches/ceph-skip-collect-sys-info-test.patch \
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
%D%/packages/patches/chicken-CVE-2017-6949.patch \
%D%/packages/patches/chicken-CVE-2017-11343.patch \
%D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/clang-libc-search-path.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
@ -574,6 +578,7 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/eudev-rules-directory.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
%D%/packages/patches/evince-CVE-2017-1000083.patch \
%D%/packages/patches/exim-CVE-2017-1000369.patch \
%D%/packages/patches/fabric-tests.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
@ -684,8 +689,10 @@ dist_patch_DATA = \
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/heimdal-CVE-2017-6594.patch \
%D%/packages/patches/heimdal-CVE-2017-11103.patch \
%D%/packages/patches/hmmer-remove-cpu-specificity.patch \
%D%/packages/patches/higan-remove-march-native-flag.patch \
%D%/packages/patches/hop-linker-flags.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
@ -696,6 +703,7 @@ dist_patch_DATA = \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
%D%/packages/patches/jbig2dec-CVE-2016-9601.patch \
%D%/packages/patches/jbig2dec-CVE-2017-7885.patch \
@ -771,6 +779,7 @@ dist_patch_DATA = \
%D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libunwind-CVE-2015-3239.patch \
%D%/packages/patches/libunistring-gnulib-multi-core.patch \
%D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \
%D%/packages/patches/libxml2-CVE-2016-4658.patch \
@ -812,6 +821,7 @@ dist_patch_DATA = \
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
%D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \
%D%/packages/patches/metabat-remove-compilation-date.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \
@ -932,17 +942,16 @@ dist_patch_DATA = \
%D%/packages/patches/python-statsmodels-fix-tests.patch \
%D%/packages/patches/python-configobj-setuptools.patch \
%D%/packages/patches/python-cython-fix-tests-32bit.patch \
%D%/packages/patches/python-fake-factory-fix-build-32bit.patch \
%D%/packages/patches/python-faker-fix-build-32bit.patch \
%D%/packages/patches/python-pandas-skip-failing-tests.patch \
%D%/packages/patches/python-paste-remove-website-test.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \
%D%/packages/patches/python-pbr-fix-man-page-support.patch \
%D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \
%D%/packages/patches/python-pygit2-disable-network-tests.patch \
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/qemu-CVE-2017-7493.patch \
%D%/packages/patches/qemu-CVE-2017-8112.patch \
@ -950,9 +959,11 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2017-8379.patch \
%D%/packages/patches/qemu-CVE-2017-8380.patch \
%D%/packages/patches/qemu-CVE-2017-9524.patch \
%D%/packages/patches/qemu-CVE-2017-11334.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quassel-fix-tls-check.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
@ -983,11 +994,14 @@ dist_patch_DATA = \
%D%/packages/patches/slim-reset.patch \
%D%/packages/patches/slim-login.patch \
%D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/spice-CVE-2016-9577.patch \
%D%/packages/patches/spice-CVE-2016-9578-1.patch \
%D%/packages/patches/spice-CVE-2016-9578-2.patch \
%D%/packages/patches/spice-CVE-2017-7506.patch \
%D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/superlu-dist-scotchmetis.patch \
%D%/packages/patches/supertuxkart-angelscript-ftbfs.patch \
%D%/packages/patches/swish-e-search.patch \
%D%/packages/patches/swish-e-format-security.patch \
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \
@ -1038,6 +1052,7 @@ dist_patch_DATA = \
%D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \
%D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \
%D%/packages/patches/vpnc-script.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
%D%/packages/patches/weechat-python.patch \

4
gnu/packages/acct.scm
View file

@ -25,7 +25,7 @@ (define-module (gnu packages acct)
(define-public acct
(package
(name "acct")
(version "6.6.3")
(version "6.6.4")
(source
(origin
(method url-fetch)
@ -33,7 +33,7 @@ (define-public acct
version ".tar.gz"))
(sha256
(base32
"14x0zklwlg7cc7amlyzffqr8az3fqj1h9dyj0hvl1kpi7cr7kbjy"))))
"0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"))))
(build-system gnu-build-system)
(home-page "https://gnu.org/software/acct/")
(synopsis "Standard login and process accounting utilities")

15
gnu/packages/admin.scm
View file

@ -271,7 +271,13 @@ (define-public inetutils
"05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")
`(#:configure-flags '("--localstatedir=/var"
;; Make sure 'PATH_PROCNET_DEV' gets defined when
;; cross-compiling (by default it does not.)
,@(if (%current-target-system)
'("--with-path-procnet-dev=/proc/net/dev")
'()))
;; On some systems, 'libls.sh' may fail with an error such as:
;; "Failed to tell switch -a apart from -A".
#:parallel-tests? #f))
@ -300,7 +306,7 @@ (define-public shadow
"0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w"))))
(build-system gnu-build-system)
(arguments
'(;; Assume System V `setpgrp (void)', which is the default on GNU
`(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags
'("--with-libpam" "ac_cv_func_setpgrp_void=yes")
@ -310,7 +316,10 @@ (define-public shadow
(add-before 'build 'set-nscd-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Use the right file name for nscd.
(let ((libc (assoc-ref inputs "libc")))
(let ((libc (assoc-ref inputs
,(if (%current-target-system)
"cross-libc"
"libc"))))
(substitute* "lib/nscd.c"
(("/usr/sbin/nscd")
(string-append libc "/sbin/nscd"))))))

7
gnu/packages/audio.scm
View file

@ -1136,7 +1136,7 @@ (define-public freepats
(define-public guitarix
(package
(name "guitarix")
(version "0.35.4")
(version "0.35.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -1144,7 +1144,7 @@ (define-public guitarix
version ".tar.xz"))
(sha256
(base32
"1vip4d5hc20vjkh8c9bwn92gyqcc6a1ml6hs39djp59mmybr13dp"))))
"00pfb6qa3jfa6qaql7isnb8srfdfmk362ygslh7y0qkm36qasmh4"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no "check" target
@ -2766,7 +2766,8 @@ (define-public shntool
(description "shntool is a multi-purpose WAVE data processing and reporting
utility. File formats are abstracted from its core, so it can process any file
that contains WAVE data, compressed or not---provided there exists a format
module to handle that particular file type.")
module to handle that particular file type. It can also generate CUE files, and
use them split WAVE data into multiple files.")
(home-page "http://etree.org/shnutils/shntool/")
;; 'install-sh' bears the x11 license
(license (list license:gpl2+ license:x11))))

21
gnu/packages/backup.scm
View file

@ -118,7 +118,7 @@ (define-public duplicity
(define-public par2cmdline
(package
(name "par2cmdline")
(version "0.7.2")
(version "0.7.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
@ -126,7 +126,7 @@ (define-public par2cmdline
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0rsrca7903g08zrifv4102gkxrhmzvgwd1sb6vw9pa00qhzsfkzs"))))
"0dqwarc2aw5clgpf24d9dxh43b0k0z3l6kksn30arx9bdlmrk5rx"))))
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf)))
@ -136,10 +136,15 @@ (define-public par2cmdline
(modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda _ (zero? (system* "autoreconf" "-vfi")))))))
(synopsis "File verification and repair tool")
(description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
files using Reed-Solomon coding. PAR2 files can be stored along side backups
or distributed files for recovering from bitrot.")
(synopsis "File verification and repair tools")
(description "Par2cmdline uses Reed-Solomon error-correcting codes to
generate and verify PAR2 recovery files. These files can be distributed
alongside the source files or stored together with back-ups to protect against
transmission errors or @dfn{bit rot}, the degradation of storage media over
time.
Unlike a simple checksum, PAR2 doesn't merely detect errors: as long as the
damage isn't too extensive (and smaller than the size of the recovery file), it
can even repair them.")
(home-page "https://github.com/Parchive/par2cmdline")
(license license:gpl3+)))
@ -456,13 +461,13 @@ (define-public libchop
(define-public borg
(package
(name "borg")
(version "1.0.10")
(version "1.0.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32
"1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp"))
"14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw"))
(modules '((guix build utils)))
(snippet
'(for-each

14
gnu/packages/base.scm
View file

@ -835,23 +835,11 @@ (define-public glibc-2.22
`(modify-phases ,phases
(add-before 'configure 'fix-pwd
(lambda _
;; Use `pwd' instead of `/bin/pwd' for glibc-2.21
;; Use `pwd' instead of `/bin/pwd' for glibc-2.22.
(substitute* "configure"
(("/bin/pwd") "pwd"))
#t))))))))
(define-public glibc-2.21
(package
(inherit glibc-2.22)
(version "2.21")
(source (origin
(inherit (package-source glibc-2.22))
(uri (string-append "mirror://gnu/glibc/glibc-"
version ".tar.xz"))
(sha256
(base32
"1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))))))
(define-public glibc-locales
(package
(inherit glibc)

250
gnu/packages/bioinformatics.scm
View file

@ -248,7 +248,7 @@ (define-public bamm
("python-nose" ,python2-nose)
("python-pysam" ,python2-pysam)))
(inputs
`(("htslib" ,htslib)
`(("htslib" ,htslib-1.3) ; At least one test fails on htslib-1.4+.
("samtools" ,samtools)
("bwa" ,bwa)
("grep" ,grep)
@ -300,7 +300,7 @@ (define-public bamtools
(define-public bcftools
(package
(name "bcftools")
(version "1.3.1")
(version "1.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -308,33 +308,27 @@ (define-public bcftools
version "/bcftools-" version ".tar.bz2"))
(sha256
(base32
"095ry68vmz9q5s1scjsa698dhgyvgw5aicz24c19iwfbai07mhqj"))
"0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"))
(modules '((guix build utils)))
(snippet
;; Delete bundled htslib.
'(delete-file-recursively "htslib-1.3.1"))))
'(delete-file-recursively "htslib-1.5"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
#:configure-flags (list "--with-htslib=system")
#:make-flags
(list
"USE_GPL=1"
"LIBS=-lgsl -lgslcblas"
(string-append "prefix=" (assoc-ref %outputs "out"))
(string-append "HTSDIR=" (assoc-ref %build-inputs "htslib") "/include")
(string-append "HTSLIB=" (assoc-ref %build-inputs "htslib") "/lib/libhts.a")
(string-append "HTSLIB=" (assoc-ref %build-inputs "htslib") "/lib/libhts.so")
(string-append "BGZIP=" (assoc-ref %build-inputs "htslib") "/bin/bgzip")
(string-append "TABIX=" (assoc-ref %build-inputs "htslib") "/bin/tabix"))
(string-append "TABIX=" (assoc-ref %build-inputs "htslib") "/bin/tabix")
(string-append "PACKAGE_VERSION=" ,version))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-Makefile
(lambda _
(substitute* "Makefile"
;; Do not attempt to build htslib.
(("^include \\$\\(HTSDIR\\)/htslib\\.mk") "")
;; Link against GSL cblas.
(("-lcblas") "-lgslcblas"))
#t))
(delete 'configure)
(add-before 'check 'patch-tests
(lambda _
(substitute* "test/test.pl"
@ -1195,7 +1189,7 @@ (define-public bless
(define-public bowtie
(package
(name "bowtie")
(version "2.2.9")
(version "2.3.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BenLangmead/bowtie2/archive/v"
@ -1203,7 +1197,7 @@ (define-public bowtie
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1vp5db8i7is57iwjybcdg18f5ivyzlj5g1ix1nlvxainzivhz55g"))
"0hwa5r9qbglppb7sz5z79rlmmddr3n51n468jb3wh8rwjgn3yr90"))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile"
@ -1211,28 +1205,28 @@ (define-public bowtie
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)
("perl-clone" ,perl-clone)
("perl-test-deep" ,perl-test-deep)
("perl-test-simple" ,perl-test-simple)
("python" ,python-2)
("tbb" ,tbb)))
(inputs
`(("perl" ,perl)
("perl-clone" ,perl-clone)
("perl-test-deep" ,perl-test-deep)
("perl-test-simple" ,perl-test-simple)
("python" ,python-2)
("tbb" ,tbb)
("zlib" ,zlib)))
(arguments
'(#:make-flags
(list "allall"
"WITH_TBB=1"
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(alist-delete
'configure
(alist-replace
'check
(lambda* (#:key outputs #:allow-other-keys)
(system* "perl"
"scripts/test/simple_tests.pl"
"--bowtie2=./bowtie2"
"--bowtie2-build=./bowtie2-build"))
%standard-phases))))
(modify-phases %standard-phases
(delete 'configure)
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "perl"
"scripts/test/simple_tests.pl"
"--bowtie2=./bowtie2"
"--bowtie2-build=./bowtie2-build")))))))
(home-page "http://bowtie-bio.sourceforge.net/bowtie2/index.shtml")
(synopsis "Fast and sensitive nucleotide sequence read aligner")
(description
@ -1424,7 +1418,7 @@ (define-public python2-bx-python
(define-public python-pysam
(package
(name "python-pysam")
(version "0.10.0")
(version "0.11.2.2")
(source (origin
(method url-fetch)
;; Test data is missing on PyPi.
@ -1434,7 +1428,7 @@ (define-public python-pysam
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1mmvn91agr238kwz7226xq0i7k84lg2nxywn9712mzj7gvgqhfy8"))
"1cfqdxsqs3xhacns9n0271ck6wkc76px66ddjm91wfw2jxxfklvc"))
(modules '((guix build utils)))
(snippet
;; Drop bundled htslib. TODO: Also remove samtools and bcftools.
@ -1533,13 +1527,13 @@ (define-public python2-twobitreader
(define-public python-plastid
(package
(name "python-plastid")
(version "0.4.6")
(version "0.4.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "plastid" version))
(sha256
(base32
"1sqkz5d3b9kf688mp7k771c87ins42j7j0whmkb49cb3fsg8s8lj"))))
"0l24dd3q66if8yj042m4s0g95n6acn7im1imqd3p6h8ns43kxhj8"))))
(build-system python-build-system)
(arguments
;; Some test files are not included.
@ -3051,7 +3045,7 @@ (define-public java-htsjdk
(define-public htslib
(package
(name "htslib")
(version "1.3.1")
(version "1.5")
(source (origin
(method url-fetch)
(uri (string-append
@ -3059,7 +3053,7 @@ (define-public htslib
version "/htslib-" version ".tar.bz2"))
(sha256
(base32
"1rja282fwdc25ql6izkhdyh8ppw8x2fs0w0js78zgkmqjlikmma9"))))
"0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -3071,7 +3065,9 @@ (define-public htslib
(("/bin/bash") (which "bash")))
#t)))))
(inputs
`(("zlib" ,zlib)))
`(("openssl" ,openssl)
("curl" ,curl)
("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)))
(home-page "http://www.htslib.org")
@ -3083,6 +3079,20 @@ (define-public htslib
;; the rest is released under the Expat license
(license (list license:expat license:bsd-3))))
;; This package should be removed once no packages rely upon it.
(define htslib-1.3
(package
(inherit htslib)
(version "1.3.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/samtools/htslib/releases/download/"
version "/htslib-" version ".tar.bz2"))
(sha256
(base32
"1rja282fwdc25ql6izkhdyh8ppw8x2fs0w0js78zgkmqjlikmma9"))))))
(define-public idr
(package
(name "idr")
@ -3457,23 +3467,20 @@ (define-public mash
license:cpl1.0)))) ; Open Bloom Filter
(define-public metabat
;; We package from a git commit because compilation of the released version
;; fails.
(let ((commit "cbdca756993e66ae57e50a27970595dda9cbde1b"))
(package
(name "metabat")
(version (string-append "0.32.4-1." (string-take commit 8)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://bitbucket.org/berkeleylab/metabat.git")
(commit commit)))
(file-name (string-append name "-" version))
(sha256
(base32
"0byia8nsip6zvc4ha0qkxkxxyjf4x7jcvy48q2dvb0pzr989syzr"))
(patches (search-patches "metabat-remove-compilation-date.patch"))))
(package
(name "metabat")
(version "2.11.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/berkeleylab/metabat/get/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ll00l81aflscgggs5nfhj12cbvdiz3gg7f7n5f537a3xhx60vn9"))
(patches (search-patches "metabat-remove-compilation-date.patch"
"metabat-fix-compilation.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -3490,35 +3497,35 @@ (define-public metabat
"#include \"htslib/kseq.h\""))
#t))
(add-after 'unpack 'fix-scons
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "SConstruct"
(("^htslib_dir = 'samtools'")
(string-append "hitslib_dir = '"
(assoc-ref inputs "htslib")
"'"))
(("^samtools_dir = 'samtools'")
(string-append "samtools_dir = '"
(assoc-ref inputs "htslib")
"'"))
(("^findStaticOrShared\\('bam', hts_lib")
(string-append "findStaticOrShared('bam', '"
(assoc-ref inputs "samtools")
"/lib'"))
;; Do not distribute README.
(("^env\\.Install\\(idir_prefix, 'README\\.md'\\)") ""))
#t))
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "SConstruct"
(("^htslib_dir += 'samtools'")
(string-append "htslib_dir = '"
(assoc-ref inputs "htslib")
"'"))
(("^samtools_dir = 'samtools'")
(string-append "samtools_dir = '"
(assoc-ref inputs "samtools")
"'"))
(("^findStaticOrShared\\('bam', hts_lib")
(string-append "findStaticOrShared('bam', '"
(assoc-ref inputs "samtools")
"/lib'"))
;; Do not distribute README.
(("^env\\.Install\\(idir_prefix, 'README\\.md'\\)") ""))
#t))
(delete 'configure)
(replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(mkdir (assoc-ref outputs "out"))
(zero? (system* "scons"
(string-append
"PREFIX="
(assoc-ref outputs "out"))
(string-append
"BOOST_ROOT="
(assoc-ref inputs "boost"))
"install"))))
(lambda* (#:key inputs outputs #:allow-other-keys)
(mkdir (assoc-ref outputs "out"))
(zero? (system* "scons"
(string-append
"PREFIX="
(assoc-ref outputs "out"))
(string-append
"BOOST_ROOT="
(assoc-ref inputs "boost"))
"install"))))
;; Check and install are carried out during build phase.
(delete 'check)
(delete 'install))))
@ -3539,8 +3546,8 @@ (define-public metabat
enables the study of individual organisms and their interactions. MetaBAT is
an automated metagenome binning software, which integrates empirical
probabilistic distances of genome abundance and tetranucleotide frequency.")
(license (license:non-copyleft "file://license.txt"
"See license.txt in the distribution.")))))
(license (license:non-copyleft "file://license.txt"
"See license.txt in the distribution."))))
(define-public minced
(package
@ -4320,6 +4327,8 @@ (define-public raxml
(description
"RAxML is a tool for phylogenetic analysis and post-analysis of large
phylogenies.")
;; The source includes x86 specific code
(supported-systems '("x86_64-linux" "i686-linux"))
(license license:gpl2+)))
(define-public rsem
@ -4512,7 +4521,7 @@ (define-public seek
(define-public samtools
(package
(name "samtools")
(version "1.3.1")
(version "1.5")
(source
(origin
(method url-fetch)
@ -4521,7 +4530,7 @@ (define-public samtools
version "/samtools-" version ".tar.bz2"))
(sha256
(base32
"0znnnxc467jbf1as2dpskrjhfh8mbll760j6w6rdkwlwbqsp8gbc"))))
"1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((ice-9 ftw)
@ -4529,36 +4538,35 @@ (define-public samtools
(guix build gnu-build-system)
(guix build utils))
#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:configure-flags (list "--with-ncurses")
#:configure-flags (list "--with-ncurses" "--with-htslib=system")
#:phases
(alist-cons-after
'unpack 'patch-tests
(lambda _
(substitute* "test/test.pl"
;; The test script calls out to /bin/bash
(("/bin/bash") (which "bash")))
#t)
(alist-cons-after
'install 'install-library
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out") "/lib")))
(install-file "libbam.a" lib)
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
(substitute* "test/test.pl"
;; The test script calls out to /bin/bash
(("/bin/bash") (which "bash")))
#t))
(alist-cons-after
'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let ((include (string-append (assoc-ref outputs "out")
"/include/samtools/")))
(for-each (lambda (file)
(install-file file include))
(scandir "." (lambda (name) (string-match "\\.h$" name))))
#t))
%standard-phases)))))
(add-after 'install 'install-library
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out") "/lib")))
(install-file "libbam.a" lib)
#t)))
(add-after 'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let ((include (string-append (assoc-ref outputs "out")
"/include/samtools/")))
(for-each (lambda (file)
(install-file file include))
(scandir "." (lambda (name) (string-match "\\.h$" name))))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("ncurses" ,ncurses)
("perl" ,perl)
("python" ,python)
("zlib" ,zlib)))
(inputs
`(("htslib" ,htslib)
("ncurses" ,ncurses)
("perl" ,perl)
("python" ,python)
("zlib" ,zlib)))
(home-page "http://samtools.sourceforge.net")
(synopsis "Utilities to efficiently manipulate nucleotide sequence alignments")
(description
@ -5316,6 +5324,8 @@ (define-public sortmerna
sequencing (NGS) reads. The core algorithm is based on approximate seeds and
allows for fast and sensitive analyses of nucleotide sequences. The main
application of SortMeRNA is filtering rRNA from metatranscriptomic data.")
;; The source includes x86 specific code
(supported-systems '("x86_64-linux" "i686-linux"))
(license license:lgpl3)))
(define-public star
@ -6528,13 +6538,13 @@ (define-public r-dnacopy
(define-public r-s4vectors
(package
(name "r-s4vectors")
(version "0.14.0")
(version "0.14.3")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "S4Vectors" version))
(sha256
(base32
"0ywwrs4d752xfk0p0w122kvi0xvp6nmxnyynchbsa8zciqymhgv8"))))
"1r7s4pfw026qazzic090mhk8d9m39j2nwl87dyqcpdylyq7gq5qs"))))
(properties
`((upstream-name . "S4Vectors")))
(build-system r-build-system)
@ -6780,13 +6790,13 @@ (define-public r-xvector
(define-public r-genomicranges
(package
(name "r-genomicranges")
(version "1.28.0")
(version "1.28.4")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "GenomicRanges" version))
(sha256
(base32
"10x9zx0b7j05d1j6p0xs4q4f4wzbhf3rq64wzi9cgv7f44q43a5n"))))
"1y15kg1q81h8rmga83ljiwr8whkajcargfjiljr212d6if17ys1z"))))
(properties
`((upstream-name . "GenomicRanges")))
(build-system r-build-system)
@ -7559,7 +7569,7 @@ (define-public r-bsgenome-hsapiens-ucsc-hg19
version ".tar.gz"))
(sha256
(base32
"1y0nqpk8cw5a34sd9hmin3z4v7iqm6hf6l22cl81vlbxqbjibxc8"))))
"0479qx4bapgcp5chj10a63chk0s28x9cx1gamz3f5m3yd7jzwcf2"))))
(properties
`((upstream-name . "BSgenome.Hsapiens.UCSC.hg19")))
(build-system r-build-system)

2
gnu/packages/bootloaders.scm
View file

@ -40,8 +40,8 @@ (define-module (gnu packages bootloaders)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages qemu)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages virtualization)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)

39
gnu/packages/build-tools.scm
View file

@ -23,6 +23,7 @@ (define-module (gnu packages build-tools)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages python)
#:use-module (gnu packages ninja)
#:use-module (guix build-system gnu)
@ -69,7 +70,7 @@ (define-public bam
(define-public meson
(package
(name "meson")
(version "0.40.1")
(version "0.41.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
@ -77,7 +78,7 @@ (define-public meson
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0yl6iryh89nn6hzhwv7kg16ki1chh9h0x1yk1y130h87iq42a35r"))))
"12ygjh1dxi8z06nl704rfb6zj0m2zjqp279nymfgzfgy5zq032d4"))))
(build-system python-build-system)
(inputs `(("ninja", ninja)))
(home-page "https://mesonbuild.com/")
@ -90,3 +91,37 @@ (define-public meson
files}, are written in a custom domain-specific language (DSL) that resembles
Python.")
(license license:asl2.0)))
(define-public premake4
(package
(name "premake")
(version "4.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/premake/Premake/"
version "/premake-" version "-src.zip"))
(sha256
(base32
"1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"))))
(build-system gnu-build-system)
(native-inputs
`(("unzip" ,unzip))) ; for unpacking the source
(arguments
`(#:make-flags '("CC=gcc")
#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'enter-source
(lambda _ (chdir "build/gmake.unix") #t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(install-file "../../bin/release/premake4"
(string-append (assoc-ref outputs "out") "/bin"))
#t)))))
(synopsis "Portable software build tool")
(description "@code{premake4} is a command line utility that reads a
scripted definition of a software project and outputs @file{Makefile}s or
other lower-level build files.")
(home-page "https://premake.github.io")
(license license:bsd-3)))

44
gnu/packages/cran.scm Normal file
View file

@ -0,0 +1,44 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages cran)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system r))
(define-public r-colorspace
(package
(name "r-colorspace")
(version "1.3-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "colorspace" version))
(sha256
(base32 "0d1ya7hx4y58n5ivwmdmq2zgh0g2sbv7ykh13n85c1355csd57yx"))))
(build-system r-build-system)
(home-page "http://cran.r-project.org/web/packages/colorspace")
(synopsis "Color space manipulation")
(description
"This package carries out a mapping between assorted color spaces
including RGB, HSV, HLS, CIEXYZ, CIELUV, HCL (polar CIELUV), CIELAB and polar
CIELAB. Qualitative, sequential, and diverging color palettes based on HCL
colors are provided.")
(license license:bsd-3)))

4
gnu/packages/crypto.scm
View file

@ -57,7 +57,7 @@ (define-module (gnu packages crypto)
(define-public libsodium
(package
(name "libsodium")
(version "1.0.12")
(version "1.0.13")
(source (origin
(method url-fetch)
(uri (list (string-append
@ -68,7 +68,7 @@ (define-public libsodium
"releases/old/libsodium-" version ".tar.gz")))
(sha256
(base32
"159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"))))
"1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww"))))
(build-system gnu-build-system)
(synopsis "Portable NaCl-based crypto library")
(description

4
gnu/packages/cups.scm
View file

@ -339,14 +339,14 @@ (define-public cups
(define-public hplip
(package
(name "hplip")
(version "3.16.11")
(version "3.17.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"))))
"0zhhnp3ksd9i2maaqrsjn4p3y7im3llgylp2y8qgmqypm8s7ha40"))))
(build-system gnu-build-system)
(home-page "http://hplipopensource.com/")
(synopsis "HP Printer Drivers")

4
gnu/packages/databases.scm
View file

@ -293,7 +293,7 @@ (define-public leveldb
(define-public mysql
(package
(name "mysql")
(version "5.7.18")
(version "5.7.19")
(source (origin
(method url-fetch)
(uri (list (string-append
@ -305,7 +305,7 @@ (define-public mysql
name "-" version ".tar.gz")))
(sha256
(base32
"18m1mr55k9zmvnyqs0wr50csqsz3scs09fykh60wsml6c3np2p8b"))))
"1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags

2
gnu/packages/debug.scm
View file

@ -32,7 +32,7 @@ (define-module (gnu packages debug)
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages qemu)
#:use-module (gnu packages virtualization)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))

17
gnu/packages/dns.scm
View file

@ -443,17 +443,17 @@ (define-public unbound
(define-public yadifa
(package
(name "yadifa")
(version "2.2.4")
(version "2.2.5")
(source
(let ((revision "6924"))
(let ((build "6937"))
(origin
(method url-fetch)
(uri
(string-append "http://cdn.yadifa.eu/sites/default/files/releases/"
name "-" version "-" revision ".tar.gz"))
name "-" version "-" build ".tar.gz"))
(sha256
(base32
"060ydcfn9876bs6p5xi3p1k20ca547f4jck25r5x1hnxjlv7ss03")))))
"146fs52izf6dfwsxal3srpwin2yyl41g31cy4pyvbi5mqy2craj7")))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))
@ -470,10 +470,7 @@ (define-public yadifa
"--enable-shared" "--disable-static"
"--enable-messages" "--enable-ctrl"
"--enable-nsec" "--enable-nsec3"
"--enable-tsig" "--enable-caching"
;; NSID is a rarely-used debugging aid, that also
;; causes the build to fail. Just disable it.
"--disable-nsid")))
"--enable-tsig" "--enable-caching")))
(home-page "http://www.yadifa.eu/")
(synopsis "Authoritative DNS name server")
(description "YADIFA is an authoritative name server for the @dfn{Domain
@ -486,14 +483,14 @@ (define-public yadifa
(define-public knot
(package
(name "knot")
(version "2.5.2")
(version "2.5.3")
(source (origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
name "-" version ".tar.xz"))
(sha256
(base32
"1sgmw8k9qccc7bgxbwrvahdinj1bjq90iza55rxj199mxsj72ri8"))
"13lxxnnw0v7s0q648grz87bwlfwjh5sfbj1qax7jdklalqqy52np"))
(modules '((guix build utils)))
(snippet
'(begin

33
gnu/packages/emacs.scm
View file

@ -2514,6 +2514,35 @@ (define-public emacs-org-bullets
@code{org-mode} to be rendered as UTF-8 characters.")
(license license:gpl3+)))
(define-public emacs-org-pomodoro
(package
(name "emacs-org-pomodoro")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/lolownia/org-pomodoro/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1jalsggw3q5kvj353f84x4nl04a5vmq07h75ggppy1627lb31zm4"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-alert" ,emacs-alert)))
(home-page "https://github.com/lolownia/org-pomodoro")
(synopsis "Pomodoro technique for org-mode")
(description "@code{emacs-org-pomodoro} adds very basic support for
Pomodoro technique in Emacs org-mode.
Run @code{M-x org-pomodoro} for the task at point or select one of the
last tasks that you clocked time for. Each clocked-in pomodoro starts
a timer of 25 minutes and after each pomodoro a break timer of 5
minutes is started automatically. Every 4 breaks a long break is
started with 20 minutes. All values are customizable.")
(license license:gpl3+)))
(define-public emacs-org-trello
(package
(name "emacs-org-trello")
@ -2586,14 +2615,14 @@ (define-public emacs-solarized-theme
(define-public emacs-ahungry-theme
(package
(name "emacs-ahungry-theme")
(version "1.3.0")
(version "1.4.0")
(source
(origin (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/ahungry-theme-"
version ".tar"))
(sha256
(base32
"1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"))))
"1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"))))
(build-system emacs-build-system)
(home-page "https://github.com/ahungry/color-theme-ahungry")
(synopsis "Ahungry color theme for Emacs")

4
gnu/packages/enlightenment.scm
View file

@ -327,7 +327,7 @@ (define-public python2-efl
(define-public edi
(package
(name "edi")
(version "0.5.0")
(version "0.5.1")
(source
(origin
(method url-fetch)
@ -335,7 +335,7 @@ (define-public edi
"download/v" version "/edi-" version ".tar.bz2"))
(sha256
(base32
"1l90x1bw82a0df6r11wd55qizhi99gg0qcljwxga606ahy6ycnkn"))))
"0k0ymi9ilhkypqb9pniv365kh3jgbl2g2k0ylvsmisn2jhbqk49a"))))
(build-system gnu-build-system)
(arguments
'(#:phases

3
gnu/packages/finance.scm
View file

@ -70,7 +70,8 @@ (define-public bitcoin-core
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
("protobuf" ,protobuf)
("qtbase" ,qtbase)))
;; TODO Build with the modular Qt.
("qt" ,qt)))
(arguments
`(#:configure-flags
(list

32
gnu/packages/flashing-tools.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -82,6 +83,37 @@ (define-public flashrom
programmer devices.")
(license gpl2)))
(define-public 0xffff
(package
(name "0xffff")
(version "0.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/pali/0xffff/archive/"
version ".tar.gz"))
(file-name (string-append "0xFFFF" version ".tar.gz" ))
(sha256
(base32
"1g4032c81wkk37wvbg1dxcqq6mnd76y9x7f2crmzqi6z4q9jcxmj"))))
(build-system gnu-build-system)
(inputs
`(("libusb",libusb-0.1))) ; doesn't work with libusb-compat
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)) ; no configure
#:make-flags (list (string-append "PREFIX=" %output))
#:tests? #f)) ; no 'check' target
(home-page "https://github.com/pali/0xFFFF")
(synopsis "Flash FIASCO images on Maemo devices")
(description
"The Open Free Fiasco Firmware Flasher (0xFFFF) is a flashing tool
for FIASCO images. It supports generating, unpacking, editing and
flashing of FIASCO images for Maemo devices. Use it with care. It can
brick your device.")
(license gpl3+)))
(define-public avrdude
(package
(name "avrdude")

41
gnu/packages/fonts.scm
View file

@ -472,24 +472,7 @@ (define-public font-wqy-zenhei
(sha256
(base32
"1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((PATH (string-append (assoc-ref %build-inputs "tar") "/bin:"
(assoc-ref %build-inputs "gzip") "/bin"))
(font-dir (string-append (assoc-ref %outputs "out")
"/share/fonts/wenquanyi/")))
(setenv "PATH" PATH)
(mkdir-p font-dir)
(system* "tar" "xvf" (assoc-ref %build-inputs "source"))
(chdir "wqy-zenhei")
(install-file "wqy-zenhei.ttc" font-dir)))))
(native-inputs
`(("gzip" ,gzip)
("tar" ,tar)))
(build-system font-build-system)
(home-page "http://wenq.org/wqy2/")
(synopsis "CJK font")
(description
@ -516,23 +499,7 @@ (define-public font-wqy-microhei
(sha256
(base32
"0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((PATH (string-append (assoc-ref %build-inputs "tar") "/bin:"
(assoc-ref %build-inputs "gzip") "/bin"))
(font-dir (string-append (assoc-ref %outputs "out")
"/share/fonts/wenquanyi")))
(mkdir-p font-dir)
(setenv "PATH" PATH)
(system* "tar" "xvf" (assoc-ref %build-inputs "source"))
(install-file "wqy-microhei/wqy-microhei.ttc" font-dir)))))
(native-inputs
`(("gzip" ,gzip)
("tar" ,tar)))
(build-system font-build-system)
(home-page "http://wenq.org/wqy2/")
(synopsis "CJK font")
(description
@ -594,7 +561,7 @@ (define-public font-anonymous-pro
(define-public font-gnu-unifont
(package
(name "font-gnu-unifont")
(version "10.0.04")
(version "10.0.05")
(source (origin
(method url-fetch)
(uri (string-append
@ -602,7 +569,7 @@ (define-public font-gnu-unifont
version ".tar.gz"))
(sha256
(base32
"150p79rq4rzb4pbg2dwcz93k1chzzvm0l0nwh60spw19nfyrxj0p"))))
"07sajc32l2knnz6gmd81zxjhcxq8xr6r2kf42wig56vj05s3d1cb"))))
(build-system gnu-build-system)
(outputs '("out" ; TrueType version
"pcf" ; PCF (bitmap) version

2
gnu/packages/gforth.scm → gnu/packages/forth.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gforth)
(define-module (gnu packages forth)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)

4
gnu/packages/game-development.scm
View file

@ -380,7 +380,7 @@ (define-public python2-xsge
(define-public tiled
(package
(name "tiled")
(version "1.0.1")
(version "1.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/bjorn/tiled/archive/v"
@ -388,7 +388,7 @@ (define-public tiled
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1y75jmpcf2lv8s3g9v3ghnrwvs2fc4ni7nx74csaylg1g04cwlq7"))))
"134xi74xajh38rj1qhmc4x1zmncfdmqb01axnkxh6zs3qz0rxp93"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)

8
gnu/packages/games.scm
View file

@ -1386,6 +1386,7 @@ (define-public supertuxkart
(sha256
(base32
"10l2ljmd7mv8f9ylarqmxxryicdnph2qkm3g5maxnsm2k2q0n20b"))
(patches (search-patches "supertuxkart-angelscript-ftbfs.patch"))
(modules '((guix build utils)))
(snippet
;; Delete bundled library sources
@ -3493,7 +3494,7 @@ (define-public mrrescue
(define-public hyperrogue
(package
(name "hyperrogue")
(version "9.4g")
(version "9.4n")
;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs.
(source (origin
@ -3504,10 +3505,11 @@ (define-public hyperrogue
"-src.tgz"))
(sha256
(base32
"09j9gnx701x28zfkrv3rjqlr56p89hyxk78gkpmmdfjgcq076pc2"))))
"1kf9i9gqadnb0m143c860dcvdn91vp6vnfzma4bcgfgwmcn9sx0r"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
#:make-flags '("CXXFLAGS=-std=c++11")
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'set-sdl-paths
@ -3578,7 +3580,7 @@ (define-public hyperrogue
"-win.zip"))
(sha256
(base32
"1r57db4hm7fjcd27p8b6cdsnq2cgkym2kp9lrw7ha2asdf8w6gkb"))))
"1vrk0k0ch3azpa72y7acmmpifvks6c0466fvmz804hici93pglvi"))))
("unzip" ,unzip)))
(inputs
`(("font-dejavu" ,font-dejavu)

139
gnu/packages/gnome.scm
View file

@ -96,6 +96,7 @@ (define-module (gnu packages gnome)
#:use-module (gnu packages lua)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages music)
#:use-module (gnu packages networking)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pcre)
@ -131,8 +132,8 @@ (define-module (gnu packages gnome)
#:use-module (gnu packages samba)
#:use-module (gnu packages readline)
#:use-module (gnu packages fonts)
#:use-module (gnu packages qemu)
#:use-module (gnu packages speech)
#:use-module (gnu packages virtualization)
#:use-module (srfi srfi-1))
(define-public brasero
@ -614,6 +615,7 @@ (define-public evince
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(patches (search-patches "evince-CVE-2017-1000083.patch"))
(sha256
(base32
"13yw0i68dgqp9alyliy3zifszh7rikkpi1xbz5binvxxgfpraf04"))))
@ -3539,7 +3541,15 @@ (define-public totem
("nettle" ,nettle)
("vala" ,vala)))
(arguments
`(#:phases
`(;; Disable automatic GStreamer plugin installation via PackageKit and
;; all that.
#:configure-flags '("--disable-easy-codec-installation"
;; Do not build .a files for the plugins, it's
;; completely useless. This saves 2 MiB.
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-after
'install 'wrap-totem
@ -3924,6 +3934,67 @@ (define-public simple-scan
work and the interface is well tested.")
(license license:gpl3+)))
(define-public eolie
(package
(name "eolie")
(version "0.9.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/gnumdk/eolie/"
"releases/download/"
(version-major+minor version)
"/eolie-" version ".tar.xz"))
(sha256
(base32
"1lb3rd2as12vq24fcf9nmlhggf8vka3kli2i92i8iylwi7nq5n2a"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:modules ((guix build glib-or-gtk-build-system)
(guix build utils)
(ice-9 match))
#:phases
(modify-phases %standard-phases
(add-after 'wrap 'wrap-more
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
;; These libraries must be on LD_LIBRARY_PATH.
(libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret"
"atk" "gtk+" "gsettings-desktop-schemas"
"gobject-introspection"))
(path (string-join
(map (lambda (lib)
(string-append (assoc-ref inputs lib) "/lib"))
libs)
":")))
(wrap-program (string-append out "/bin/eolie")
`("LD_LIBRARY_PATH" ":" prefix (,path))
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
#t)))))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
("pkg-config" ,pkg-config)))
(inputs
`(("gobject-introspection" ,gobject-introspection)
("glib-networking" ,glib-networking)
("cairo" ,cairo)
("gtk+" ,gtk+)
("atk" ,atk) ; propagated by gtk+, but we need it in LD_LIBRARY_PATH
("python" ,python-wrapper)
("python-pygobject" ,python-pygobject)
("python-pycairo" ,python-pycairo)
("libsecret" ,libsecret)
("gtkspell3" ,gtkspell3)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("webkitgtk" ,webkitgtk)))
(home-page "https://github.com/gnumdk/eolie/")
(synopsis "Web browser for GNOME")
(description
"Eolie is a new web browser for GNOME. It features Firefox sync support,
a secret password store, an adblocker, and a modern UI.")
(license license:gpl3+)))
(define-public epiphany
(package
(name "epiphany")
@ -5868,7 +5939,7 @@ (define-public arc-theme
(define-public moka-icon-theme
(package
(name "moka-icon-theme")
(version "5.3.5")
(version "5.3.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/moka-project"
@ -5877,7 +5948,7 @@ (define-public moka-icon-theme
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"062rab0ggmgb3y0d6b3k5d47wsadi28cdnyyr2vqbjhza01dglci"))))
"04axinv79qnngsxkwqzi5j9lc3hn24rjqps5ai8d42pdnfaf0x37"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -6419,3 +6490,63 @@ (define-public gnome-planner
utilization that highlights under-utilized and over-utilized resources. These
views can be printed as PDF or PostScript files, or exported to HTML.")
(license license:gpl2+)))
(define-public lollypop
(package
(name "lollypop")
(version "0.9.240")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/gnumdk/lollypop/"
"releases/download/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0n1ycmg6dgz1pajs80fwlcbxw3rx1hff1xw6ja67zngm85ydbjvq"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
,@%glib-or-gtk-build-system-modules)
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program (string-append out "/bin/lollypop")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
#t))
(add-after 'install 'wrap
(@@ (guix build python-build-system) wrap)))))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
("pkg-config" ,pkg-config)))
(inputs
`(("gobject-introspection" ,gobject-introspection)
("gtk+" ,gtk+)
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
("python" ,python)
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-gst" ,python-gst)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
("python-pylast" ,python-pylast)
("totem-pl-parser" ,totem-pl-parser)
("webkitgtk" ,webkitgtk)))
(propagated-inputs
`(;; gst-plugins-base is required to start Lollypop,
;; the others are required to play streaming.
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-ugly" ,gst-plugins-ugly)))
(home-page "https://gnumdk.github.io/lollypop-web")
(synopsis "GNOME music playing application")
(description
"Lollypop is a music player designed to play well with GNOME desktop.
Lollypop plays audio formats such as mp3, mp4, ogg and flac and gets information
from artists and tracks from the web. It also fetches cover artworks
automatically and it can stream songs from online music services and charts.")
(license license:gpl3+)))

41
gnu/packages/gnuzilla.scm
View file

@ -514,7 +514,46 @@ (define-public icecat
(mozilla-patch "icecat-bug-1368576.patch" "5a51a9ef8149" "0j0f9j0pryv3ik4bizhv8s6rr4dl1mjm01c23msayr0vbnpcagcs")
(mozilla-patch "icecat-bug-1369913.patch" "f47eaebc0c5c" "1b52xm3awpigasaz0hk5b13l7v4ry9vrawf571lzy2wwhphs4nxx")
(mozilla-patch "icecat-bug-1371424.patch" "40ce248a8c15" "1b722fiifr999ga0991cg5mlhidcnvf3zx2aiq5zjaabqn0f4dzk")
(mozilla-patch "icecat-bug-1372112.patch" "0c8359ac6718" "1w0v2p5jnhzvcsx8h1bglwjhp5y5bg1g8pzpvjw7pg1wlq2frccr")))
(mozilla-patch "icecat-bug-1372112.patch" "0c8359ac6718" "1w0v2p5jnhzvcsx8h1bglwjhp5y5bg1g8pzpvjw7pg1wlq2frccr")
(mozilla-patch "icecat-bug-1354443-pt1.patch" "8c27a68ee87e" "0kn05q8nvp26w5rnj8r0byw89h2awmwn04l9l3xv2i5w2a7zmjzf")
(mozilla-patch "icecat-bug-1354443-pt2.patch" "b2ee0c5466da" "0jgwsppq0606lwg5jk9q69lqa14q3j7h3c7q6mxbz7zqrcg7d0zg")
(mozilla-patch "icecat-bug-1354443-pt3.patch" "25f6ec16e501" "1yqd5ndwgd8x2pj9k2bnaq3rb1g7wikq0ii7l4dm6bqwabi2rdsg")
(mozilla-patch "icecat-bug-1354443-pt4.patch" "30443b4f758e" "0riszl3xnpfq5ffywygrc12nsvx0ffd36d5rf4vp87r8lj3fr55r")
(mozilla-patch "icecat-bug-1354443-pt5.patch" "1b934ab92c59" "114cvfzfxgkwwd4zpnrmm2kx6m94k0b3xcraba9aawwwhdxj6a1d")
(mozilla-patch "icecat-bug-1354443-pt6.patch" "830a345dc0e7" "01riivv033w3mr8b2myaw38rz2za1bdlhybny737ly68hhc67xdz")
(mozilla-patch "icecat-bug-1365189.patch" "5c26df489768" "1fdw4zbn0ilfghanxky4y7qcmkpkks2q1aqkzv26dnhhrr8350a1")
(mozilla-patch "icecat-bug-1365875.patch" "f21e4d78a0a8" "0szsc3zm3wgrw8pxm0rz54whkrc14yy4d8vwmxgqsdns43qjgkpk")
(mozilla-patch "icecat-bug-1346590.patch" "f19b6c6a0c6c" "0wkr010qnh4127z1j7fp45sqdk2da9x7j2k405r0x5bgqdd09qzp")
(mozilla-patch "icecat-bug-1376087.patch" "8353a3fa4106" "0kzs8pl6spjwgdsmiw702zvbvz73ng9zf184clsfr82l8kmggbgw")
(mozilla-patch "icecat-bug-1371889.patch" "b38fed9a9772" "14vzsldlv4hjpxgnl6fjjbzhgcwsmd52v06cgmv0a7y3lnggj3hp")
(mozilla-patch "icecat-bug-1322896.patch" "c254d3cc826c" "0pixwr18qik87c8qf4irg6hdffd8rbwpng73jxg05h7s827nfw3g")
(mozilla-patch "icecat-bug-1368652.patch" "6356dbf20658" "0a0hsxkik7ysfa48w8k21lidaabwpmxi1d3214r5zqkqqfhn9qjm")
(mozilla-patch "icecat-bug-1358073.patch" "8d6e685d061b" "0430gwg7zzbg0q9w2m04s5ljh47bc8x1gxvmkzbn23bh1wy4d4sq")
(mozilla-patch "icecat-bug-1370869.patch" "3b8fde840188" "0vkymvzkfpzpg86npa5vpvvf564k18hkfdz8857rl0z4dp4rybzx")
(mozilla-patch "icecat-bug-1369994.patch" "267b649087ff" "04wzazdm0kvbfcgmlhx8qs1ibqn8sbvqdsd237rja5wpr761xxf1")
(mozilla-patch "icecat-bug-1354796.patch" "69d1a9de76b9" "1q0p4kf8pvnkwwff3lz526pjj15a25pf724awblkcnzamwbib5ns")
(mozilla-patch "icecat-bug-1363027.patch" "c5eaa2d51b9f" "1xyj5n1vqhscc369q6wxibs2igbilaiwyc0q9cq64j2qx8q0yqah")
(mozilla-patch "icecat-bug-1364189.patch" "852a7781259e" "12y344p54avz5mrqirq14zp4csx8ydilnjv9nsw48kpa9y0l5xsg")
(mozilla-patch "icecat-bug-1342417.patch" "37ccdc5fff2b" "1acywg8girplbs7wjrjbvkximhiyizddmnkkq1ldd0l3qbx9nihc")
(mozilla-patch "icecat-bug-1362924-pt1.patch" "057ed884ecb0" "1m49bqkq5lzc2j59wgwy0gbzvqj50p9lfn7cbc2n01v6d7m8rc2j")
(mozilla-patch "icecat-bug-1362924-pt2.patch" "dd7ed649b82f" "1fama1l2vx4p6ahhrsrpysfbk9nh5gwbi4pdnclpyxd42idsdqxs")
(mozilla-patch "icecat-bug-1353312.patch" "731958f7ff4d" "0l3i3mkb6rslnjag3caf4xyhjzxn91wfs0g6dbika4sxnhfs5d4i")
(mozilla-patch "icecat-bug-1364870.patch" "de8deecbcb02" "048ic1vk7fd7wxqjgjqlnb7kv03ynaa4wkrk0ka8m39pkjh3yyxj")
(mozilla-patch "icecat-bug-1365333.patch" "e3d13b270f45" "0jr8hpxpmfgrbh09xd9nj597cdnc6kl6gs5nir4zlzbbn8kp3429")
(mozilla-patch "icecat-bug-1372063.patch" "58a144bf9677" "12y8vikbzcfcfiidjdq67dvdhhvylx68wdgnypsafrd1q8dx9jza")
(mozilla-patch "icecat-bug-1373970.patch" "8321ef71adb5" "1wk8kq9n2vhqlinvvw01avv3c7qj0k3qnn7dj0whnl08a5yrqhpl")
(mozilla-patch "icecat-bug-1338646.patch" "322c18d011af" "1yqb7zmjz211ryb98pjj7axbj6bwkj63rmfyifsybdy3zpb4nf48")
(mozilla-patch "icecat-bug-1371283.patch" "f9bc084fbb8a" "1ssml15yzx9s0wraq4n0xvq5bw7j8xq0p2y39h8j3f1c448n0j50")
(mozilla-patch "icecat-bug-1359477.patch" "9b70b5b852e4" "0z2bi7w46g7mm8msav8vz28mgvnv21z3a5876n9gpw317gns4d6a")
(mozilla-patch "icecat-bug-1366903.patch" "6785c2a852da" "0p9jr171qi59scr5lrj6g0mv8mgm1i1wglr3jd16xywb0ymynnn5")
(mozilla-patch "icecat-bug-1368105.patch" "11c8e23f0fd7" "0zcikv6dn7biii4gspv2kfvma5hc76hk86jahm3zl2zlkk8ikfm9")
(mozilla-patch "icecat-bug-1355168.patch" "f45ba43512ad" "0p28q5acns5zjj7ks2x5lrmwzzps741507sq31xvrpzan5yav37x")
(mozilla-patch "icecat-bug-1308820.patch" "e9a10fac6aae" "1s2zaka6ik1rmylamyh38vsqnqlblbqdhjpp0cv08fjb9flh5sbw")
(mozilla-patch "icecat-bug-1305036.patch" "c42a348f2ed0" "1pz7qbdv9xvyd1dy7g9h047c0gmrgp5qdy2360qjk6879n74h1zb")
(mozilla-patch "icecat-bug-1342913.patch" "f02db36497d2" "0g1kg418l1cibh5k1sjqj2vs2jcblpbn7b06qazk2kzcg70vf5gv")
(mozilla-patch "icecat-bug-1374047.patch" "0a44ed156da5" "1y8z1czm7f91p9bpd32b9k43nl0b9g4fzwv4w0khby9y38xgvcbs")
(mozilla-patch "icecat-bug-1371259.patch" "0a86729d653e" "0wyh7qskjwq9274d25p2ajylaab5mj5h8by58rz9lxsz06zrnz9f")
(mozilla-patch "icecat-bug-1378826.patch" "98ff43fb228a" "0ih0nsmk8rzdrajzlnryqiqb71jg7v4p71hfla2hrlvn41r3709m")))
(modules '((guix build utils)))
(snippet
'(begin

32
gnu/packages/gstreamer.scm
View file

@ -64,14 +64,14 @@ (define-module (gnu packages gstreamer)
(define-public orc
(package
(name "orc")
(version "0.4.26")
(version "0.4.27")
(source (origin
(method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/data/src/"
"orc/orc-" version ".tar.xz"))
(sha256
(base32
"0jd69ynvr3k70mlxxgbsk047l1rd63m1wkj3qdcq7644xy0gllkx"))))
"14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -98,7 +98,7 @@ (define-public orc
(define-public gstreamer
(package
(name "gstreamer")
(version "1.12.1")
(version "1.12.2")
(source
(origin
(method url-fetch)
@ -107,7 +107,7 @@ (define-public gstreamer
version ".tar.xz"))
(sha256
(base32
"1lm6lcr0rv0mzsdl9vjdnf3vb136qmcslvz3m5zlai7zngcbji4h"))))
"1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(arguments
@ -146,7 +146,7 @@ (define-public gstreamer
(define-public gst-plugins-base
(package
(name "gst-plugins-base")
(version "1.12.1")
(version "1.12.2")
(source
(origin
(method url-fetch)
@ -154,7 +154,7 @@ (define-public gst-plugins-base
name "-" version ".tar.xz"))
(sha256
(base32
"0r84krn8dpimp6kk9cf38danrbbsypx6j6ykr6rl1a3lnnnrzkhc"))))
"0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(propagated-inputs
@ -201,7 +201,7 @@ (define-public gst-plugins-base
(define-public gst-plugins-good
(package
(name "gst-plugins-good")
(version "1.12.1")
(version "1.12.2")
(source
(origin
(method url-fetch)
@ -210,7 +210,7 @@ (define-public gst-plugins-good
name "-" version ".tar.xz"))
(sha256
(base32
"0jzm5jp22238y3rb0j1dsxyp77dq0wk03gn9kvq25rphlx38w7hj"))))
"15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"))))
(build-system gnu-build-system)
(inputs
`(("aalib" ,aalib)
@ -266,14 +266,14 @@ (define-public gst-plugins-good
(define-public gst-plugins-bad
(package
(name "gst-plugins-bad")
(version "1.12.1")
(version "1.12.2")
(source (origin
(method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz"))
(sha256
(base32
"15svf3d4n13r1c18mx9ya3ymibv0vbx9s593j0cm0kn4s54q1vvx"))))
"0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"))))
(outputs '("out" "doc"))
(build-system gnu-build-system)
(arguments
@ -343,7 +343,7 @@ (define-public gst-plugins-bad
(define-public gst-plugins-ugly
(package
(name "gst-plugins-ugly")
(version "1.12.1")
(version "1.12.2")
(source
(origin
(method url-fetch)
@ -351,7 +351,7 @@ (define-public gst-plugins-ugly
name "/" name "-" version ".tar.xz"))
(sha256
(base32
"0s8hiv4asqd6nwnksqv6cwpzan41zd0nd8nhlm7s64wp0lyi5hlg"))))
"0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"))))
(build-system gnu-build-system)
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
@ -382,7 +382,7 @@ (define-public gst-plugins-ugly
(define-public gst-libav
(package
(name "gst-libav")
(version "1.12.1")
(version "1.12.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -390,7 +390,7 @@ (define-public gst-libav
name "-" version ".tar.xz"))
(sha256
(base32
"0xshib0hsn8yjmd12ipsrbrvxa5qnhnz7zmdj7lms6b3vwzq5msm"))))
"1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-system-libav")
@ -420,7 +420,7 @@ (define-public gst-libav
(define-public python-gst
(package
(name "python-gst")
(version "1.12.1")
(version "1.12.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -428,7 +428,7 @@ (define-public python-gst
"gst-python-" version ".tar.xz"))
(sha256
(base32
"18bq03xdc0jgrza4114lrcj82yai4azkjzfxflqagc0y417vw88p"))))
"0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"))))
(build-system gnu-build-system)
(arguments
;; XXX: Factorize python-sitedir with python-build-system.

29
gnu/packages/guile.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -530,6 +531,13 @@ (define-public guile-ncurses
library.")
(license license:lgpl3+)))
(define-public guile-ncurses/gpm
(package
(inherit guile-ncurses)
(name "guile-ncurses-with-gpm")
(inputs `(("ncurses" ,ncurses/gpm)
("guile" ,guile-2.2)))))
(define-public mcron
(package
(name "mcron")
@ -1350,20 +1358,21 @@ (define-public g-wrap
(native-inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("guile" ,guile-2.0)
`(("guile" ,guile-2.2)
("guile-lib" ,guile-lib)))
(inputs
`(("libffi" ,libffi)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "^Makefile.in$")
(("guilemoduledir =.*guile/site" all)
(string-append all "/2.0")))
#t))))))
`(#:configure-flags '("--disable-Werror")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "^Makefile.in$")
(("guilemoduledir =.*guile/site" all)
(string-append all "/@GUILE_EFFECTIVE_VERSION@")))
#t))))))
(synopsis "Generate C bindings for Guile")
(description "G-Wrap is a tool and Guile library for generating function
wrappers for inter-language calls. It currently only supports generating Guile

119
gnu/packages/imagemagick.scm
View file

@ -25,7 +25,6 @@ (define-module (gnu packages imagemagick)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix download)
#:use-module (guix hg-download)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
@ -46,14 +45,14 @@ (define-public imagemagick
;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
(version "6.9.8-10")
(version "6.9.9-0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
"040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg"))))
"02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
@ -162,70 +161,54 @@ (define-public perl-image-magick
(license (package-license imagemagick))))
(define-public graphicsmagick
(let ((changeset "6156b4c2992d855ece6079653b3b93c3229fc4b8") ; fix CVE-2017-6335
(revision "3"))
(package
(name "graphicsmagick")
(version (string-append "1.3.25-" revision "."
(string-take changeset 7)))
(source (origin
(method hg-fetch)
(uri (hg-reference
(url "http://hg.code.sf.net/p/graphicsmagick/code")
(changeset changeset)))
(file-name (string-append name "-" version "-checkout"))
;;(method url-fetch)
;;(uri (string-append "ftp://ftp.graphicsmagick.org/pub/"
;; "GraphicsMagick/" (version-major+minor version)
;; "/GraphicsMagick-" version ".tar.xz"))
(sha256
(base32
"08yfsn8mrqkwpax43vv1crfr55rcf004wwpzsinr5c6m0asqr08b"))
(modules '((guix build utils)))
(snippet
;; Remove bundled software. This reduces the size of the built
;; source checkout from 177 MiB to 49 MiB. This should not be
;; necessary when using the GraphicsMagick release tarball,
;; because these files are not distributed there.
'(for-each delete-file-recursively '("bzlib" "dcraw" "hp2xx"
"jbig" "jp2" "jpeg"
"lcms" "libxml" "png"
"ralcgm" "tiff" "ttf"
"webp" "wmf" "xlib"
"zlib")))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--with-frozenpaths"
"--enable-shared=yes"
"--with-x=yes"
"--with-quantum-depth=16" ; required by Octave
"--enable-quantum-library-names"
(string-append "--with-gs-font-dir="
(assoc-ref %build-inputs "gs-fonts")
"/share/fonts/type1/ghostscript"))))
(inputs
`(("graphviz" ,graphviz)
("ghostscript" ,ghostscript)
("gs-fonts" ,gs-fonts)
("lcms" ,lcms)
("libx11" ,libx11)
("libxml2" ,libxml2)
("libtiff" ,libtiff)
("libpng" ,libpng)
("libjpeg" ,libjpeg)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(outputs '("out" ; 13 MiB
"doc")) ; ~7 MiB
(home-page "http://www.graphicsmagick.org")
(synopsis "Create, edit, compose, or convert bitmap images")
(description
"GraphicsMagick provides a comprehensive collection of utilities,
(package
(name "graphicsmagick")
(version "1.3.26")
(source (origin
(method url-fetch)
(uri
(list
(string-append "mirror://sourceforge/" name "/" name
"/" version "/GraphicsMagick-" version ".tar.xz")
(string-append "ftp://ftp.graphicsmagick.org/pub/"
"GraphicsMagick/" (version-major+minor version)
"/GraphicsMagick-" version ".tar.xz")))
(sha256
(base32
"122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--with-frozenpaths"
"--enable-shared=yes"
"--with-x=yes"
"--with-quantum-depth=16" ; required by Octave
"--enable-quantum-library-names"
(string-append "--with-gs-font-dir="
(assoc-ref %build-inputs "gs-fonts")
"/share/fonts/type1/ghostscript"))))
(inputs
`(("graphviz" ,graphviz)
("ghostscript" ,ghostscript)
("gs-fonts" ,gs-fonts)
("lcms" ,lcms)
("libx11" ,libx11)
("libxml2" ,libxml2)
("libtiff" ,libtiff)
("libpng" ,libpng)
("libjpeg" ,libjpeg)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(outputs '("out" ; 13 MiB
"doc")) ; ~7 MiB
(home-page "http://www.graphicsmagick.org")
(synopsis "Create, edit, compose, or convert bitmap images")
(description
"GraphicsMagick provides a comprehensive collection of utilities,
programming interfaces, and GUIs, to support file format conversion, image
processing, and 2D vector rendering.")
(license license:expat))))
(license license:expat)))

1
gnu/packages/irc.scm
View file

@ -66,6 +66,7 @@ (define-public quassel
(method url-fetch)
(uri (string-append "http://quassel-irc.org/pub/quassel-"
version ".tar.bz2"))
(patches (search-patches "quassel-fix-tls-check.patch"))
(sha256
(base32
"0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))))

49
gnu/packages/java.scm
View file

@ -1543,7 +1543,7 @@ (define (import-cert cert)
(license license:gpl2+))))
(define-public icedtea-8
(let* ((version "3.4.0")
(let* ((version "3.5.0")
(drop (lambda (name hash)
(origin
(method url-fetch)
@ -1552,7 +1552,7 @@ (define-public icedtea-8
"/icedtea8/" version "/" name ".tar.xz"))
(sha256 (base32 hash))))))
(package (inherit icedtea-7)
(version "3.4.0")
(version "3.5.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -1560,7 +1560,7 @@ (define-public icedtea-8
version ".tar.xz"))
(sha256
(base32
"16if055973y6yw7n5gczp8iksvc31cy4p5by9lkbniadqj4z665m"))
"1dfa7ing61i73m6wfx2kx59q44npqdiy7cd66xmslyy0xh09xa4s"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1632,34 +1632,34 @@ (define-public icedtea-8
`(("jdk" ,icedtea-7 "jdk")
("openjdk-src"
,(drop "openjdk"
"0va5i3zr8y8ncv914rz914jda9d88gq0viww3smdqnln8n78rszi"))
"0di7gmyis1p6rpksmff1q21ck85i51sqcl9awqyvg7xiwggq0wsm"))
("aarch32-drop"
,(drop "aarch32"
"0cway5a5hcfyh4pzl9zz5xr7lil4gsliy6r5iqbaasd2d9alvqiq"))
("corba-drop"
,(drop "corba"
"1l9zr97a3kq00bj4i8wcdsjlz3xlfldxd8zhkcxikinwd5n0n8a7"))
"1xk64bsdxfc66g61d8k6xrhqj8rc56vzrlxx6s23gkr45604bl8x"))
("jaxp-drop"
,(drop "jaxp"
"0lqxrsr3xlpwm2na6f2rpl7znrz34dkb9dg3zjmympyjy4kqljn7"))
"1iw9xa4s5kxijdqpf0ih4x6g0lw142yy11vrzfmz6n1y4b0ic7iw"))
("jaxws-drop"
,(drop "jaxws"
"1b3chckk10dzrpa7cswmcf1jvryaiwkj8lihfqjr5j7l668jwr4h"))
"14p2l4j985wh5cdd4hfmm18gb5wmry73yiysdx9pg3aqpkw9qms7"))
("jdk-drop"
,(drop "jdk"
"15lq0k2jv2x26x6vqkbljdcxk35i3b60pcsw3j1sdfmlk1xy6wgc"))
"1qwmb80vicn7jd801f3j23lyil7327ks54d3s87czwv8h108m40r"))
("langtools-drop"
,(drop "langtools"
"17xkb8ahkg04ri0bp5wblcp1a2lp8j7c83ic5zdbggvgm339k5s8"))
"175pi2privhcvn9sbam5mhhgcvicfqbgldiw25fi5g80fqkkrza9"))
("hotspot-drop"
,(drop "hotspot"
"0xpx8ykaq0ki6r0dl3dzca2xgp1p82z8mvsxcs2931ib667ncgcp"))
"1qdyn02p4ssl3p7z9aadhzl9qdam2q7pvwddz2jkyvajcrxb0mpi"))
("nashorn-drop"
,(drop "nashorn"
"1bnn4731lhlvg8axy4mjxgvh646yl22hp52wipx8cfca4vkn2f1z"))
"0kzmpf5b9kwhrvnwn7m20q3dzz8s82jjvbac84606x3ff97xk5gr"))
("shenandoah-drop"
,(drop "shenandoah"
"0fpxl8zlii1hpm777r875ys2cr5ih3gb6p1nm9jfa6krjrccrxv1"))
"0kjc5m5jj2bzyy1vj1s59khv5xjfnkxy18z0g4bdb1kb3g21c5wi"))
,@(fold alist-delete (package-native-inputs icedtea-7)
'("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop"
"jdk-drop" "langtools-drop" "hotspot-drop")))))))
@ -4672,3 +4672,28 @@ (define-public java-asm
transformations and analysis algorithms allow to easily assemble custom
complex transformations and code analysis tools.")
(license license:bsd-3)))
(define-public java-commons-cli-1.2
;; This is a bootstrap dependency for Maven2.
(package
(inherit java-commons-cli)
(version "1.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/cli/source/"
"commons-cli-" version "-src.tar.gz"))
(sha256
(base32
"0rvfgzgv2pc1m091dfj3ih9ddsjjppr1f1wf0qmc3bk6b1kwv2dm"))))
(arguments
`(#:jar-name "commons-cli.jar"
#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-build-xml
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "build.xml"
(("dir=\"\\$\\{test.home\\}/java\"")
"dir=\"${test.home}\""))
#t)))))
(native-inputs
`(("java-junit" ,java-junit)))))

5
gnu/packages/kerberos.scm
View file

@ -90,7 +90,8 @@ (define-public mit-krb5
cryptography.")
(license (license:non-copyleft "file://NOTICE"
"See NOTICE in the distribution."))
(home-page "http://web.mit.edu/kerberos/")))
(home-page "http://web.mit.edu/kerberos/")
(properties '((cpe-name . "kerberos")))))
(define-public shishi
(package
@ -138,6 +139,8 @@ (define-public heimdal
(sha256
(base32
"19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"))
(patches (search-patches "heimdal-CVE-2017-6594.patch"
"heimdal-CVE-2017-11103.patch"))
(modules '((guix build utils)))
(snippet
'(substitute* "configure"

4
gnu/packages/ldc.scm
View file

@ -279,7 +279,7 @@ (define-public ldc-beta ldc)
(define-public dub
(package
(name "dub")
(version "1.3.0")
(version "1.4.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/dlang/dub/archive/"
@ -287,7 +287,7 @@ (define-public dub
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"056mvf01z51qc3i1qnx7yaqr728q8pss8zabiv5zpfx2ynfsw3k7"))))
"1w3pznyjnmsmasrvv93f82l0sr31fpwg2zcj8hh1b2gvc5761qhi"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; it would have tested itself by installing some packages (vibe etc)

4
gnu/packages/libreoffice.scm
View file

@ -614,14 +614,14 @@ (define-public libmwaw
(define-public libstaroffice
(package
(name "libstaroffice")
(version "0.0.3")
(version "0.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/"
version "/libstaroffice-" version ".tar.xz"))
(sha256 (base32
"1ii2wi3wr5npyz9gby1bjk8r4wyflpfpc6gx7mmqkhsc9c8frpmy"))))
"0flh0hs31fsq1dmkhf2502lxskiy7fbj5q8gn4b4f502s228fwkf"))))
(build-system gnu-build-system)
(inputs
`(("librevenge" ,librevenge)

16
gnu/packages/libusb.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -95,6 +96,21 @@ (define-public libusb-compat
version of libusb to run with newer libusb.")
(license lgpl2.1+)))
;; required by 0xffff, which compiles with libusb-compat, but executes only
;; with libusb-0.1
(define-public libusb-0.1
(package (inherit libusb)
(version "0.1.12")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/libusb/libusb-0.1 (LEGACY)/"
version "/libusb-" version ".tar.gz"))
(sha256
(base32
"0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"))
(patches (search-patches "libusb-0.1-disable-tests.patch"))))))
(define-public libusb4java
;; There is no public release so we take the latest version from git.
(let ((commit "396d642a57678a0d9663b062c980fe100cc0ea1e")

44
gnu/packages/linux.scm
View file

@ -365,8 +365,8 @@ (define* (make-linux-libre version hash supported-systems
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define %linux-libre-version "4.12")
(define %linux-libre-hash "153ibjdgys7friij4hnkvmp9ycvx50zgpyl9mwbr4prr409q3ndf")
(define %linux-libre-version "4.12.3")
(define %linux-libre-hash "1b02snh41fgr5i55wlc86nvksyzy1cq994mkmj195pa57hy6y6ak")
(define-public linux-libre
(make-linux-libre %linux-libre-version
@ -375,14 +375,14 @@ (define-public linux-libre
#:configuration-file kernel-config))
(define-public linux-libre-4.9
(make-linux-libre "4.9.36"
"1z58f15my3a8c3j8hfc6p9ydmwgq1399kp1zsbrfd89rxz3m4v6r"
(make-linux-libre "4.9.39"
"03rnbz1wf3d0fi5zrhygx1b20bx23fy310d8h74zc6z4jh6fsbx3"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
(make-linux-libre "4.4.76"
"1qzgjqj7zv8hk162viyjy4cn24snwy159j8vir6d5jsrkvwq5wrk"
(make-linux-libre "4.4.78"
"0g8pc0kam33rn2dx9fkp7w749s38qs2iykawpj0k9jm19775hn4k"
%intel-compatible-systems
#:configuration-file kernel-config))
@ -428,11 +428,18 @@ (define-public linux-pam
;; ("cracklib" ,cracklib)
))
(arguments
'(;; Most users, such as `shadow', expect the headers to be under
`(;; Most users, such as `shadow', expect the headers to be under
;; `security'.
#:configure-flags (list (string-append "--includedir="
(assoc-ref %outputs "out")
"/include/security"))
"/include/security")
;; XXX: <rpc/rpc.h> is missing from glibc when
;; cross-compiling, so we have to disable NIS
;; support altogether.
,@(if (%current-target-system)
'("--disable-nis")
'()))
;; XXX: Tests won't run in chroot, presumably because /etc/pam.d
;; isn't available.
@ -1832,7 +1839,10 @@ (define-public kbd
(native-search-paths
(list (search-path-specification
(variable "LOADKEYS_KEYMAP_PATH")
(files (list "share/keymaps")))))
;; Append ‘/**’ to recursively search all directories. One can then
;; run (for example) ‘loadkeys en-latin9’ instead of having to find
;; and type ‘i386/colemak/en-latin9’ on a mislabelled keyboard.
(files (list "share/keymaps/**")))))
(native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://kbd-project.org/")
(synopsis "Linux keyboard utilities and keyboard maps")
@ -3001,6 +3011,18 @@ (define-public gpm
and copy/paste text in the console and in xterm.")
(license license:gpl2+)))
(define-public ncurses/gpm
(package/inherit ncurses
(name "ncurses-with-gpm")
(arguments
(substitute-keyword-arguments (package-arguments ncurses)
((#:configure-flags cf)
`(cons (string-append "--with-gpm="
(assoc-ref %build-inputs "gpm")
"/lib/libgpm.so.2") ,cf))))
(inputs
`(("gpm" ,gpm)))))
(define-public btrfs-progs
(package
(name "btrfs-progs")
@ -3758,7 +3780,7 @@ (define-public light
(define-public tlp
(package
(name "tlp")
(version "0.9")
(version "1.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -3768,7 +3790,7 @@ (define-public tlp
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0xksm8ar6dbq0azbfz8qs9yyzqg1j333lyd5znc074rz8inj4yw8"))))
"1v3qpj9kp4rxwqapayd0i9419wwv4bikyrzjvqn0r9xkgnr1f9v4"))))
(inputs `(("bash" ,bash)
("dbus" ,dbus)
("ethtool" ,ethtool)

12
gnu/packages/mail.scm
View file

@ -265,7 +265,7 @@ (define-public neomutt
(package
(inherit mutt)
(name "neomutt")
(version "20170609")
(version "20170714")
(source
(origin
(method url-fetch)
@ -273,7 +273,7 @@ (define-public neomutt
"/archive/" name "-" version ".tar.gz"))
(sha256
(base32
"1kdhnhdlv84v6brhqgh8g0h6cpcbwfc59b4g09zkkgqc4fnggapy"))))
"10x3sxai773n0gfqpi904ci1qvngymcbc2didswrm92wz4h8km20"))))
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
("gdbm" ,gdbm)
@ -416,7 +416,7 @@ (define-public bogofilter
(define-public offlineimap
(package
(name "offlineimap")
(version "7.1.1")
(version "7.1.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/OfflineIMAP/offlineimap/"
@ -424,7 +424,7 @@ (define-public offlineimap
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"00xpxh0pxcvv3mjgb3vq3x51v498dhqcaixyb3a4srmfgskzh956"))))
"0rnw7gpx3cp4irja5143haszgv4xhndc8wivhg8r0gpp6ig460vj"))))
(build-system python-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)))
@ -805,7 +805,7 @@ (define-public python2-notmuch
(define-public getmail
(package
(name "getmail")
(version "4.52.0")
(version "5.1")
(source
(origin
(method url-fetch)
@ -813,7 +813,7 @@ (define-public getmail
name "-" version ".tar.gz"))
(sha256
(base32
"0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni"))))
"0zh220vx10wi6x61qi0mjayjxgvllk9f6vd4hjrgzha1xbjj0vix"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; no tests

19
gnu/packages/man.scm
View file

@ -37,7 +37,7 @@ (define-module (gnu packages man)
(define-public libpipeline
(package
(name "libpipeline")
(version "1.4.0")
(version "1.4.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -45,7 +45,7 @@ (define-public libpipeline
version ".tar.gz"))
(sha256
(base32
"1dlvp2mxlhg5zbj509kc60h7g39hpgwkzkpdf855cyzizgkmkivr"))))
"1gkrfqkphdc6gk8gic68asallj59i3cfq6nd31ppks0cljdgrwgy"))))
(build-system gnu-build-system)
(home-page "http://libpipeline.nongnu.org/")
(synopsis "C library for manipulating pipelines of subprocesses")
@ -57,14 +57,14 @@ (define-public libpipeline
(define-public man-db
(package
(name "man-db")
(version "2.7.5")
(version "2.7.6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/man-db/man-db-"
version ".tar.xz"))
(sha256
(base32
"056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw"))))
"0gqgs4zc3r87apns0k5qp689p2ylxx2596s2mkmkxjjay99brv88"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -93,7 +93,12 @@ (define-public man-db
(xz (assoc-ref %build-inputs "xz"))
(util (assoc-ref %build-inputs "util-linux")))
;; Invoke groff, less, gzip, bzip2, and xz directly from the store.
(append (list "--disable-setuid" ;; Disable setuid man user.
(append (list ;; Disable setuid man user.
"--disable-setuid"
;; Don't constrain ownership of system-wide cache files.
;; Otherwise creating the manpage database fails with
;; man-db > 2.7.5.
"--disable-cache-owner"
(string-append "--with-pager=" less "/bin/less")
(string-append "--with-gzip=" gzip "/bin/gzip")
(string-append "--with-bzip2=" bzip2 "/bin/gzip")
@ -133,7 +138,7 @@ (define-public man-db
(define-public man-pages
(package
(name "man-pages")
(version "4.11")
(version "4.12")
(source (origin
(method url-fetch)
(uri
@ -146,7 +151,7 @@ (define-public man-pages
"man-pages-" version ".tar.xz")))
(sha256
(base32
"097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"))))
"14z0zcwm0m98fk2m2b3pvr8rs2sb602mg8f7wwb4xl7yj7cpjvbg"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-delete 'configure %standard-phases)

2
gnu/packages/maths.scm
View file

@ -437,7 +437,7 @@ (define-public lapack
version ".tgz"))
(sha256
(base32
"0yavf6m9l78pwlnk5g61cg8x28mr30j0g8gkai0jrdqfjjmf3whs"))))
"1j51r7n5w4k7r3lrvy7710xrpkg40wf4rqnmngfz6ck9ypckzign"))))
(build-system cmake-build-system)
(home-page "http://www.netlib.org/lapack/")
(inputs `(("fortran" ,gfortran)

60
gnu/packages/medical.scm Normal file
View file

@ -0,0 +1,60 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Quiliro <quiliro@fsfla.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages medical)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (gnu packages python)
#:use-module (gnu packages qt))
(define-public openmolar-1
(package
(name "openmolar")
(version "1.0.15-gd81f9e5")
(source (origin
(method url-fetch)
(uri (string-append
"https://static.openmolar.com/om1/releases/openmolar-"
version ".tar.gz"))
(sha256
(base32
"1cfdzfbi6wslw7k0dc6ad6xrgs75iwsl91cg73w4myswaqqkfk3z"))))
(build-system python-build-system)
(arguments
`(#:use-setuptools? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-/usr
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "setup.py"
(("/usr") (assoc-ref outputs "out")))
#t)))))
(inputs
`(("python-pyqt+qscintilla" ,python-pyqt+qscintilla)
("python-mysqlclient" ,python-mysqlclient)
("qscintilla" ,qscintilla)))
(home-page "https://openmolar.com/om1")
(synopsis "Dental practice management software")
(description "Openmolar is a dental practice management suite. Its
functionality includes appointments, patient records, treatment planning,
billing etc. It is a full featured, reliable and thoroughly tested
application and has been translated into many languages.")
(license gpl3+)))

30
gnu/packages/messaging.scm
View file

@ -670,7 +670,7 @@ (define-public libtoxcore
(define-public c-toxcore
(package
(name "c-toxcore")
(version "0.1.1")
(version "0.1.9")
(source
(origin
(method url-fetch)
@ -679,32 +679,20 @@ (define-public c-toxcore
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0dybpz44pi0zm8djppjna0r8yh5wvl3l885dv2f1wp5366bk59n3"))))
(build-system gnu-build-system)
"1y30xc1dzq9knww274d4y0m8gridcf5j851rxdri8j2s64p3qqgk"))))
(build-system cmake-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("check" ,check)
("pkg-config" ,pkg-config)))
(inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("libsodium" ,libsodium)
("opus" ,opus)
("libvpx" ,libvpx)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoconf
;; The tarball source is not bootstrapped.
(lambda _
(zero? (system* "autoreconf" "-vfi")))))
#:tests? #f)) ; FIXME: Testsuite fails, needs internet connection.
(home-page "https://tox.chat")
(synopsis "Library for the Tox encrypted messenger protocol")
(description
"Official fork of the C library implementation of the Tox
encrypted messenger protocol.")
(license license:gpl3+)
(home-page "https://tox.chat")))
"Official fork of the C library implementation of the Tox encrypted
messenger protocol.")
(license license:gpl3+)))
(define-public utox
(package

13
gnu/packages/mp3.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
@ -290,14 +290,17 @@ (define-public mp3splt
(define-public mpg123
(package
(name "mpg123")
(version "1.25.0")
(version "1.25.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/mpg123/mpg123/" version
"/mpg123-" version ".tar.bz2"))
(uri (list (string-append "mirror://sourceforge/mpg123/mpg123/"
version "/mpg123-" version ".tar.bz2")
(string-append
"http://www.mpg123.org/download/mpg123-"
version ".tar.bz2")))
(sha256
(base32
"0j2fyb984cwvhn8kicf87y39bhjsg43p14aj893hzq25n0fkwbjm"))))
"0f7fib7qyd9lah3fqcsjlqcni4bip4hw7iglkz3vz4fjibxv052k"))))
(build-system gnu-build-system)
(arguments '(#:configure-flags '("--with-default-audio=pulse")))
(native-inputs `(("pkg-config" ,pkg-config)))

76
gnu/packages/music.scm
View file

@ -2101,13 +2101,13 @@ (define-public pianobar
(define-public python-mutagen
(package
(name "python-mutagen")
(version "1.36")
(version "1.38")
(source (origin
(method url-fetch)
(uri (pypi-uri "mutagen" version))
(sha256
(base32
"1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"))))
"0rl7sxn1rcjl48fwga3dqf9f6pzspsny4ngxyf6pp337mrq0z693"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
@ -2345,6 +2345,78 @@ (define-public schismtracker
with a number of bugfixes and changes to improve IT playback.")
(license license:gpl2+)))
(define-public sooperlooper
(package
(name "sooperlooper")
(version "1.7.3")
(source (origin
(method url-fetch)
(uri (string-append "http://essej.net/sooperlooper/sooperlooper-"
version ".tar.gz"))
(sha256
(base32
"0n2gdxw1fx8nxxnpzf4sj0kp6k6zi1yq59cbz6qqzcnsnpnvszbs"))
(patches (search-patches "sooperlooper-build-with-wx-30.patch"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "CXXFLAGS=-std=gnu++11")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-sigc++-includes
(lambda* (#:key inputs #:allow-other-keys)
(let ((sig (assoc-ref inputs "libsigc++"))
(xml (assoc-ref inputs "libxml2"))
(cwd (getcwd)))
(setenv "CPATH"
(string-append sig "/include/sigc++-2.0:"
sig "/lib/sigc++-2.0/include:"
xml "/include/libxml2/:"
cwd "/libs/pbd:"
cwd "/libs/midi++")))
(substitute* '("src/control_osc.hpp"
"src/gui/app_frame.hpp"
"src/gui/config_panel.hpp"
"src/gui/keys_panel.hpp"
"src/gui/latency_panel.hpp"
"src/gui/main_panel.hpp"
"src/gui/midi_bind_panel.hpp"
"src/gui/prefs_dialog.hpp")
(("sigc\\+\\+/object.h")
"sigc++/sigc++.h"))
(substitute* '("src/engine.cpp"
"src/gui/latency_panel.cpp"
"src/gui/looper_panel.cpp"
"src/gui/main_panel.cpp")
(("(\\(| )bind " _ pre)
(string-append pre "sigc::bind ")))
#t))
(add-after 'unpack 'fix-xpm-warnings
(lambda _
(substitute* (find-files "." "\\.xpm$")
(("static char") "static const char"))
#t)))))
(inputs
`(("jack" ,jack-1)
("alsa-lib" ,alsa-lib)
("wxwidgets" ,wxwidgets-gtk2)
("libsndfile" ,libsndfile)
("libsamplerate" ,libsamplerate)
("liblo" ,liblo)
("rubberband" ,rubberband)
("libxml2" ,libxml2)
("libsigc++" ,libsigc++)
("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://essej.net/sooperlooper/")
(synopsis "Live looping sampler")
(description
"SooperLooper is a live looping sampler capable of immediate loop
recording, overdubbing, multiplying, reversing and more. It allows for
multiple simultaneous multi-channel loops limited only by your computer's
available memory.")
(license license:gpl2+)))
(define-public moc
(package
(name "moc")

4
gnu/packages/nano.scm
View file

@ -29,7 +29,7 @@ (define-module (gnu packages nano)
(define-public nano
(package
(name "nano")
(version "2.8.5")
(version "2.8.6")
(source
(origin
(method url-fetch)
@ -37,7 +37,7 @@ (define-public nano
version ".tar.xz"))
(sha256
(base32
"1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb"))))
"0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)

55
gnu/packages/networking.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -70,6 +70,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages wm)
#:use-module (gnu packages xml)
#:use-module (ice-9 match))
@ -1103,7 +1104,7 @@ (define-public nethogs
(define-public nzbget
(package
(name "nzbget")
(version "18.1")
(version "19.1")
(source
(origin
(method url-fetch)
@ -1112,14 +1113,22 @@ (define-public nzbget
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1a8wmbhc1si1n8axzrr8ysmrd3gr643lbh6pvzmr0hnd65fixmx5"))))
"0y713g7gd4n5chbhr8lv7k50rxkmzysrg13sscxam3s386mmlb1r"))
(modules '((guix build utils)))
(snippet
;; Reported upstream as <https://github.com/nzbget/nzbget/pull/414>.
'(begin
(substitute* "daemon/connect/TlsSocket.cpp"
(("gnutls_certificate-verification_status_print")
"gnutls_certificate_verification_status_print"))
#t))))
(arguments
`(#:configure-flags
(list
(string-append "--with-libcurses-includes=" (assoc-ref
%build-inputs "ncurses") "/include")
(string-append "--with-libcurses-libraries=" (assoc-ref
%build-inputs "ncurses") "/lib")
(string-append "--with-libcurses-includes="
(assoc-ref %build-inputs "ncurses") "/include")
(string-append "--with-libcurses-libraries="
(assoc-ref %build-inputs "ncurses") "/lib")
(string-append "--with-tlslib=GnuTLS"))))
(build-system gnu-build-system)
(inputs `(("gnutls", gnutls)
@ -1387,3 +1396,35 @@ (define-public thc-ipv6
;; AGPL 3 with exception for linking with OpenSSL. See the 'LICENSE' file in
;; the source distribution for more information.
(license license:agpl3)))
(define-public bmon
(package
(name "bmon")
(version "4.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/tgraf/bmon/releases/download/v"
version "/bmon-" version ".tar.gz"))
(sha256
(base32
"0ylzriv4pwh76344abzl1w219x188gshbycbna35gsyfp09c7z82"))))
(build-system gnu-build-system)
(inputs
`(("libconfuse" ,libconfuse)
("libnl" ,libnl)
("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis "Bandwidth monitor")
(description "bmon is a monitoring and debugging tool to capture
networking-related statistics and prepare them visually in a human-friendly
way. It features various output methods including an interactive curses user
interface and a programmable text output for scripting.")
(home-page "https://github.com/tgraf/bmon")
;; README.md mentions both the 2-clause BSD and expat licenses, but all
;; the source files only have expat license headers. Upstream has been
;; contacted for clarification: https://github.com/tgraf/bmon/issues/59
;; Update the license field when upstream responds.
(license (list license:bsd-2
license:expat))))

4
gnu/packages/node.scm
View file

@ -134,6 +134,10 @@ (define-public node
("procps" ,procps)
("util-linux" ,util-linux)
("which" ,which)))
(native-search-paths
(list (search-path-specification
(variable "NODE_PATH")
(files '("lib/node_modules")))))
(inputs
`(("c-ares" ,c-ares)
("http-parser" ,http-parser)

8
gnu/packages/ntp.scm
View file

@ -98,16 +98,14 @@ (define-public ntp
(define-public openntpd
(package
(name "openntpd")
(version "6.0p1")
(version "6.1p1")
(source (origin
(method url-fetch)
;; XXX Use mirror://openbsd
(uri (string-append
"http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-"
version ".tar.gz"))
"mirror://openbsd/OpenNTPD/" name "-" version ".tar.gz"))
(sha256
(base32
"1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"))))
"1ykx9ga76k5m54h7k5x4ds2clxsyfniss5vmf88pxnrip5bx6if8"))))
(build-system gnu-build-system)
(home-page "http://www.openntpd.org/")
(synopsis "NTP client and server by the OpenBSD Project")

190
gnu/packages/package-management.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -25,7 +26,7 @@ (define-module (gnu packages package-management)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl2.1+ asl2.0))
#:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl2.1+ asl2.0 bsd-3))
#:use-module (gnu packages)
#:use-module (gnu packages guile)
#:use-module (gnu packages file)
@ -52,6 +53,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages tls)
#:use-module (gnu packages ssh)
#:use-module (gnu packages vim)
#:use-module (gnu packages serialization)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
@ -74,8 +76,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "0.13.0")
(commit "de9d8f0e295928d92e0e5ea43a4e594fa78c76fb")
(revision 2))
(commit "b547349d505c57fd679b6e48c472d8ab65469c96")
(revision 3))
(package
(name "guix")
@ -91,7 +93,7 @@ (define-public guix
(commit commit)))
(sha256
(base32
"0px7n4vajc9am3snhnnvddrmnwnb2ygwz0f8isk0qhk8b1ks4kdx"))
"0q6qr9hvrac1wj2ygn4jj4w89h1m35zkcjjd741sibc3l46pa93l"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -516,3 +518,183 @@ (define-public diffoscope
various binary formats into more human readable forms to compare them. It can
compare two tarballs, ISO images, or PDFs just as easily.")
(license gpl3+)))
(define-public python-anaconda-client
(package
(name "python-anaconda-client")
(version "1.6.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/Anaconda-Platform/"
"anaconda-client/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1wv4wi6k5jz7rlwfgvgfdizv77x3cr1wa2aj0k1595g7fbhkjhz2"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pyyaml" ,python-pyyaml)
("python-requests" ,python-requests)
("python-clyent" ,python-clyent)))
(native-inputs
`(("python-pytz" ,python-pytz)
("python-dateutil" ,python-dateutil)
("python-mock" ,python-mock)
("python-coverage" ,python-coverage)
("python-pillow" ,python-pillow)))
(arguments
`(#:phases
(modify-phases %standard-phases
;; This is needed for some tests.
(add-before 'check 'set-up-home
(lambda* _ (setenv "HOME" "/tmp") #t))
(add-before 'check 'remove-network-tests
(lambda* _
;; Remove tests requiring a network connection
(let ((network-tests '("tests/test_upload.py"
"tests/test_authorizations.py"
"tests/test_login.py"
"tests/test_whoami.py"
"utils/notebook/tests/test_data_uri.py"
"utils/notebook/tests/test_base.py"
"utils/notebook/tests/test_downloader.py"
"inspect_package/tests/test_conda.py")))
(with-directory-excursion "binstar_client"
(for-each delete-file network-tests)))
#t)))))
(home-page "https://github.com/Anaconda-Platform/anaconda-client")
(synopsis "Anaconda Cloud command line client library")
(description
"Anaconda Cloud command line client library provides an interface to
Anaconda Cloud. Anaconda Cloud is useful for sharing packages, notebooks and
environments.")
(license bsd-3)))
(define-public python2-anaconda-client
(package-with-python2 python-anaconda-client))
(define-public python-conda
(package
(name "python-conda")
(version "4.3.16")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/conda/conda/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1jq8hyrc5npb5sf4vw6s6by4602yj8f79vzpbwdfgpkn02nfk1dv"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'create-version-file
(lambda _
(with-output-to-file "conda/.version"
(lambda () (display ,version)))
#t))
(add-before 'check 'remove-failing-tests
(lambda _
;; These tests require internet/network access
(let ((network-tests '("test_cli.py"
"test_create.py"
"test_export.py"
"test_fetch.py"
"test_history.py"
"test_info.py"
"test_install.py"
"test_priority.py"
"conda_env/test_cli.py"
"conda_env/test_create.py"
"conda_env/specs/test_notebook.py"
"conda_env/utils/test_notebooks.py"
"core/test_index.py"
"core/test_repodata.py")))
(with-directory-excursion "tests"
(for-each delete-file network-tests)
;; FIXME: This test creates a file, then deletes it and tests
;; that the file was deleted. For some reason it fails when
;; building with guix, but does not when you run it in the
;; directory left when you build with the --keep-failed
;; option
(delete-file "gateways/disk/test_delete.py")
#t))))
(replace 'check
(lambda _
(setenv "HOME" "/tmp")
(zero? (system* "py.test")))))))
(native-inputs
`(("python-ruamel.yaml" ,python-ruamel.yaml)
("python-requests" ,python-requests)
("python-pycosat" ,python-pycosat)
("python-pytest" ,python-pytest)
("python-responses" ,python-responses)
("python-pyyaml" ,python-pyyaml)
("python-anaconda-client" ,python-anaconda-client)))
(home-page "https://github.com/conda/conda")
(synopsis "Cross-platform, OS-agnostic, system-level binary package manager")
(description
"Conda is a cross-platform, Python-agnostic binary package manager. It
is the package manager used by Anaconda installations, but it may be used for
other systems as well. Conda makes environments first-class citizens, making
it easy to create independent environments even for C libraries. Conda is
written entirely in Python.
This package provides Conda as a library.")
(license bsd-3)))
(define-public python2-conda
(package-with-python2 python-conda))
(define-public conda
(package (inherit python-conda)
(name "conda")
(arguments
(substitute-keyword-arguments (package-arguments python-conda)
((#:phases phases)
`(modify-phases ,phases
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
;; This test fails when run before installation.
(delete-file "tests/test_activate.py")
;; Fix broken defaults
(substitute* "conda/base/context.py"
(("return sys.prefix")
(string-append "return \"" (assoc-ref outputs "out") "\""))
(("return (prefix_is_writable\\(self.root_prefix\\))" _ match)
(string-append "return False if self.root_prefix == self.conda_prefix else "
match)))
;; The util/setup-testing.py is used to build conda in
;; application form, rather than the default, library form.
;; With this, we are able to run commands like `conda --help`
;; directly on the command line
(zero? (system* "python" "utils/setup-testing.py" "build_py"))))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(target (string-append out "/lib/python"
((@@ (guix build python-build-system)
get-python-version)
(assoc-ref inputs "python"))
"/site-packages/")))
;; The installer aborts if the target directory is not on
;; PYTHONPATH.
(setenv "PYTHONPATH"
(string-append target ":" (getenv "PYTHONPATH")))
;; And it aborts if the directory doesn't exist.
(mkdir-p target)
(zero? (system* "python" "utils/setup-testing.py" "install"
(string-append "--prefix=" out))))))))))
(description
"Conda is a cross-platform, Python-agnostic binary package manager. It
is the package manager used by Anaconda installations, but it may be used for
other systems as well. Conda makes environments first-class citizens, making
it easy to create independent environments even for C libraries. Conda is
written entirely in Python.")))

4
gnu/packages/parallel.scm
View file

@ -45,7 +45,7 @@ (define-module (gnu packages parallel)
(define-public parallel
(package
(name "parallel")
(version "20170522")
(version "20170722")
(source
(origin
(method url-fetch)
@ -53,7 +53,7 @@ (define-public parallel
version ".tar.bz2"))
(sha256
(base32
"1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca"))))
"117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx"))))
(build-system gnu-build-system)
(arguments
`(#:phases

18
gnu/packages/patches/bigloo-gc-shebangs.patch
View file

@ -1,18 +0,0 @@
Patch shebangs in source that gets unpacked by `configure'.
--- bigloo4.1a/gc/install-gc-7.4.0 2014-02-04 14:55:03.000000000 +0100
+++ bigloo4.1a/gc/install-gc-7.4.0 2014-02-04 14:55:36.000000000 +0100
@@ -29,10 +29,12 @@ fi
# untar the two versions of the GC
$tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1)
-/bin/rm -rf "../gc/$gc"_fth
+rm -rf "../gc/$gc"_fth
+find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g"
mv ../gc/$gc "../gc/$gc"_fth || (echo "mv $gc failed"; exit 1)
$tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1)
+find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g"
# general Bigloo patch
(cd "../gc/$gc"_fth && $patch -p1 < ../$gc.patch > /dev/null)

57
gnu/packages/patches/chicken-CVE-2017-11343.patch Normal file
View file

@ -0,0 +1,57 @@
Fix CVE-2017-11343:
https://lists.nongnu.org/archive/html/chicken-announce/2017-07/msg00000.html
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11343
Patch copied from upstream mailing list:
http://lists.gnu.org/archive/html/chicken-hackers/2017-06/txtod8Pa1wGU0.txt
From ae2633195cc5f4f61c9da4ac90f0c14c010dcc3d Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Fri, 30 Jun 2017 15:39:45 +0200
Subject: [PATCH 2/2] Initialize symbol table after setting up randomization
Otherwise, the symbol table wouldn't be correctly randomized.
---
NEWS | 3 +++
runtime.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
#diff --git a/NEWS b/NEWS
#index f4b0e041..6588b30e 100644
#--- a/NEWS
#+++ b/NEWS
#@@ -96,6 +96,9 @@
# buffer overrun and/or segfault (thanks to Lemonboy).
# - CVE-2017-9334: `length' no longer crashes on improper lists (fixes
# #1375, thanks to "megane").
#+ - The randomization factor of the symbol table was set before
#+ the random seed was set, causing it to have a fixed value on many
#+ platforms.
#
# - Core Libraries
# - Unit "posix": If file-lock, file-lock/blocking or file-unlock are
diff --git a/runtime.c b/runtime.c
index 81c54dd2..a4580abc 100644
--- a/runtime.c
+++ b/runtime.c
@@ -799,7 +799,6 @@ int CHICKEN_initialize(int heap, int stack, int symbols, void *toplevel)
C_initial_timer_interrupt_period = INITIAL_TIMER_INTERRUPT_PERIOD;
C_timer_interrupt_counter = INITIAL_TIMER_INTERRUPT_PERIOD;
memset(signal_mapping_table, 0, sizeof(int) * NSIG);
- initialize_symbol_table();
C_dlerror = "cannot load compiled code dynamically - this is a statically linked executable";
error_location = C_SCHEME_FALSE;
C_pre_gc_hook = NULL;
@@ -816,6 +815,7 @@ int CHICKEN_initialize(int heap, int stack, int symbols, void *toplevel)
callback_continuation_level = 0;
gc_ms = 0;
(void)C_randomize(C_fix(time(NULL)));
+ initialize_symbol_table();
if (profiling) {
#ifndef C_NONUNIX
--
2.11.0

109
gnu/packages/patches/evince-CVE-2017-1000083.patch Normal file
View file

@ -0,0 +1,109 @@
Fix CVE-2017-1000083.
http://seclists.org/oss-sec/2017/q3/128
https://bugzilla.gnome.org/show_bug.cgi?id=784630
Patch copied from upstream source repository:
https://git.gnome.org/browse/evince/commit/?id=717df38fd8509bf883b70d680c9b1b3cf36732ee
From 717df38fd8509bf883b70d680c9b1b3cf36732ee Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 6 Jul 2017 20:02:00 +0200
Subject: comics: Remove support for tar and tar-like commands
diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 4c74731..641d785 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -56,8 +56,7 @@ typedef enum
RARLABS,
GNAUNRAR,
UNZIP,
- P7ZIP,
- TAR
+ P7ZIP
} ComicBookDecompressType;
typedef struct _ComicsDocumentClass ComicsDocumentClass;
@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand command_usage_def[] = {
/* 7zip */
{NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
-
- /* tar */
- {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET}
};
static GSList* get_supported_image_extensions (void);
@@ -364,13 +360,6 @@ comics_check_decompress_command (gchar *mime_type,
comics_document->command_usage = GNAUNRAR;
return TRUE;
}
- comics_document->selected_command =
- g_find_program_in_path ("bsdtar");
- if (comics_document->selected_command) {
- comics_document->command_usage = TAR;
- return TRUE;
- }
-
} else if (g_content_type_is_a (mime_type, "application/x-cbz") ||
g_content_type_is_a (mime_type, "application/zip")) {
/* InfoZIP's unzip program */
@@ -396,12 +385,6 @@ comics_check_decompress_command (gchar *mime_type,
comics_document->command_usage = P7ZIP;
return TRUE;
}
- comics_document->selected_command =
- g_find_program_in_path ("bsdtar");
- if (comics_document->selected_command) {
- comics_document->command_usage = TAR;
- return TRUE;
- }
} else if (g_content_type_is_a (mime_type, "application/x-cb7") ||
g_content_type_is_a (mime_type, "application/x-7z-compressed")) {
@@ -425,27 +408,6 @@ comics_check_decompress_command (gchar *mime_type,
comics_document->command_usage = P7ZIP;
return TRUE;
}
- comics_document->selected_command =
- g_find_program_in_path ("bsdtar");
- if (comics_document->selected_command) {
- comics_document->command_usage = TAR;
- return TRUE;
- }
- } else if (g_content_type_is_a (mime_type, "application/x-cbt") ||
- g_content_type_is_a (mime_type, "application/x-tar")) {
- /* tar utility (Tape ARchive) */
- comics_document->selected_command =
- g_find_program_in_path ("tar");
- if (comics_document->selected_command) {
- comics_document->command_usage = TAR;
- return TRUE;
- }
- comics_document->selected_command =
- g_find_program_in_path ("bsdtar");
- if (comics_document->selected_command) {
- comics_document->command_usage = TAR;
- return TRUE;
- }
} else {
g_set_error (error,
EV_DOCUMENT_ERROR,
diff --git a/configure.ac b/configure.ac
index 9e9f831..7eb0f1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -795,7 +795,7 @@ AC_SUBST(TIFF_MIME_TYPES)
AC_SUBST(APPDATA_TIFF_MIME_TYPES)
AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
if test "x$enable_comics" = "xyes"; then
- COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;application/x-ext-cbt"
+ COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;"
APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n <mimetype>/g')
if test -z "$EVINCE_MIME_TYPES"; then
EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
--
cgit v0.12

45
gnu/packages/patches/heimdal-CVE-2017-11103.patch Normal file
View file

@ -0,0 +1,45 @@
Fix CVE-2017-11103:
https://orpheus-lyre.info/
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11103
https://security-tracker.debian.org/tracker/CVE-2017-11103
Patch lifted from upstream source repository:
https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea
From 6dd3eb836bbb80a00ffced4ad57077a1cdf227ea Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 12 Apr 2017 15:40:42 -0400
Subject: [PATCH] CVE-2017-11103: Orpheus' Lyre KDC-REP service name validation
In _krb5_extract_ticket() the KDC-REP service name must be obtained from
encrypted version stored in 'enc_part' instead of the unencrypted version
stored in 'ticket'. Use of the unecrypted version provides an
opportunity for successful server impersonation and other attacks.
Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams.
Change-Id: I45ef61e8a46e0f6588d64b5bd572a24c7432547c
---
lib/krb5/ticket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/krb5/ticket.c b/lib/krb5/ticket.c
index d95d96d1b..b8d81c6ad 100644
--- a/lib/krb5/ticket.c
+++ b/lib/krb5/ticket.c
@@ -705,8 +705,8 @@ _krb5_extract_ticket(krb5_context context,
/* check server referral and save principal */
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
- rep->kdc_rep.ticket.sname,
- rep->kdc_rep.ticket.realm);
+ rep->enc_part.sname,
+ rep->enc_part.srealm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
--
2.13.3

85
gnu/packages/patches/heimdal-CVE-2017-6594.patch Normal file
View file

@ -0,0 +1,85 @@
Fix CVE-2017-6594:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6594
https://security-tracker.debian.org/tracker/CVE-2017-6594
Patch lifted from upstream source repository:
https://github.com/heimdal/heimdal/commit/b1e699103f08d6a0ca46a122193c9da65f6cf837
To apply the patch to Heimdal 1.5.3 release tarball, the changes to 'NEWS' and
files in 'tests/' are removed, and hunk #4 of 'kdc/krb5tgs.c' is modified.
From b1e699103f08d6a0ca46a122193c9da65f6cf837 Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni <viktor@twosigma.com>
Date: Wed, 10 Aug 2016 23:31:14 +0000
Subject: [PATCH] Fix transit path validation CVE-2017-6594
Commit f469fc6 (2010-10-02) inadvertently caused the previous hop realm
to not be added to the transit path of issued tickets. This may, in
some cases, enable bypass of capath policy in Heimdal versions 1.5
through 7.2.
Note, this may break sites that rely on the bug. With the bug some
incomplete [capaths] worked, that should not have. These may now break
authentication in some cross-realm configurations.
---
NEWS | 14 ++++++++++++++
kdc/krb5tgs.c | 12 ++++++++++--
tests/kdc/check-kdc.in | 17 +++++++++++++++++
tests/kdc/krb5.conf.in | 4 ++++
4 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 6048b9c55..98503812f 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -655,8 +655,12 @@ fix_transited_encoding(krb5_context context,
"Decoding transited encoding");
return ret;
}
+
+ /*
+ * If the realm of the presented tgt is neither the client nor the server
+ * realm, it is a transit realm and must be added to transited set.
+ */
if(strcmp(client_realm, tgt_realm) && strcmp(server_realm, tgt_realm)) {
- /* not us, so add the previous realm to transited set */
if (num_realms + 1 > UINT_MAX/sizeof(*realms)) {
ret = ERANGE;
goto free_realms;
@@ -737,6 +741,7 @@ tgs_make_reply(krb5_context context,
const char *server_name,
hdb_entry_ex *client,
krb5_principal client_principal,
+ const char *tgt_realm,
hdb_entry_ex *krbtgt,
krb5_enctype krbtgt_etype,
krb5_principals spp,
@@ -798,7 +803,7 @@ tgs_make_reply(krb5_context context,
&tgt->transited, &et,
krb5_principal_get_realm(context, client_principal),
krb5_principal_get_realm(context, server->entry.principal),
- krb5_principal_get_realm(context, krbtgt->entry.principal));
+ tgt_realm);
if(ret)
goto out;
@@ -1519,4 +1524,6 @@ tgs_build_reply(krb5_context context,
krb5_keyblock sessionkey;
krb5_kvno kvno;
krb5_data rspac;
+ const char *tgt_realm = /* Realm of TGT issuer */
+ krb5_principal_get_realm(context, krbtgt->entry.principal);
@@ -2324,6 +2331,7 @@ server_lookup:
spn,
client,
cp,
+ tgt_realm,
krbtgt_out,
tkey_sign->key.keytype,
spp,
--
2.13.3

60
gnu/packages/patches/hop-linker-flags.patch
View file

@ -1,60 +0,0 @@
Make hop's link rules honor flags set by the --blflags configure argument.
--- hop-2.4.0/src/Makefile 2015-05-05 19:41:04.800151036 -0500
+++ hop-2.4.0/src/Makefile 2015-05-05 19:40:40.916150417 -0500
@@ -69,10 +69,10 @@
$(MAKE) link.$(LINK) DEST=$@
link.dynamic:
- @ $(call link,$(BIGLOO),$(BCFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$(DEST))
+ @ $(call link,$(BIGLOO),$(BCFLAGS) $(BLFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$(DEST))
link.static:
- @ $(call link,$(BIGLOO),$(BCFLAGS),$(BCFLAGSDEV),-static-all-bigloo $(OBJECTS),-o,$(DEST))
+ @ $(call link,$(BIGLOO),$(BCFLAGS) $(BLFLAGS),$(BCFLAGSDEV),-static-all-bigloo $(OBJECTS),-o,$(DEST))
link.library:
echo "***ERROR: link.library not currently supported!"
--- hop-2.4.0/hopc/Makefile 2013-01-30 07:17:59.000000000 -0600
+++ hop-2.4.0/hopc/Makefile 2015-05-05 19:45:21.876157699 -0500
@@ -62,7 +62,7 @@
mkdir -p $@
$(BUILDBINDIR)/$(EXEC): .afile .etags $(OBJECTS)
- @ $(call link,$(BIGLOO),$(BCFLAGS),,$(OBJECTS),-o,$@)
+ @ $(call link,$(BIGLOO),$(BCFLAGS) $(BLFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$@)
$(BUILDBINDIR)/$(EXEC).jar: .afile .etags .jfile $(BGL_CLASSES) META-INF/MANIFEST.MF jvm-stdlibs jvm-share jvm-lib
$(JAR) $@ META-INF/MANIFEST.MF -C o/class_s .
--- hop-2.4.0/hophz/Makefile 2013-01-30 07:17:59.000000000 -0600
+++ hop-2.4.0/hophz/Makefile 2015-05-05 19:59:42.996180030 -0500
@@ -16,9 +16,6 @@
-include ../etc/Makefile.hopconfig
-include ../etc/Makefile.version
-BLFLAGS =
-BLINKFLAGS = -suffix hop
-
#*---------------------------------------------------------------------*/
#* Target and Project */
#*---------------------------------------------------------------------*/
@@ -72,7 +69,7 @@
mkdir -p $@
$(BUILDBINDIR)/$(EXEC): .afile .etags $(OBJECTS)
- @ $(call link,$(BIGLOO),$(BCFLAGS),$(BLINKFLAGS),$(OBJECTS),-o,$@)
+ @ $(call link,$(BIGLOO),$(BCFLAGS) $(BLFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$@)
$(BUILDBINDIR)/$(EXEC).jar: .afile .etags .jfile $(BGL_CLASSES) META-INF/MANIFEST.MF jvm-stdlibs jvm-share jvm-lib
@ $(JAR) $@ META-INF/MANIFEST.MF -C o/class_s .
--- hop-2.4.0/hopsh/Makefile 2013-01-30 07:17:59.000000000 -0600
+++ hop-2.4.0/hopsh/Makefile 2015-05-05 19:46:36.060159626 -0500
@@ -60,7 +60,7 @@
mkdir -p $@
$(BUILDBINDIR)/$(EXEC): .afile .etags $(OBJECTS)
- @ $(call link,$(BIGLOO),$(BCFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$@)
+ @ $(call link,$(BIGLOO),$(BCFLAGS) $(BLFLAGS),$(BCFLAGSDEV),$(OBJECTS),-o,$@)
$(BUILDBINDIR)/$(EXEC).jar: .afile .etags .jfile $(BGL_CLASSES) META-INF/MANIFEST.MF jvm-stdlibs jvm-share jvm-lib
@ $(JAR) $@ META-INF/MANIFEST.MF -C o/class_s .

15
gnu/packages/patches/libusb-0.1-disable-tests.patch Normal file
View file

@ -0,0 +1,15 @@
Disable tests who fail because they have to run as root.
--- libusb-0.1.12/tests/Makefile.in 2006-03-04 03:54:06.000000000 +0100
+++ libusb-0.1.12/tests/Makefile.in 2017-07-13 16:17:45.201728019 +0200
@@ -255,8 +255,8 @@
hub_strings_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@
driver_name_SOURCES = driver_name.cpp
driver_name_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@
-TESTS = testlibusb descriptor_test id_test find_hubs find_mice \
- get_resolution hub_strings $(OS_SPECIFIC)
+TESTS = testlibusb descriptor_test id_test find_hubs find_mice
+ #get_resolution hub_strings $(OS_SPECIFIC)
XFAIL_TESTS = get_resolution hub_strings $(OS_SPECIFIC_XFAIL)
all: all-am

39
gnu/packages/patches/metabat-fix-compilation.patch Normal file
View file

@ -0,0 +1,39 @@
This patch changes metabat so that (1) it is not build statically, (2) it uses
shared libraries rather than static libraries where possible.
diff --git a/SConstruct b/SConstruct
index 69cdc0a..ac99bcb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -26,8 +26,6 @@ debug = ARGUMENTS.get('DEBUG', None)
build_flags = ['-Wall', '-g', '-std=c++11', '-fopenmp']
link_flags = ['-lstdc++', '-lm', '-fopenmp']
-if platform.platform(True, True).find('Darwin') == -1:
- link_flags.extend(['-static', '-static-libgcc', '-static-libstdc++'])
if debug is None:
build_flags.extend(['-O3', '-DNDEBUG', '-Wno-unknown-pragmas', '-Wno-deprecated-declarations', '-Wno-overflow', '-Wno-unused-variable'])
@@ -110,17 +108,17 @@ def findStaticOrShared( lib, testPaths, static_source_list, link_flag_list, stat
for path in testPaths:
if not os.path.isdir(path):
continue
+ for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)):
+ if os.path.isfile(testfile):
+ print "Found shared library %s as %s" % (lib, testfile)
+ link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] )
+ return
for suffix in staticSuffixes:
testfile = '%s/lib%s%s' % (path, lib, suffix)
if os.path.isfile(testfile):
static_source_list.append(testfile)
print "Found static library %s as %s" % (lib, testfile)
return
- for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)):
- if os.path.isfile(testfile):
- print "Found shared library %s as %s" % (lib, testfile)
- link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] )
- return
print "Could not find library for %s!!! Looked in %s" % (lib, testPaths)
return

36
gnu/packages/patches/python-fake-factory-fix-build-32bit.patch
View file

@ -1,36 +0,0 @@
These tests fail on 32-bit due to an overflow.
Upstream bug URL: https://github.com/joke2k/faker/issues/408
diff --git a/faker/tests/__init__.py b/faker/tests/__init__.py
index 6026772..58b6b83 100644
--- a/faker/tests/__init__.py
+++ b/faker/tests/__init__.py
@@ -384,7 +384,6 @@ class FactoryTestCase(unittest.TestCase):
provider = Provider
# test century
self.assertTrue(self._datetime_to_time(provider.date_time_this_century(after_now=False)) <= self._datetime_to_time(datetime.datetime.now()))
- self.assertTrue(self._datetime_to_time(provider.date_time_this_century(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now()))
# test decade
self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(after_now=False)) <= self._datetime_to_time(datetime.datetime.now()))
self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now()))
@@ -413,8 +412,6 @@ class FactoryTestCase(unittest.TestCase):
# ensure all methods provide timezone aware datetimes
with self.assertRaises(TypeError):
- provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now()
- with self.assertRaises(TypeError):
provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now()
with self.assertRaises(TypeError):
provider.date_time_this_year(after_now=False, tzinfo=utc) <= datetime.datetime.now()
@@ -423,7 +420,6 @@ class FactoryTestCase(unittest.TestCase):
# test century
self.assertTrue(provider.date_time_this_century(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc))
- self.assertTrue(provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc))
# test decade
self.assertTrue(provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc))
self.assertTrue(provider.date_time_this_decade(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc))
--
2.11.1

36
gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch
View file

@ -1,36 +0,0 @@
Resolves a test failure on 32-bit platforms.
https://github.com/pyca/pyopenssl/issues/657
Patch copied from upstream source repository:
https://github.com/pyca/pyopenssl/commit/ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95
From ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 6 Jul 2017 22:14:44 -0400
Subject: [PATCH] Fixed #657 -- handle OverflowErrors on large allocation
requests
---
tests/test_rand.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/test_rand.py b/tests/test_rand.py
index bdd3af08..6adf72a1 100644
--- a/tests/test_rand.py
+++ b/tests/test_rand.py
@@ -32,10 +32,10 @@ def test_bytes_wrong_args(self, args):
def test_insufficient_memory(self):
"""
- `OpenSSL.rand.bytes` raises `MemoryError` if more bytes are requested
- than will fit in memory.
+ `OpenSSL.rand.bytes` raises `MemoryError` or `OverflowError` if more
+ bytes are requested than will fit in memory.
"""
- with pytest.raises(MemoryError):
+ with pytest.raises((MemoryError, OverflowError)):
rand.bytes(sys.maxsize)
def test_bytes(self):

52
gnu/packages/patches/qemu-CVE-2017-11334.patch Normal file
View file

@ -0,0 +1,52 @@
Fix CVE-2017-11334:
https://bugzilla.redhat.com/show_bug.cgi?id=1471638
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11334
Patch copied from upstream source repository:
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=04bf2526ce87f21b32c9acba1c5518708c243ad0
From 04bf2526ce87f21b32c9acba1c5518708c243ad0 Mon Sep 17 00:00:00 2001
From: Prasad J Pandit <pjp@fedoraproject.org>
Date: Wed, 12 Jul 2017 18:08:40 +0530
Subject: [PATCH] exec: use qemu_ram_ptr_length to access guest ram
When accessing guest's ram block during DMA operation, use
'qemu_ram_ptr_length' to get ram block pointer. It ensures
that DMA operation of given length is possible; And avoids
any OOB memory access situations.
Reported-by: Alex <broscutamaker@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-Id: <20170712123840.29328-1-ppandit@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
exec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index a083ff89ad..ad103ce483 100644
--- a/exec.c
+++ b/exec.c
@@ -2929,7 +2929,7 @@ static MemTxResult address_space_write_continue(AddressSpace *as, hwaddr addr,
}
} else {
/* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
+ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l);
memcpy(ptr, buf, l);
invalidate_and_set_dirty(mr, addr1, l);
}
@@ -3020,7 +3020,7 @@ MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
}
} else {
/* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
+ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l);
memcpy(buf, ptr, l);
}
--
2.13.3

25
gnu/packages/patches/quassel-fix-tls-check.patch Normal file
View file

@ -0,0 +1,25 @@
This allows quasselclient to connect to SSL-enabled quasselcore instances.
The check in qglobal.h requires -fPIC (not -fPIE as it is now). When this check
fails SSL / TLS is disabled.
This patch comes from the upstream source repository [0] and can be
removed when the next version is packaged.
[0] https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -428,6 +428,11 @@ endif()
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+
+if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
+ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
+endif()
+
check_cxx_source_compiles("
#include \"qglobal.h\"
#if defined QT_NO_SSL

179
gnu/packages/patches/sooperlooper-build-with-wx-30.patch Normal file
View file

@ -0,0 +1,179 @@
Downloaded from https://anonscm.debian.org/cgit/pkg-multimedia/sooperlooper.git/plain/debian/patches/04-build_with_wx_30.patch -O gnu/packages/patches/sooperlooper-build-with-wx-30.patch
Author: Jaromír Mikeš <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com>
Description: build against wx 3.0.
Forwarded: yes
Index: sooperlooper/src/gui/main_panel.cpp
===================================================================
--- sooperlooper.orig/src/gui/main_panel.cpp
+++ sooperlooper/src/gui/main_panel.cpp
@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count)
while (count < (int)_looper_panels.size()) {
looperpan = _looper_panels.back();
_looper_panels.pop_back();
- _main_sizer->Remove(looperpan);
+ _main_sizer->Detach(looperpan);
looperpan->Destroy();
}
}
@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas
}
- wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
+ wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
if ( !filename.empty() )
{
@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas
index = 0;
}
- wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
if ( !filename.empty() )
{
@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index
void MainPanel::do_load_session ()
{
- wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
if ( !filename.empty() )
{
@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session ()
void MainPanel::do_save_session (bool write_audio)
{
- wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
+ wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
if ( !filename.empty() )
{
Index: sooperlooper/src/gui/pix_button.cpp
===================================================================
--- sooperlooper.orig/src/gui/pix_button.cpp
+++ sooperlooper/src/gui/pix_button.cpp
@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent &
pt.x += bounds.x;
pt.y += bounds.y;
- if (bounds.Inside(pt)) {
+ if (bounds.Contains(pt)) {
clicked (get_mouse_button(ev)); // emit
if (ev.MiddleUp() && ev.ControlDown()) {
Index: sooperlooper/src/gui/looper_panel.cpp
===================================================================
--- sooperlooper.orig/src/gui/looper_panel.cpp
+++ sooperlooper/src/gui/looper_panel.cpp
@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button,
if (cmd == wxT("save"))
{
wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"),
- wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
+ wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
if ( !filename.empty() )
{
@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button,
}
else if (cmd == wxT("load"))
{
- wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR);
if ( !filename.empty() )
{
Index: sooperlooper/src/gui/keyboard_target.cpp
===================================================================
--- sooperlooper.orig/src/gui/keyboard_target.cpp
+++ sooperlooper/src/gui/keyboard_target.cpp
@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const
keycode = WXK_RETURN;
}
else if ( keyname == wxT("PGUP") ) {
- keycode = WXK_PRIOR;
+ keycode = WXK_PAGEUP;
}
else if ( keyname == wxT("PGDN") ) {
- keycode = WXK_NEXT;
+ keycode = WXK_PAGEDOWN;
}
else if ( keyname == wxT("LEFT") ) {
keycode = WXK_LEFT;
@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco
case WXK_RETURN:
text += wxT("return");
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
text += wxT("pageup");
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
text += wxT("pagedown");
break;
case WXK_LEFT:
Index: sooperlooper/src/gui/check_box.cpp
===================================================================
--- sooperlooper.orig/src/gui/check_box.cpp
+++ sooperlooper/src/gui/check_box.cpp
@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e
}
else if (ev.LeftUp())
{
- if (bounds.Inside(ev.GetPosition())) {
+ if (bounds.Contains(ev.GetPosition())) {
// toggle value
_value = !_value;
Index: sooperlooper/src/gui/midi_bind_panel.cpp
===================================================================
--- sooperlooper.orig/src/gui/midi_bind_panel.cpp
+++ sooperlooper/src/gui/midi_bind_panel.cpp
@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand
}
else if (ev.GetId() == ID_LoadButton)
{
- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
if ( !filename.empty() )
{
_parent->get_loop_control().load_midi_bindings(filename, _append_check->GetValue());
@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand
}
else if (ev.GetId() == ID_SaveButton)
{
- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
if ( !filename.empty() )
{
Index: sooperlooper/src/gui/config_panel.cpp
===================================================================
--- sooperlooper.orig/src/gui/config_panel.cpp
+++ sooperlooper/src/gui/config_panel.cpp
@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv
else if (ev.GetId() == ID_MidiBrowseButton) {
_parent->get_keyboard().set_enabled(false);
- wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
_parent->get_keyboard().set_enabled(true);
if ( !filename.empty() )
@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv
else if (ev.GetId() == ID_SessionBrowseButton) {
_parent->get_keyboard().set_enabled(false);
- wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
- //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
+ wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ //wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
_parent->get_keyboard().set_enabled(true);
if ( !filename.empty() )

158
gnu/packages/patches/spice-CVE-2017-7506.patch Normal file
View file

@ -0,0 +1,158 @@
Fix CVE-2017-7506:
https://bugzilla.redhat.com/show_bug.cgi?id=1452606
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7506
Patches copied from Debian spice package version
'spice_0.12.8-2.1+deb9u1.debian.tar.xz':
http://security.debian.org/debian-security/pool/updates/main/s/spice/spice_0.12.8-2.1+deb9u1.debian.tar.xz
The patches had to be adapted to apply to the latest spice tarball, and
are based on these upstream commits:
https://cgit.freedesktop.org/spice/spice/commit/?id=111ab38611cef5012f1565a65fa2d8a8a05cce37
https://cgit.freedesktop.org/spice/spice/commit/?id=571cec91e71c2aae0d5f439ea2d8439d0c3d75eb
https://cgit.freedesktop.org/spice/spice/commit/?id=fbbcdad773e2791cfb988f4748faa41943551ca6
From 257f69d619fed407493156c8a7b952abc8a51314 Mon Sep 17 00:00:00 2001
Date: Mon, 15 May 2017 15:57:28 +0100
Subject: [spice-server 1/3] reds: Disconnect when receiving overly big
ClientMonitorsConfig
Total message size received from the client was unlimited. There is
a 2kiB size check on individual agent messages, but the MonitorsConfig
message can be split in multiple chunks, and the size of the
non-chunked MonitorsConfig message was never checked. This could easily
lead to memory exhaustion on the host.
---
server/reds.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/server/reds.c b/server/reds.c
index f439a3668..7be85fdfc 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -993,19 +993,34 @@ static void reds_client_monitors_config_cleanup(void)
static void reds_on_main_agent_monitors_config(
MainChannelClient *mcc, void *message, size_t size)
{
+ const unsigned int MAX_MONITORS = 256;
+ const unsigned int MAX_MONITOR_CONFIG_SIZE =
+ sizeof(VDAgentMonitorsConfig) + MAX_MONITORS * sizeof(VDAgentMonConfig);
+
VDAgentMessage *msg_header;
VDAgentMonitorsConfig *monitors_config;
RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
+ // limit size of message sent by the client as this can cause a DoS through
+ // memory exhaustion, or potentially some integer overflows
+ if (sizeof(VDAgentMessage) + MAX_MONITOR_CONFIG_SIZE - cmc->buffer_size < size) {
+ goto overflow;
+ }
cmc->buffer_size += size;
cmc->buffer = realloc(cmc->buffer, cmc->buffer_size);
spice_assert(cmc->buffer);
cmc->mcc = mcc;
memcpy(cmc->buffer + cmc->buffer_pos, message, size);
cmc->buffer_pos += size;
+ if (sizeof(VDAgentMessage) > cmc->buffer_size) {
+ spice_debug("not enough data yet. %d", cmc->buffer_size);
+ return;
+ }
msg_header = (VDAgentMessage *)cmc->buffer;
- if (sizeof(VDAgentMessage) > cmc->buffer_size ||
- msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) {
+ if (msg_header->size > MAX_MONITOR_CONFIG_SIZE) {
+ goto overflow;
+ }
+ if (msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) {
spice_debug("not enough data yet. %d", cmc->buffer_size);
return;
}
@@ -1013,6 +1028,12 @@ static void reds_on_main_agent_monitors_config(
spice_debug("%s: %d", __func__, monitors_config->num_of_monitors);
red_dispatcher_client_monitors_config(monitors_config);
reds_client_monitors_config_cleanup();
+ return;
+
+overflow:
+ spice_warning("received invalid MonitorsConfig request from client, disconnecting");
+ red_channel_client_disconnect(main_channel_client_get_base(mcc));
+ reds_client_monitors_config_cleanup();
}
void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size)
--
2.13.0
From ff2b4ef70181087d5abd50bad76d026ec5088a93 Mon Sep 17 00:00:00 2001
Date: Mon, 15 May 2017 15:57:28 +0100
Subject: [spice-server 2/3] reds: Avoid integer overflows handling monitor
configuration
Avoid VDAgentMessage::size integer overflows.
---
server/reds.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/server/reds.c b/server/reds.c
index 7be85fdfc..e1c8c1086 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1024,6 +1024,9 @@ static void reds_on_main_agent_monitors_config(
spice_debug("not enough data yet. %d", cmc->buffer_size);
return;
}
+ if (msg_header->size < sizeof(VDAgentMonitorsConfig)) {
+ goto overflow;
+ }
monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header));
spice_debug("%s: %d", __func__, monitors_config->num_of_monitors);
red_dispatcher_client_monitors_config(monitors_config);
--
2.13.0
From 8cc3d7df2792751939cc832f4110c57e2addfca5 Mon Sep 17 00:00:00 2001
Date: Mon, 15 May 2017 15:57:28 +0100
Subject: [spice-server 3/3] reds: Avoid buffer overflows handling monitor
configuration
It was also possible for a malicious client to set
VDAgentMonitorsConfig::num_of_monitors to a number larger
than the actual size of VDAgentMOnitorsConfig::monitors.
This would lead to buffer overflows, which could allow the guest to
read part of the host memory. This might cause write overflows in the
host as well, but controlling the content of such buffers seems
complicated.
---
server/reds.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/server/reds.c b/server/reds.c
index e1c8c1086..3a42c3755 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1000,6 +1000,7 @@ static void reds_on_main_agent_monitors_config(
VDAgentMessage *msg_header;
VDAgentMonitorsConfig *monitors_config;
RedsClientMonitorsConfig *cmc = &reds->client_monitors_config;
+ uint32_t max_monitors;
// limit size of message sent by the client as this can cause a DoS through
// memory exhaustion, or potentially some integer overflows
@@ -1028,6 +1029,12 @@ static void reds_on_main_agent_monitors_config(
goto overflow;
}
monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header));
+ // limit the monitor number to avoid buffer overflows
+ max_monitors = (msg_header->size - sizeof(VDAgentMonitorsConfig)) /
+ sizeof(VDAgentMonConfig);
+ if (monitors_config->num_of_monitors > max_monitors) {
+ goto overflow;
+ }
spice_debug("%s: %d", __func__, monitors_config->num_of_monitors);
red_dispatcher_client_monitors_config(monitors_config);
reds_client_monitors_config_cleanup();
--
2.13.0

42
gnu/packages/patches/supertuxkart-angelscript-ftbfs.patch Normal file
View file

@ -0,0 +1,42 @@
https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341.patch
From 5e05f1178ce6bc5f3a653b55ab3dc6d016196341 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 3 Oct 2016 23:26:09 +0200
Subject: [PATCH] Fixed compiler error on Linux with non-x86 64bit platforms,
e.g. arm64, mips, and s390x architectures
This modification is already applied in upstream angelscript repository:
https://sourceforge.net/p/angelscript/code/2353/
Thanks to Adrian Bunk and Andreas Jonsson
---
lib/angelscript/projects/cmake/CMakeLists.txt | 1 +
lib/angelscript/source/as_config.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/angelscript/projects/cmake/CMakeLists.txt b/lib/angelscript/projects/cmake/CMakeLists.txt
index e93971315e..755d8378c3 100644
--- a/lib/angelscript/projects/cmake/CMakeLists.txt
+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
@@ -67,6 +67,7 @@ set(ANGELSCRIPT_SOURCE
../../source/as_builder.cpp
../../source/as_bytecode.cpp
../../source/as_callfunc.cpp
+ ../../source/as_callfunc_mips.cpp
../../source/as_callfunc_x86.cpp
../../source/as_callfunc_x64_gcc.cpp
../../source/as_callfunc_x64_msvc.cpp
diff --git a/lib/angelscript/source/as_config.h b/lib/angelscript/source/as_config.h
index cb05bffbd5..5bb5b8e800 100644
--- a/lib/angelscript/source/as_config.h
+++ b/lib/angelscript/source/as_config.h
@@ -844,7 +844,7 @@
#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
#define AS_X86
#undef AS_NO_THISCALL_FUNCTOR_METHOD
- #elif defined(__LP64__) && !defined(__arm64__)
+ #elif defined(__x86_64__)
#define AS_X64_GCC
#undef AS_NO_THISCALL_FUNCTOR_METHOD
#define HAS_128_BIT_PRIMITIVES

16
gnu/packages/pcre.scm
View file

@ -34,6 +34,7 @@ (define-public pcre
(package
(name "pcre")
(version "8.40")
(replacement pcre-8.41)
(source (origin
(method url-fetch)
(uri (list
@ -72,6 +73,21 @@ (define-public pcre
(license license:bsd-3)
(home-page "http://www.pcre.org/")))
(define pcre-8.41
(package
(inherit pcre)
(version "8.41")
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/pcre/pcre/"
version "/pcre-" version ".tar.bz2")
(string-append "ftp://ftp.csx.cam.ac.uk"
"/pub/software/programming/pcre/"
"pcre-" version ".tar.bz2")))
(sha256
(base32
"0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"))))))
(define-public pcre2
(package
(name "pcre2")

2
gnu/packages/photo.scm
View file

@ -255,7 +255,7 @@ (define-public enblend-enfuse
("help2man" ,help2man)
("imagemagick" ,imagemagick)
("libxml2" ,libxml2)
("texlive-minimal" ,texlive-minimal)
("texlive-minimal" ,texlive-tiny)
("tidy" ,tidy)
("transfig" ,transfig)))
(inputs

402
gnu/packages/python.scm
View file

@ -43,6 +43,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -100,6 +101,7 @@ (define-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages search)
#:use-module (gnu packages shells)
#:use-module (gnu packages ssh)
#:use-module (gnu packages statistics)
@ -655,26 +657,50 @@ (define-public python2-ccm
(define-public python-pytz
(package
(name "python-pytz")
(version "2016.10")
(version "2017.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytz" version ".tar.bz2"))
(uri (pypi-uri "pytz" version ".zip"))
(sha256
(base32
"0az099cyp6p5xbsvfcdacj4hvxncbwm2ayn3h55mcp07zb2b45kh"))))
"12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m"))))
(build-system python-build-system)
(arguments `(#:tests? #f)) ; no test target
(native-inputs
`(("unzip" ,unzip)))
(home-page "http://pythonhosted.org/pytz")
(synopsis "Python timezone library")
(description
"This library allows accurate and cross platform timezone calculations
using Python 2.4 or higher and provides access to the Olson timezone database.")
(description "This library brings the Olson tz database into Python. It
allows accurate and cross platform timezone calculations using Python 2.4 or
higher. It also solves the issue of ambiguous times at the end of daylight
saving time. Almost all of the Olson timezones are supported.")
(license license:expat)))
(define-public python2-pytz
(package-with-python2 python-pytz))
(define-public python-clyent
(package
(name "python-clyent")
(version "1.2.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "clyent" version))
(sha256
(base32
"1r9987qmy1pz3hq54160bapqsywpq14waw4w9x3ly8hmq7kpgfbj"))))
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)))
(home-page "https://github.com/binstar/clyent")
(synopsis "Command line client library")
(description "Clyent is a Python command line utiliy library. It is used
by @code{binstar}, @code{binstar-build} and @code{chalmers}.")
(license license:bsd-3)))
(define-public python2-clyent
(package-with-python2 python-clyent))
(define-public python-babel
(package
@ -2715,6 +2741,46 @@ (define-public python2-jsonschema
(propagated-inputs
`(("python2-functools32" ,python2-functools32))))))
(define-public python-schema
(package
(name "python-schema")
(version "0.6.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "schema" version))
(sha256
(base32
"1lw28j9w9vxyigg7vkfkvi6ic9lgjkdnfvnxdr7pklslqvzmk2vm"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page "https://github.com/keleshev/schema")
(synopsis "Simple data validation library")
(description
"@code{python-schema} is a library for validating Python data
structures, such as those obtained from config-files, forms, external
services or command-line parsing, converted from JSON/YAML (or
something else) to Python data-types.")
(license license:psfl)))
(define-public python2-schema
(package-with-python2 python-schema))
(define-public python-schema-0.5
(package (inherit python-schema)
(version "0.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "schema" version))
(sha256
(base32
"10zqvpaky51kgb8nd42bk7jwl8cn2zvayxjpdc1wwmpybj92x67s"))))))
(define-public python2-schema-0.5
(package-with-python2 python-schema-0.5))
(define-public python-kitchen
(package
(name "python-kitchen")
@ -3125,6 +3191,36 @@ (define-public python-pygments
(define-public python2-pygments
(package-with-python2 python-pygments))
(define-public python-sphinxcontrib-websupport
(package
(name "python-sphinxcontrib-websupport")
(version "1.0.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "sphinxcontrib-websupport" version))
(sha256
(base32
"1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs"))))
(build-system python-build-system)
(propagated-inputs
`(("python-mock" ,python-mock)
("python-pytest" ,python-pytest)
("python-xapian-bindings" ,python-xapian-bindings)))
;; Needed for running the test suite
(native-inputs
`(("python-six" ,python-six)
("python-jinja2" ,python-jinja2)
("python-docutils" ,python-docutils)
("python-sphinx" ,python-sphinx)
("python-sqlalchemy" ,python-sqlalchemy)
("python-whoosh" ,python-whoosh)))
(home-page "http://sphinx-doc.org/")
(synopsis "Sphinx API for web applications")
(description "This package provides a Python API to easily integrate
Sphinx documentation into your web application. It provides tools to
integrate Sphinx documents in web templates and to handle searches.")
(license license:bsd-3)))
(define-public python-sphinx
(package
(name "python-sphinx")
@ -3169,6 +3265,36 @@ (define-public python-sphinx
(license license:bsd-3)
(properties `((python2-variant . ,(delay python2-sphinx))))))
(define-public python-sphinx-1.6
(package (inherit python-sphinx)
(name "python-sphinx")
(version "1.6.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
"1rj6f3i8hmrx2qlkshi5kp5xcy98dlynwlyl05yvflj5f66dp2xg"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
;; Requires Internet access.
(delete-file "tests/test_build_linkcheck.py")
(substitute* "tests/test_build_latex.py"
(("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
"@pytest.mark.skip()"))
(zero? (system* "make" "test")))))))
(propagated-inputs
`(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)
,@(package-propagated-inputs python-sphinx)))
(native-inputs
`(("python-pytest" ,python-pytest-3.0)
("imagemagick" ,imagemagick) ; for "convert"
,@(package-native-inputs python-sphinx)))
(properties '())))
(define-public python-sphinx-1.5.3
(package
(inherit python-sphinx)
@ -3684,7 +3810,39 @@ (define-public python-numpy-documentation
("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc)
("texlive" ,texlive)
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-fonts-ec
texlive-generic-ifxetex
texlive-generic-pdftex
texlive-latex-amsfonts
texlive-latex-capt-of
texlive-latex-cmap
texlive-latex-environ
texlive-latex-eqparbox
texlive-latex-etoolbox
texlive-latex-expdlist
texlive-latex-fancyhdr
texlive-latex-fancyvrb
texlive-latex-fncychap
texlive-latex-float
texlive-latex-framed
texlive-latex-geometry
texlive-latex-graphics
texlive-latex-hyperref
texlive-latex-mdwtools
texlive-latex-multirow
texlive-latex-oberdiek
texlive-latex-parskip
texlive-latex-preview
texlive-latex-tabulary
texlive-latex-threeparttable
texlive-latex-titlesec
texlive-latex-trimspaces
texlive-latex-ucs
texlive-latex-upquote
texlive-latex-url
texlive-latex-varwidth
texlive-latex-wrapfig)))
("texinfo" ,texinfo)
("perl" ,perl)
("scipy-sphinx-theme"
@ -3713,6 +3871,11 @@ (define-public python-numpy-documentation
(scipy-sphinx-theme "scipy-sphinx-theme")
(sphinx-theme-checkout (assoc-ref inputs scipy-sphinx-theme))
(pyver ,(string-append "PYVER=")))
;; FIXME: this is needed to for texlive-union to generate
;; fonts, which are not found.
(setenv "HOME" "/tmp")
(with-directory-excursion "doc"
(copy-recursively sphinx-theme-checkout scipy-sphinx-theme)
(mkdir-p html)
@ -4480,6 +4643,35 @@ (define-public python-furl
(define-public python2-furl
(package-with-python2 python-furl))
(define-public python-flaky
(package
(name "python-flaky")
(version "3.4.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "flaky" version))
(sha256
(base32
"18pkmf79rfkfpy1d2rrx3v55nxj762ilyk9rvd6s6dccxw58imsa"))))
(build-system python-build-system)
(arguments
;; TODO: Tests require 'coveralls' and 'genty' which are not in Guix yet.
'(#:tests? #f))
(home-page "https://github.com/box/flaky")
(synopsis "Automatically rerun flaky tests")
(description
"Flaky is a plugin for @code{nose} or @code{py.test} that automatically
reruns flaky tests.
Ideally, tests reliably pass or fail, but sometimes test fixtures must rely
on components that aren't 100% reliable. With flaky, instead of removing
those tests or marking them to @code{@skip}, they can be automatically
retried.")
(license license:asl2.0)))
(define-public python2-flaky
(package-with-python2 python-flaky))
(define-public python-flask-babel
(package
(name "python-flask-babel")
@ -5429,7 +5621,40 @@ (define-public python-ipython
("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
("python-shpinx-rtd-theme" ,python-sphinx-rtd-theme)
("texlive" ,texlive)
;; FIXME: It's possible that a smaller union would work just as well.
("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-fonts-ec
texlive-generic-ifxetex
texlive-generic-pdftex
texlive-latex-amsfonts
texlive-latex-capt-of
texlive-latex-cmap
texlive-latex-environ
texlive-latex-eqparbox
texlive-latex-etoolbox
texlive-latex-expdlist
texlive-latex-fancyhdr
texlive-latex-fancyvrb
texlive-latex-fncychap
texlive-latex-float
texlive-latex-framed
texlive-latex-geometry
texlive-latex-graphics
texlive-latex-hyperref
texlive-latex-mdwtools
texlive-latex-multirow
texlive-latex-oberdiek
texlive-latex-parskip
texlive-latex-preview
texlive-latex-tabulary
texlive-latex-threeparttable
texlive-latex-titlesec
texlive-latex-trimspaces
texlive-latex-ucs
texlive-latex-upquote
texlive-latex-url
texlive-latex-varwidth
texlive-latex-wrapfig)))
("texinfo" ,texinfo)))
(arguments
`(#:phases
@ -6049,13 +6274,13 @@ (define-public python2-networkx
(define-public snakemake
(package
(name "snakemake")
(version "3.11.2")
(version "3.13.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "snakemake" version))
(sha256
(base32 "0qcp7y9csvanyzh08jppryhd5di8r1z7p0d4wkfg5591pj3bb8zp"))))
(base32 "1nixb944r4hlskwkzc4wjs34b40xpxpw9gmhhm5p09gvmm22ap5d"))))
(build-system python-build-system)
(arguments
;; TODO: Package missing test dependencies.
@ -6337,6 +6562,31 @@ (define-public python-backports-abc
(define-public python2-backports-abc
(package-with-python2 python-backports-abc))
(define-public python-backports-csv
(package
(name "python-backports-csv")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "backports.csv" version))
(sha256
(base32
"1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc"))))
(build-system python-build-system)
(home-page "https://github.com/ryanhiebert/backports.csv")
(synopsis "Backport of Python 3's csv module for Python 2")
(description
"Provides a backport of Python 3's @code{csv} module for parsing
comma separated values. The API of the @code{csv} module in Python 2
is drastically different from the @code{csv} module in Python 3.
This is due, for the most part, to the difference between str in
Python 2 and Python 3.")
(license license:psfl)))
(define-public python2-backports-csv
(package-with-python2 python-backports-csv))
(define-public python2-backports-shutil-get-terminal-size
(package
(name "python2-backports-shutil-get-terminal-size")
@ -7392,14 +7642,14 @@ (define-public python2-pretend
(define-public python-cryptography-vectors
(package
(name "python-cryptography-vectors")
(version "1.9")
(version "2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
"1wvq1p1viam1diz9x6d61x1bsy6cninv7cjgd35x9ffig9r6gxxv"))))
"0qadys01517k5wy0rifxip02p08kzrqxm5j0lmmlp0kr07h9jc7h"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
@ -7414,14 +7664,14 @@ (define-public python2-cryptography-vectors
(define-public python-cryptography
(package
(name "python-cryptography")
(version "1.9")
(version "2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
"10j8r1s29f4h59kp3mla14g588rm7qpn90nrczijk03i49q3662m"))))
"1c40qlxyn1jgg99f3pqi7146d3561rn9zdqc7w8f7kwr9ysm696k"))))
(build-system python-build-system)
(inputs
`(("openssl" ,openssl)))
@ -7463,16 +7713,14 @@ (define-public python2-cryptography
(define-public python-pyopenssl
(package
(name "python-pyopenssl")
(version "17.1.0")
(version "17.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyOpenSSL" version))
(patches
(search-patches "python-pyopenssl-17.1.0-test-overflow.patch"))
(sha256
(base32
"0qwmqhfsq84ydir9dz273ypmlcvs7v71m1jns0sd4k0h6lfsa82s"))))
"0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -7496,7 +7744,8 @@ (define-public python-pyopenssl
(inputs
`(("openssl" ,openssl)))
(native-inputs
`(("python-pretend" ,python-pretend)
`(("python-flaky" ,python-flaky)
("python-pretend" ,python-pretend)
("python-pytest" ,python-pytest-3.0)))
(home-page "https://github.com/pyca/pyopenssl")
(synopsis "Python wrapper module around the OpenSSL library")
@ -11641,53 +11890,6 @@ (define-public python2-faker
`(("python2-ipaddress" ,python2-ipaddress)
,@(package-propagated-inputs base))))))
(define-public python-fake-factory
(package
(name "python-fake-factory")
(version "0.7.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "fake-factory" version))
(sha256
(base32
"0vs0dkmg0dlaxf8w6q2i3k0i03gmp56ablldv7ci9x3nbadkn71g"))
(patches
(search-patches
"python-fake-factory-fix-build-32bit.patch"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "python" "-m" "unittest" "-v" "faker.tests")))))))
(native-inputs
`(;; For testing
("python-email-validator" ,python-email-validator)
("python-mock" ,python-mock)
("python-ukpostcodeparser" ,python-ukpostcodeparser)))
(propagated-inputs
`(("python-dateutil" ,python-dateutil)
("python-six" ,python-six)))
(home-page "https://github.com/joke2k/faker")
(synopsis "Python package that generates fake data")
(description
"Faker is a Python package that generates fake data such as names,
addresses, and phone numbers.")
(license license:expat)
(properties `((python2-variant . ,(delay python2-fake-factory))
(superseded . ,python-faker)))))
(define-public python2-fake-factory
(let ((base (package-with-python2 (strip-python2-variant
python-fake-factory))))
(package
(inherit base)
(properties `((superseded . ,python2-faker)))
(propagated-inputs
`(("python2-ipaddress" ,python2-ipaddress)
,@(package-propagated-inputs base))))))
(define-public python-pyaml
(package
(name "python-pyaml")
@ -14297,6 +14499,29 @@ (define-public python-pytest-warnings
(define-public python2-pytest-warnings
(package-with-python2 python-pytest-warnings))
(define-public python-pytest-capturelog
(package
(name "python-pytest-capturelog")
(version "0.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-capturelog" version ".tar.gz"))
(sha256
(base32
"038049nyjl7di59ycnxvc9nydivc5m8np3hqq84j2iirkccdbs5n"))))
(build-system python-build-system)
(propagated-inputs
`(("pytest" ,python-pytest-3.0)))
(home-page "http://bitbucket.org/memedough/pytest-capturelog/overview")
(synopsis "Pytest plugin to catch log messages")
(description
"Python-pytest-catchlog is a pytest plugin to catch log messages.")
(license license:expat)))
(define-public python2-pytest-capturelog
(package-with-python2 python-pytest-capturelog))
(define-public python-pytest-catchlog
(package
(name "python-pytest-catchlog")
@ -15173,6 +15398,49 @@ (define-public python-jsonpointer
(define-public python2-jsonpointer
(package-with-python2 python-jsonpointer))
(define-public python-jsonpatch
(package
(name "python-jsonpatch")
(version "1.16")
(source
(origin
(method url-fetch)
;; pypi version lacks tests.js
(uri (string-append "https://github.com/stefankoegl/python-json-patch/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"085ykisl8v7mv9h7hvhdy3l2fjzs4214gx32r5k6nx4f76hbv6y5"))))
(build-system python-build-system)
(native-inputs
`(("python-jsonpointer" ,python-jsonpointer)))
(home-page "https://github.com/stefankoegl/python-json-patch")
(synopsis "Applying JSON Patches in Python 2.6+ and 3.x")
(description "@code{jsonpatch} is a library and program that allows
applying JSON Patches according to RFC 6902.")
(license license:bsd-3)))
(define-public python2-jsonpatch
(package-with-python2 python-jsonpatch))
(define-public python-jsonpatch-0.4
(package (inherit python-jsonpatch)
(name "python-jsonpatch")
(version "0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/stefankoegl/python-json-patch/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0j0cd9z9zyp8kppp464jxrfgrnbgkzl1yi10i5gsv8yz6d95929d"))))))
(define-public python2-jsonpatch-0.4
(package-with-python2 python-jsonpatch-0.4))
(define-public python-rfc3987
(package
(name "python-rfc3987")

106
gnu/packages/qt.scm
View file

@ -5,6 +5,8 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Quiliro <quiliro@fsfla.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,6 +30,7 @@ (define-module (gnu packages qt)
#:use-module (guix build utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
@ -1374,6 +1377,109 @@ (define-public python2-pyqt-4
(inputs
`(("python" ,python-2)))))
(define-public qscintilla
(package
(name "qscintilla")
(version "2.10.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pyqt/QScintilla2/"
"QScintilla-" version "/QScintilla_gpl-"
version ".tar.gz"))
(sha256
(base32
"0r7s7ndblv3jc0xig1y4l64b6mfr879cdv3zwdndn27rj6fqmycp"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(chdir "Qt4Qt5")
(substitute* "qscintilla.pro"
(("\\$\\$\\[QT_INSTALL_LIBS\\]")
(string-append out "/lib"))
(("\\$\\$\\[QT_INSTALL_HEADERS\\]")
(string-append out "/include"))
(("\\$\\$\\[QT_INSTALL_TRANSLATIONS\\]")
(string-append out "/translations"))
(("\\$\\$\\[QT_INSTALL_DATA\\]") out)
(("\\$\\$\\[QT_HOST_DATA\\]") out))
(zero? (system* "qmake"))))))))
(native-inputs `(("qtbase" ,qtbase)))
(home-page "http://www.riverbankcomputing.co.uk/software/qscintilla/intro")
(synopsis "Qt port of the Scintilla C++ editor control")
(description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
editor control. QScintilla includes features especially useful when editing
and debugging source code. These include support for syntax styling, error
indicators, code completion and call tips.")
(license license:gpl3+)))
(define-public python-qscintilla
(package (inherit qscintilla)
(name "python-qscintilla")
(arguments
`(#:configure-flags
(list "--pyqt=PyQt5"
(string-append "--pyqt-sipdir="
(assoc-ref %build-inputs "python-pyqt")
"/share/sip")
(string-append "--qsci-incdir="
(assoc-ref %build-inputs "qscintilla")
"/include")
(string-append "--qsci-libdir="
(assoc-ref %build-inputs "qscintilla")
"/lib"))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs configure-flags #:allow-other-keys)
(chdir "Python")
(and (zero? (apply system* "python3" "configure.py"
configure-flags))
;; Install to the right directory
(begin
(substitute* '("Makefile"
"Qsci/Makefile")
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+")
(assoc-ref outputs "out")))
#t)))))))
(inputs
`(("qscintilla" ,qscintilla)
("python" ,python)
("python-pyqt" ,python-pyqt)))
(description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
editor control. QScintilla includes features especially useful when editing
and debugging source code. These include support for syntax styling, error
indicators, code completion and call tips.
This package provides the Python bindings.")))
;; PyQt only looks for modules in its own directory. It ignores environment
;; variables such as PYTHONPATH, so we need to build a union package to make
;; it work.
(define-public python-pyqt+qscintilla
(package (inherit python-pyqt)
(name "python-pyqt+qscintilla")
(source #f)
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build union))
#:builder (begin
(use-modules (ice-9 match)
(guix build union))
(match %build-inputs
(((names . directories) ...)
(union-build (assoc-ref %outputs "out")
directories))))))
(inputs
`(("python-pyqt" ,python-pyqt)
("python-qscintilla" ,python-qscintilla)))
(synopsis "Union of PyQt and the Qscintilla extension")
(description
"This package contains the union of PyQt and the Qscintilla extension.")))
(define-public qtkeychain
(package
(name "qtkeychain")

4
gnu/packages/samba.scm
View file

@ -147,14 +147,14 @@ (define (copy dir)
(define-public samba
(package
(name "samba")
(version "4.6.4")
(version "4.6.6")
(source (origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/"
"samba-" version ".tar.gz"))
(sha256
(base32
"0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija"))))
"13hs7xplygbl5dgwnn3l0hkbc0a282wdrkbx5c7y6nnqyw4whcgw"))))
(build-system gnu-build-system)
(arguments
'(#:phases

93
gnu/packages/scheme.scm
View file

@ -35,10 +35,14 @@ (define-module (gnu packages scheme)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages m4)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
#:use-module (gnu packages databases)
#:use-module (gnu packages emacs)
#:use-module (gnu packages ghostscript)
@ -195,47 +199,35 @@ (define-public mit-scheme
(define-public bigloo
(package
(name "bigloo")
(version "4.1a")
(version "4.3a")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo"
version ".tar.gz"))
(sha256
(base32
"170q7nh08n4v20xl81fxb0xcdxphqqacfa643hsa8i2ar6pki04c"))
(patches (search-patches "bigloo-gc-shebangs.patch"))))
"03rcqs6kvy2j5lqk4fidqay5qfyp474qqspbh6wk4qdbds6w599w"))
;; Remove bundled libraries.
(modules '((guix build utils)))
(snippet
'(for-each delete-file-recursively
'("gc" "gmp" "libuv")))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "configure"
(("^shell=.*$")
(string-append "shell=" (which "bash") "\n")))
;; Since libgc's pthread redirects are used, we end up
;; using libgc symbols, so we must link against it.
;; Reported on 2013-06-25.
(substitute* "api/pthread/src/Makefile"
(("^EXTRALIBS[[:blank:]]*=(.*)$" _ value)
(string-append "EXTRALIBS = "
(string-trim-right value)
" -l$(GCLIB)_fth-$(RELEASE)"
" -Wl,-rpath=" (assoc-ref outputs "out")
"/lib/bigloo/" ,version)))
;; Those variables are used by libgc's `configure'.
(setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh"))
;; ... but they turned out to be overridden later, so work
;; around that.
(substitute* (find-files "gc" "^configure-gc")
(("sh=/bin/sh")
(string-append "sh=" (which "sh"))))
(string-append "shell=" (which "bash") "\n"))
(("`date`") "0"))
(substitute* "autoconf/runtest.in"
((", @DATE@") ""))
(substitute* "autoconf/osversion"
(("^version.*$") "version=\"\"\n"))
;; The `configure' script doesn't understand options
;; of those of Autoconf.
@ -243,28 +235,39 @@ (define-public bigloo
(zero?
(system* "./configure"
(string-append "--prefix=" out)
;; FIXME: Currently fails, see
;; <http://article.gmane.org/gmane.lisp.scheme.bigloo/6126>.
;; "--customgc=no" ; use our libgc
; use system libraries
"--customgc=no"
"--customunistring=no"
"--customlibuv=no"
(string-append"--mv=" (which "mv"))
(string-append "--rm=" (which "rm"))
"--cflags=-fPIC"
(string-append "--ldflags=-Wl,-rpath="
(assoc-ref outputs "out")
"/lib/bigloo/" ,version))))))
"/lib/bigloo/" ,version)
(string-append "--lispdir=" out
"/share/emacs/site-lisp")
"--sharedbde=yes"
"--sharedcompiler=yes")))))
(add-after 'install 'install-emacs-modes
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dir (string-append out "/share/emacs/site-lisp")))
(zero? (system* "make" "-C" "bmacs" "all" "install"
(string-append "EMACSBRAND=emacs24")
(string-append "EMACSBRAND=emacs25")
(string-append "EMACSDIR=" dir)))))))))
(inputs
`(("emacs" ,emacs) ;UDE needs the X version of Emacs
("libgc" ,libgc)
("libunistring" ,libunistring)
("libuv" ,libuv)
("openssl" ,openssl)
("sqlite" ,sqlite)
;; Optional APIs for which Bigloo has bindings.
("avahi" ,avahi)
("libphidget" ,libphidget)))
("libphidget" ,libphidget)
("pcre" ,pcre)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
@ -285,21 +288,23 @@ (define-public bigloo
(define-public hop
(package
(name "hop")
(version "2.5.1")
(version "3.1.0-pre2")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-"
version ".tar.gz"))
(sha256
(base32
"1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"))
(patches (search-patches "hop-linker-flags.patch"))))
"09m7pahjsp7wxzd20cdph9j3mgf2nq5dyckcjljcd40m25v85kks"))))
(build-system gnu-build-system)
(arguments
`(#:phases
`(#:test-target "test"
#:make-flags '("BIGLOO=bigloo")
#:parallel-build? #f
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(zero?
(system* "./configure"
@ -307,11 +312,16 @@ (define-public hop
(string-append "--blflags="
;; user flags completely override useful
;; default flags, so repeat them here.
"-copt \\$(CPICFLAGS) -L\\$(BUILDLIBDIR) "
"-ldopt -Wl,-rpath," out "/lib")))))))
#:tests? #f)) ; no test suite
"-copt \\$(CPICFLAGS) "
"-L \\$(BUILDLIBDIR) "
"-ldopt -Wl,-rpath," out "/lib")))))))))
(inputs `(("avahi" ,avahi)
("bigloo" ,bigloo)
("libgc" ,libgc)
("libunistring" ,libunistring)
("libuv" ,libuv)
("pcre" ,pcre)
("sqlite" ,sqlite)
("which" ,which)))
(home-page "http://hop.inria.fr/")
(synopsis "Multi-tier programming language for the Web 2.0")
@ -335,7 +345,8 @@ (define-public chicken
(base32
"12b9gaa9lqh39lj1v4wm48f6z8ww3jdkvc5bh9gqqvn6kd2wwnk0"))
(patches
(search-patches "chicken-CVE-2017-6949.patch"))))
(search-patches "chicken-CVE-2017-6949.patch"
"chicken-CVE-2017-11343.patch"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)

4
gnu/packages/screen.scm
View file

@ -37,13 +37,13 @@ (define-module (gnu packages screen)
(define-public screen
(package
(name "screen")
(version "4.6.0")
(version "4.6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/screen/screen-"
version ".tar.gz"))
(sha256
(base32 "1m7yd2bs1i623kk27nfy3qa2mgjp5qjqxwj5qz21r51ycmmp0cwl"))))
(base32 "0r3wpfxnr5kw73b8ndja26jk03nfbks06iyfmgb5aqb2rdkazadb"))))
(build-system gnu-build-system)
(native-inputs
`(("makeinfo" ,texinfo)))

28
gnu/packages/search.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,6 +31,7 @@ (define-module (gnu packages search)
#:use-module (gnu packages databases)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
@ -70,6 +72,32 @@ (define-public xapian
(home-page "https://xapian.org/")
(license (list gpl2+ bsd-3 x11))))
(define-public python-xapian-bindings
(package (inherit xapian)
(name "python-xapian-bindings")
(version (package-version xapian))
(source (origin
(method url-fetch)
(uri (string-append "https://oligarchy.co.uk/xapian/" version
"/xapian-bindings-" version ".tar.xz"))
(sha256
(base32
"0fca9nsf7pj3fq991xcm5iainz3s8yqik4ycvavm09y486n3wciv"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-python3")
#:make-flags
(list (string-append "pkgpylibdir="
(assoc-ref %outputs "out")
"/lib/python3.5/site-packages/xapian"))))
(inputs
`(("python" ,python)
("python-sphinx" ,python-sphinx) ; for documentation
("xapian" ,xapian)
("zlib" ,zlib)))
(synopsis "Python bindings for the Xapian search engine library")
(license gpl2+)))
(define-public libtocc
(package
(name "libtocc")

34
gnu/packages/serialization.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,7 +39,8 @@ (define-module (gnu packages serialization)
#:use-module (gnu packages lua)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages perl))
#:use-module (gnu packages perl)
#:use-module (guix build-system python))
(define-public cereal
(package
@ -351,3 +353,33 @@ (define-public nlohmann-json-cpp
“Trivial integration”, and “Serious testing”.
However, “Memory efficiency” and “Speed” have not been primary goals.")
(license license:expat)))
(define-public python-ruamel.yaml
(package
(name "python-ruamel.yaml")
(version "0.15.19")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ruamel.yaml" version))
(sha256
(base32
"0qx779avw8d1vsjqyi7z21h1g5ykp8paqavgj0lzbp8h7bw9vpgv"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(arguments
`(;; TODO: Tests require packaging "ruamel.std.pathlib".
#:tests? #f))
(home-page "https://bitbucket.org/ruamel/yaml")
(synopsis "YAML 1.2 parser/emitter")
(description
"This package provides YAML parser/emitter that supports roundtrip
preservation of comments, seq/map flow style, and map key order. It
is a derivative of Kirill Simonov’s PyYAML 3.11. It supports YAML 1.2
and has round-trip loaders and dumpers. It supports comments. Block
style and key ordering are kept, so you can diff the source.")
(license license:expat)))
(define-public python2-ruamel.yaml
(package-with-python2 python-ruamel.yaml))

87
gnu/packages/shells.scm
View file

@ -6,8 +6,9 @@
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 ng0 <ng0@no-reply.infotropique.org>
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -54,17 +55,12 @@ (define-public dash
(version "0.5.9.1")
(source
(origin
;; The canonical source is offline, so we fetch the source code
;; from the Git repository. See:
;; https://www.mail-archive.com/dash@vger.kernel.org/msg01323.html
(method git-fetch)
(uri (git-reference
(url "https://git.kernel.org/pub/scm/utils/dash/dash.git/")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(method url-fetch)
(uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/"
"dash-" version ".tar.gz"))
(sha256
(base32
"0p01vx7rbyf5hyyaff7h8cbhq81bm5fmq1m933484lncl9rafcai"))
"0ng695mq5ngg43h7ljhxvbjm46ym3nayj6ssn47d2gm9fbm5pkay"))
(modules '((guix build utils)))
(snippet
'(begin
@ -75,17 +71,10 @@ (define-public dash
"a command interpreter based on the original Bourne shell"))
#t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
(inputs
`(("libedit" ,libedit)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vfi")))))
#:configure-flags '("--with-libedit")))
'(#:configure-flags '("--with-libedit")))
(home-page "http://gondor.apana.org.au/~herbert/dash")
(synopsis "POSIX-compliant shell optimised for size")
(description
@ -564,6 +553,29 @@ (define-public s-shell
A @code{andglob} program is also provided along with s.")
(license bsd-3))))
(define-public oksh
(package
(name "oksh")
(version "0.5.9")
(source
(origin
(method url-fetch)
(uri (string-append "https://connochaetos.org/oksh/oksh-"
version ".tar.gz"))
(sha256
(base32
"0ln9yf6pxngsviqszv8klnnvn8vcpplvj1njdn8xr2y8frkbw8r3"))))
(build-system gnu-build-system)
(arguments
`(; The test files are not part of the distributed tarball.
#:tests? #f))
(home-page "https://connochaetos.org/oksh")
(synopsis "Port of OpenBSD Korn Shell")
(description
"Oksh is a port of the OpenBSD Korn Shell.
The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
(license gpl3+)))
(define-public loksh
(package
(name "loksh")
@ -599,3 +611,42 @@ (define-public loksh
;; The file 'LEGAL' says it is the public domain, and the 2
;; exceptions which are listed are not included in this port.
(license public-domain)))
(define-public mksh
(package
(name "mksh")
(version "55")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R"
version ".tgz"))
(sha256
(base32
"0mssqd2wp3cs9x01v6g66iy3ymdxagbyw2c0v597vnc1l6s2rm6f"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; tests require access to /dev/tty
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(setenv "CC" "gcc")
(zero? (system* (which "sh") "Build.sh"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(man (string-append out "/share/man/man1")))
(install-file "mksh" bin)
(with-directory-excursion bin
(symlink "mksh" "ksh"))
(install-file "mksh.1" man)))))))
(home-page "https://www.mirbsd.org/mksh.htm")
(synopsis "Korn Shell from MirBSD")
(description "mksh is an actively developed free implementation of the
Korn Shell programming language and a successor to the Public Domain Korn
Shell (pdksh).")
(license (list miros
isc)))) ; strlcpy.c

72
gnu/packages/sml.scm Normal file
View file

@ -0,0 +1,72 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages sml)
#:use-module (gnu packages lesstif)
#:use-module (gnu packages libffi)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
(define-public polyml
(package
(name "polyml")
(version "5.7")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/polyml/polyml/archive/v"
version ".tar.gz"))
(sha256
(base32 "0ycjl746h0m22w9nsdssjl47d56jih12gpkdg3yw65gakj70sd0r"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system)
(inputs
`(("gmp" ,gmp)
("lesstif",lesstif)
("libffi" ,libffi)
("libx11" ,libx11)
("libxt" ,libxt)))
(arguments
'(#:configure-flags
(list "--with-system-libffi=yes"
"--with-x=yes"
"--with-threads=yes"
"--with-gmp=yes")
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-compiler
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(define flags
(if parallel-build?
(cons (format #f "-j~d" (parallel-job-count))
make-flags)
make-flags))
(apply system* "make" (append flags (list "compiler"))))))))
(home-page "http://www.polyml.org/")
(synopsis "Standard ML implementation")
(description "Poly/ML is a Standard ML implementation. It is fully
compatible with the ML97 standard. It includes a thread library, a foreign
function interface, and a symbolic debugger.")
;; Some source files specify 'or any later version'; some don't
(license
(list license:lgpl2.1
license:lgpl2.1+))))

13
gnu/packages/spice.scm
View file

@ -90,7 +90,7 @@ (define-public usbredir
over a network connection. It can be used to redirect traffic from a USB device
to a different (virtual) machine than the one to which the USB device is
attached.")
(home-page "http://www.spice-space.org")
(home-page "https://www.spice-space.org")
(license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))))
(define-public virglrenderer
@ -122,7 +122,7 @@ (define-public virglrenderer
(define-public spice-protocol
(package
(name "spice-protocol")
(version "0.12.12")
(version "0.12.13")
(source (origin
(method url-fetch)
(uri (string-append
@ -130,7 +130,7 @@ (define-public spice-protocol
"spice-protocol-" version ".tar.bz2"))
(sha256
(base32
"00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp"))))
"0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"))))
(build-system gnu-build-system)
(synopsis "Protocol headers for the SPICE protocol")
(description "SPICE (the Simple Protocol for Independent Computing
@ -211,7 +211,8 @@ (define-public spice
(base32
"0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"))
(patches
(search-patches "spice-CVE-2016-9577.patch"
(search-patches "spice-CVE-2017-7506.patch"
"spice-CVE-2016-9577.patch"
"spice-CVE-2016-9578-1.patch"
"spice-CVE-2016-9578-2.patch"))))
(build-system gnu-build-system)
@ -297,7 +298,7 @@ (define-public spice-vdagent
(define-public virt-viewer
(package
(name "virt-viewer")
(version "4.0")
(version "5.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -305,7 +306,7 @@ (define-public virt-viewer
"virt-viewer-" version ".tar.gz"))
(sha256
(base32
"07zsi1fqg05mag1ayniaqj25fzb6dxg76d4ka5196lq4l477nhhw"))))
"0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"))))
(build-system gnu-build-system)
(inputs
`(("gtk+" ,gtk+)

24
gnu/packages/ssh.scm
View file

@ -130,16 +130,12 @@ (define-public openssh
(name "openssh")
(version "7.5p1")
(source (origin
(method url-fetch)
(uri (let ((tail (string-append name "-" version ".tar.gz")))
(list (string-append "http://openbsd.cs.fau.de/pub/OpenBSD/OpenSSH/portable/"
tail)
(string-append "http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/"
tail)
(string-append "http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/"
tail))))
(sha256 (base32
"1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"))))
(method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/"
name "-" version ".tar.gz"))
(sha256
(base32
"1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"))))
(build-system gnu-build-system)
(native-inputs `(("groff" ,groff)))
(inputs `(("openssl" ,openssl)
@ -347,13 +343,13 @@ (define-public corkscrew
(define-public mosh
(package
(name "mosh")
(version "1.3.0")
(version "1.3.2")
(source (origin
(method url-fetch)
(uri (string-append "https://mosh.org/mosh-" version ".tar.gz"))
(sha256
(base32
"0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij"))))
"05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -409,8 +405,8 @@ (define-public et
(description
"Eternal Terminal (ET) is a remote shell that automatically reconnects
without interrupting the session. Unlike SSH sessions, ET sessions will
survive even after the network outages or IP changes. ET uses a custom
protocol over TCP, not the SSH protocol.")
survive even network outages and IP changes. ET uses a custom protocol over
TCP, not the SSH protocol.")
(home-page "https://mistertea.github.io/EternalTCP/")
(license license:asl2.0)))

21
gnu/packages/statistics.scm
View file

@ -34,6 +34,7 @@ (define-module (gnu packages statistics)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages cran)
#:use-module (gnu packages curl)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gtk)
@ -644,26 +645,6 @@ (define-public r-bit64
caching.")
(license license:gpl2)))
(define-public r-colorspace
(package
(name "r-colorspace")
(version "1.3-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "colorspace" version))
(sha256
(base32 "0d1ya7hx4y58n5ivwmdmq2zgh0g2sbv7ykh13n85c1355csd57yx"))))
(build-system r-build-system)
(home-page "http://cran.r-project.org/web/packages/colorspace")
(synopsis "Color space manipulation")
(description
"This package carries out a mapping between assorted color spaces
including RGB, HSV, HLS, CIEXYZ, CIELUV, HCL (polar CIELUV), CIELAB and polar
CIELAB. Qualitative, sequential, and diverging color palettes based on HCL
colors are provided.")
(license license:bsd-3)))
(define-public r-dichromat
(package
(name "r-dichromat")

4
gnu/packages/sync.scm
View file

@ -107,7 +107,7 @@ (define-public owncloud-client
(define-public qsyncthingtray
(package
(name "qsyncthingtray")
(version "0.5.7")
(version "0.5.8")
(source
(origin
(method url-fetch)
@ -117,7 +117,7 @@ (define-public qsyncthingtray
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1qzlxgq36sb1dk621nkbjw9k6y3css6q3z8xzx6nv7f327vanvp6"))))
"1024778ml7q62ziqm4d22z5sc1715l34846pwfyzfpcyl32qlhpz"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DQST_BUILD_WEBKIT=1")

8
gnu/packages/terminals.scm
View file

@ -34,6 +34,7 @@ (define-module (gnu packages terminals)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages docbook)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
@ -41,17 +42,14 @@ (define-module (gnu packages terminals)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#:use-module (gnu packages wm)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages docbook)
#:use-module (gnu packages qt)
#:use-module (srfi srfi-26))
(define-public tilda

1334
gnu/packages/tex.scm
View file

File diff suppressed because it is too large Load diff

35
gnu/packages/tls.scm
View file

@ -431,22 +431,22 @@ (define-public openssl-next
(define-public libressl
(package
(name "libressl")
(version "2.5.4")
(source
(origin
(method url-fetch)
(uri (string-append
"http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-"
version ".tar.gz"))
(sha256
(base32
"1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh"))))
(version "2.5.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://openbsd/LibreSSL/"
name "-" version ".tar.gz"))
(sha256
(base32
"1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"))))
(build-system gnu-build-system)
(arguments
;; Do as if 'getentropy' was missing since older Linux kernels lack it
;; and libc would return ENOSYS, which is not properly handled.
;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
'(#:configure-flags '("ac_cv_func_getentropy=no")))
'(#:configure-flags '("ac_cv_func_getentropy=no"
;; Provide a TLS-enabled netcat.
"--enable-nc")))
(native-search-paths
;; FIXME: These two variables must designate a single file or directory
;; and are not actually "search paths." In practice it works OK in
@ -460,9 +460,10 @@ (define-public libressl
(files '("etc/ssl/certs/ca-certificates.crt")))))
(home-page "https://www.libressl.org/")
(synopsis "SSL/TLS implementation")
(description "LibreSSL is a version of the TLS/crypto stack forked
from OpenSSL in 2014, with the goals of modernizing the codebase, improving
security, and applying best practice development processes.")
(description "LibreSSL is a version of the TLS/crypto stack, forked from
OpenSSL in 2014 with the goals of modernizing the codebase, improving security,
and applying best practice development processes. This package also includes a
netcat implementation that supports TLS.")
;; Files taken from OpenSSL keep their license, others are under various
;; non-copyleft licenses.
(license (list license:openssl
@ -474,13 +475,13 @@ (define-public python-acme
(package
(name "python-acme")
;; Remember to update the hash of certbot when updating python-acme.
(version "0.15.0")
(version "0.16.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "acme" version))
(sha256
(base32
"11zwgj663vr575pbqw74ia10wxaw16i8rnkcivsrbsx148rxdbcz"))))
"1kg9bnwywsr18hgvqyhxqqi90l2qa7449f41q3fdq2y59h9nk2sk"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -531,7 +532,7 @@ (define-public certbot
(uri (pypi-uri name version))
(sha256
(base32
"1srvmjxz75dbafx7xfg1w3n9h3srr9p2ljnfsih9dwwd5cxh9i5q"))))
"11p1vsps5rbpha3k5jnmf9i6rcp6299h9b34wdh21cq6dgyh2n3r"))))
(build-system python-build-system)
(arguments
`(,@(substitute-keyword-arguments (package-arguments python-acme)

6
gnu/packages/version-control.scm
View file

@ -120,14 +120,14 @@ (define-public bazaar
(define-public git
(package
(name "git")
(version "2.13.2")
(version "2.13.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz"))
(sha256
(base32
"1rfx2gj7dw9rw0w22ihi940zv3wdrj1xmjv25djq2vs6a4vsq40d"))))
"0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali"))))
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
@ -140,7 +140,7 @@ (define-public git
version ".tar.xz"))
(sha256
(base32
"0vlbjsnksv5law813av03aa06dx3b0vhira8wgq83sq060qy3q9h"))))))
"1hl1fhbr3jn4y9pkj26kk9frj6wjlxiphl7x5c9ma6x4081xna0i"))))))
(inputs
`(("curl" ,curl)
("expat" ,expat)

60
gnu/packages/video.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2015, 2016, 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@ -980,7 +980,7 @@ (define-public mplayer
(define-public mpv
(package
(name "mpv")
(version "0.25.0")
(version "0.26.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -988,7 +988,7 @@ (define-public mpv
".tar.gz"))
(sha256
(base32
"1khb7c4fdj1aak46lwyb3lq14w5jpxzws0zp6bdc87ljsvx3yhh7"))
"0ihvnwrp24jjf43k1hvy8n8w4ipl4z7apjppd4i0y9jzilsyzwys"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system waf-build-system)
(native-inputs
@ -1055,7 +1055,7 @@ (define-public mpv
(define-public gnome-mpv
(package
(name "gnome-mpv")
(version "0.11")
(version "0.12")
(source
(origin
(method url-fetch)
@ -1064,7 +1064,7 @@ (define-public gnome-mpv
".tar.xz"))
(sha256
(base32
"1hn3mpsxbrwf2m0nz4vzji4i6i896y8kqjb9kijqpk04cnrs3fgz"))))
"0dcnz9vlf791v8d15j7hpymv87h6nb15alww6xjq0zpal5hi44kc"))))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
@ -1121,7 +1121,7 @@ (define-public libvpx
(define-public youtube-dl
(package
(name "youtube-dl")
(version "2017.07.09")
(version "2017.07.23")
(source (origin
(method url-fetch)
(uri (string-append "https://yt-dl.org/downloads/"
@ -1129,7 +1129,7 @@ (define-public youtube-dl
version ".tar.gz"))
(sha256
(base32
"0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2"))))
"0h8jim7qx7b97wg7s8izz3and1xp70b9clqwpxl33xls9linh04m"))))
(build-system python-build-system)
(arguments
;; The problem here is that the directory for the man page and completion
@ -1888,6 +1888,44 @@ (define-public recordmydesktop
making @dfn{screencasts}.")
(license license:gpl2+)))
(define-public simplescreenrecorder
(package
(name "simplescreenrecorder")
(version "0.3.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/MaartenBaert/ssr/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"))))
(build-system gnu-build-system)
;; Although libx11, libxfixes, libxext are listed as build dependencies in
;; README.md, the program builds and functions properly without them.
;; As a result, they are omitted. Please add them back if problems appear.
(inputs
`(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg)
("glu" ,glu)
("jack" ,jack-1)
("libxi" ,libxi)
("pulseaudio" ,pulseaudio)
("qt" ,qt-4))) ; README.md: using Qt 5 causes some stability issues
(native-inputs `(("pkg-config" ,pkg-config)))
;; Using HTTPS causes part of the page to be displayed improperly.
(home-page "http://www.maartenbaert.be/simplescreenrecorder/")
(synopsis "Screen recorder")
(description "SimpleScreenRecorder is an easy to use screen recorder with
a graphical user interface. It supports recording the entire screen, or a
part of it, and allows encoding in many different codecs and file formats.
Other features include a live preview and live streaming.")
(license (list license:gpl3+ ; most files
license:zlib ; glinject/elfhacks.*
license:isc ; glinject/*
license:x11)))) ; build-aux/install-sh
(define-public libsmpeg
(package
(name "libsmpeg")
@ -1932,7 +1970,7 @@ (define-public libbdplus
(source
(origin
(method url-fetch)
(uri (string-append "ftp://ftp.videolan.org/pub/videolan/libbdplus/"
(uri (string-append "https://ftp.videolan.org/pub/videolan/libbdplus/"
version "/" name "-" version ".tar.bz2"))
(sha256
(base32 "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"))))
@ -1952,7 +1990,7 @@ (define-public libaacs
(source
(origin
(method url-fetch)
(uri (string-append "ftp://ftp.videolan.org/pub/videolan/libaacs/"
(uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
version "/" name "-" version ".tar.bz2"))
(sha256
(base32 "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"))))
@ -2108,7 +2146,7 @@ (define-public handbrake
(define-public openh264
(package
(name "openh264")
(version "1.6.0")
(version "1.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/cisco/"
@ -2116,7 +2154,7 @@ (define-public openh264
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ix2fhk62i4q4kbnkl0gfk4x53vxqavsn0pck1pashr566zhglv5"))))
"0gv571bqkxk7ic64dmavs1q8nr7p59mcf4ibqp4lc070gn6w61ww"))))
(build-system gnu-build-system)
(native-inputs
`(("nasm" ,nasm)

16
gnu/packages/vim.scm
View file

@ -60,7 +60,7 @@ (define-module (gnu packages vim)
(define-public vim
(package
(name "vim")
(version "8.0.0600")
(version "8.0.0727")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/vim/vim/archive/v"
@ -68,7 +68,7 @@ (define-public vim
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ifaj0lfzqn06snkcd83l58m9r6lg7lk3wspx71k5ycvypyfi67s"))))
"0hwqglpsk8qlp2rn6q9p35fxk88xixljk1yv42m3j01g3bgqg0gx"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -111,8 +111,20 @@ (define-public vim
(define-public vim-full
(package
;; This package should share its source with Vim, but it doesn't
;; build reliably, and we want to keep Vim up to date due to the
;; frequency of important bug fixes.
(inherit vim)
(name "vim-full")
(version "8.0.0600")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/vim/vim/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ifaj0lfzqn06snkcd83l58m9r6lg7lk3wspx71k5ycvypyfi67s"))))
(arguments
`(#:configure-flags
(list (string-append "--with-lua-prefix="

52
gnu/packages/qemu.scm → gnu/packages/virtualization.scm
View file

@ -19,7 +19,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages qemu)
(define-module (gnu packages virtualization)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages attr)
@ -42,6 +42,7 @@ (define-module (gnu packages qemu)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
#:use-module (gnu packages selinux)
#:use-module (gnu packages sdl)
#:use-module (gnu packages spice)
#:use-module (gnu packages texinfo)
@ -80,7 +81,8 @@ (define-public qemu
"qemu-CVE-2017-8309.patch"
"qemu-CVE-2017-8379.patch"
"qemu-CVE-2017-8380.patch"
"qemu-CVE-2017-9524.patch"))
"qemu-CVE-2017-9524.patch"
"qemu-CVE-2017-11334.patch"))
(sha256
(base32
"08mhfs0ndbkyqgw7fjaa9vjxf4dinrly656f6hjzvmaz7hzc677h"))))
@ -266,6 +268,52 @@ (define-public libosinfo
;; files in the "tools" directory are released under GPLv2+.
(license (list lgpl2.1+ gpl2+))))
(define-public lxc
(package
(name "lxc")
(version "2.0.8")
(source (origin
(method url-fetch)
(uri (string-append
"https://linuxcontainers.org/downloads/lxc/lxc-"
version ".tar.gz"))
(sha256
(base32
"15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("gnutls" ,gnutls)
("libcap" ,libcap)
("libseccomp" ,libseccomp)
("libselinux" ,libselinux)))
(arguments
'(#:configure-flags
'("--sysconfdir=/etc"
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bashcompdir (string-append out "/etc/bash_completion.d")))
(zero? (system*
"make" "install"
(string-append "bashcompdir=" bashcompdir)
;; Don't install files into /var and /etc.
"LXCPATH=/tmp/var/lib/lxc"
"localstatedir=/tmp/var"
"sysconfdir=/tmp/etc"
"sysconfigdir=/tmp/etc/default"))))))))
(synopsis "Linux container tools")
(home-page "https://linuxcontainers.org/")
(description
"LXC is a userspace interface for the Linux kernel containment features.
Through a powerful API and simple tools, it lets Linux users easily create and
manage system or application containers.")
(license lgpl2.1+)))
(define-public libvirt
(package
(name "libvirt")

6
gnu/packages/vpn.scm
View file

@ -219,11 +219,11 @@ (define-public sshuttle
"12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest-runner" ,python-pytest-runner)
("python-setuptools-scm" ,python-setuptools-scm)
`(("python-setuptools-scm" ,python-setuptools-scm)
;; For tests only.
("python-mock" ,python-mock)
("python-pytest" ,python-pytest)))
("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)))
(home-page "https://github.com/sshuttle/sshuttle")
(synopsis "VPN that transparently forwards connections over SSH")
(description "sshuttle creates an encrypted virtual private network (VPN)

4
gnu/packages/web-browsers.scm
View file

@ -128,7 +128,7 @@ (define-public links
(define-public lynx
(package
(name "lynx")
(version "2.8.9dev.11")
(version "2.8.9dev.15")
(source (origin
(method url-fetch)
(uri (string-append
@ -136,7 +136,7 @@ (define-public lynx
"/lynx" version ".tar.bz2"))
(sha256
(base32
"1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a"))))
"16bdr7ai130ps67px8ssxnjxp5j6m4rin3in7jm22fxk0a8p2428"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl)))

80
gnu/packages/web.scm
View file

@ -72,9 +72,9 @@ (define-module (gnu packages web)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libidn)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages base)
@ -94,14 +94,14 @@ (define-module (gnu packages web)
(define-public httpd
(package
(name "httpd")
(version "2.4.26")
(version "2.4.27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/httpd/httpd-"
version ".tar.bz2"))
(sha256
(base32
"11ykcfv7b9zpd7fb93a7yhnyfwrilryjz21iklaf0yf8mwpvazm0"))))
"0fn1778mxhf78np2d8qlycg1c2ak18rxax41plahasca4clc3z3i"))))
(build-system gnu-build-system)
(native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config'
(inputs `(("apr" ,apr)
@ -132,14 +132,14 @@ (define-public httpd
(define-public nginx
(package
(name "nginx")
(version "1.12.0")
(version "1.12.1")
(source (origin
(method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-"
version ".tar.gz"))
(sha256
(base32
"0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml"))))
"1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7"))))
(build-system gnu-build-system)
(inputs `(("pcre" ,pcre)
("openssl" ,openssl)
@ -543,7 +543,7 @@ (define-public libwebsockets
(define-public libpsl
(package
(name "libpsl")
(version "0.17.0")
(version "0.18.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/rockdaboot/libpsl/"
@ -551,10 +551,13 @@ (define-public libpsl
"/libpsl-" version ".tar.gz"))
(sha256
(base32
"0jyxwc6bcvkcahkwcq237a0x209cysb63n5lak5m7zbglbb2jmq2"))))
"00iids8ldsqnnndmcfjp6kc00lv7fawf5l24mpbdbkh98yazgc4i"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("icu4c" ,icu4c)
`(("libidn2" ,libidn2)
("libunistring" ,libunistring)
("python-2" ,python-2)))
(home-page "https://github.com/rockdaboot/libpsl")
(synopsis "C library for the Publix Suffix List")
@ -2236,14 +2239,14 @@ (define-public perl-html-tagset
(define-public perl-html-template
(package
(name "perl-html-template")
(version "2.95")
(version "2.97")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/W/WO/WONKO/"
(uri (string-append "mirror://cpan/authors/id/S/SA/SAMTREGAR/"
"HTML-Template-" version ".tar.gz"))
(sha256
(base32
"07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q"))))
"17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-cgi" ,perl-cgi)))
@ -4702,3 +4705,58 @@ (define-public jo
command-line arguments or read from stdin.")
(license (list l:gpl2+
l:expat)))) ; json.c, json.h
(define-public python-internetarchive
(package
(name "python-internetarchive")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/jjjake/internetarchive/archive/"
"v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"00v1489rv1ydcihwbdl7sqpcpmm98b9kqqlfggr32k0ndmv7ivas"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; 11 tests of 105 fail to mock "requests".
#:phases
(modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs target (tests? (not target)) #:allow-other-keys)
(if tests?
(begin
(add-installed-pythonpath inputs outputs)
(setenv "PATH" (string-append (assoc-ref outputs "out") "/bin"
":" (getenv "PATH")))
(zero? (system* "py.test")))
(begin
(format #t "test suite not run~%")
#t)))))))
(propagated-inputs
`(("python-requests" ,python-requests)
("python-jsonpatch" ,python-jsonpatch-0.4)
("python-docopt" ,python-docopt)
("python-clint" ,python-clint)
("python-six" ,python-six)
("python-schema" ,python-schema-0.5)
("python-backports-csv" ,python-backports-csv)))
(native-inputs
`(("python-pytest-3.0" ,python-pytest-3.0)
("python-pytest-capturelog" ,python-pytest-capturelog)
("python-responses" ,python-responses)))
(home-page "https://github.com/jjjake/internetarchive")
(synopsis "Command-line interface to archive.org")
(description "@code{ia} is a command-line tool for using
@url{archive.org} from the command-line. It also emplements the
internetarchive python module for programatic access to archive.org.")
(properties
`((python2-variant . ,(delay python2-internetarchive))))
(license l:agpl3+)))
(define-public python2-internetarchive
(package-with-python2
(strip-python2-variant python-internetarchive)))

6
gnu/packages/wm.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pramatique.xyz>
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
@ -94,7 +94,7 @@ (define-public libconfuse
(define-public bspwm
(package
(name "bspwm")
(version "0.9")
(version "0.9.3")
(source
(origin
(file-name (string-append name "-" version ".tar.gz"))
@ -104,7 +104,7 @@ (define-public bspwm
version ".tar.gz"))
(sha256
(base32
"1pig0h2jk8wipyz90j69c4bk37bfyq60asnn0v0bqld2p2vjvyqy"))))
"17dwj7w16cdj7g4s2y2f96lgj5msq1s4543dnfa3rijlazzy6mmk"))))
(build-system gnu-build-system)
(inputs
`(("libxcb" ,libxcb)

16
gnu/packages/xdisorg.scm
View file

@ -126,6 +126,7 @@ (define-public xclip
(method url-fetch)
(uri (string-append "https://github.com/astrand/xclip"
"/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0n7pczk9vv30zf8qfln8ba3hnif9yfdxg0m84djac469wc28hnya"))))
@ -451,7 +452,7 @@ (define-public scrot
(define-public slop
(package
(name "slop")
(version "6.3.45")
(version "6.3.47")
(source (origin
(method url-fetch)
(uri (string-append
@ -460,12 +461,13 @@ (define-public slop
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0lzyjcg6yff1vzlsda45i57khajp56yrmcjfa5faw3i60fnqqiy7"))))
"1kjivsq4c7dr7ggp44k09xm97i9chg8czvachqrfnv6fiqvwys0i"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no "check" target
(inputs
`(("glm" ,glm)
`(("glew" ,glew)
("glm" ,glm)
("icu4c" ,icu4c)
("libxext" ,libxext)
("libxrender" ,libxrender)
@ -483,7 +485,7 @@ (define-public slop
(define-public maim
(package
(name "maim")
(version "5.4.63")
(version "5.4.64")
(source (origin
(method url-fetch)
(uri (string-append
@ -492,7 +494,7 @@ (define-public maim
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ncly3mmg9pihda3jfwmvfa4sd3xanrm8hpvfq7lr2rl8rqknx80"))))
"0y7ajwcp6x9q7581alz2b5xqijs5cb9l38h10fzinswqrcz53ak1"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no "check" target
@ -1060,7 +1062,7 @@ (define-public rofi
(define-public tint2
(package
(name "tint2")
(version "0.12.11")
(version "0.14.6")
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.com/o9000/" name
@ -1068,7 +1070,7 @@ (define-public tint2
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0dv7zaj2ahnfclnwnwcz9arrvzxn65yy29z7fqdgifdh3jk1kl2h"))))
"1kwzwxy4myagybm3rc7dgynfgp75742n348qibn1p2an9ggyivda"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ;no test target

13
gnu/packages/xml.scm
View file

@ -56,6 +56,7 @@ (define-public expat
(package
(name "expat")
(version "2.2.1")
(replacement expat-2.2.2)
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"
@ -72,6 +73,18 @@ (define-public expat
things the parser might find in the XML document (like start tags).")
(license license:expat)))
(define expat-2.2.2 ; Fixes CVE-2017-9233, CVE-2016-9063 and other issues.
(package
(inherit expat)
(version "2.2.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"
version "/expat-" version ".tar.bz2"))
(sha256
(base32
"0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"))))))
(define-public libebml
(package
(name "libebml")

5
gnu/services.scm
View file

@ -624,9 +624,10 @@ (define (add-edge extension edges)
(target-type target-type))
(&message
(message
(format #f (G_ "no target of type '~a' for service ~s")
(format #f (G_ "no target of type '~a' for service '~a'")
(service-type-name target-type)
service))))))
(service-type-name
(service-kind service))))))))
(x
(raise
(condition (&ambiguous-target-service-error

4
gnu/services/cuirass.scm
View file

@ -66,6 +66,8 @@ (define-record-type* <cuirass-configuration>
(default #f))
(one-shot? cuirass-configuration-one-shot? ;boolean
(default #f))
(fallback? cuirass-configuration-fallback? ;boolean
(default #f))
(load-path cuirass-configuration-load-path
(default '())))
@ -84,6 +86,7 @@ (define (cuirass-shepherd-service config)
(specs (cuirass-configuration-specifications config))
(use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config))
(load-path (cuirass-configuration-load-path config)))
(list (shepherd-service
(documentation "Run Cuirass.")
@ -99,6 +102,7 @@ (define (cuirass-shepherd-service config)
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '())
#$@(if fallback? '("--fallback") '())
#$@(if (null? load-path) '()
`("--load-path" ,(string-join load-path ":"))))
#:user #$user

10
gnu/services/dbus.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;;
;;; This file is part of GNU Guix.
@ -205,7 +205,9 @@ (define dbus-root-service-type
(inherit config)
(services
(append (dbus-configuration-services config)
services)))))))
services)))))
(default-value (dbus-configuration))))
(define* (dbus-service #:key (dbus dbus) (services '()))
"Return a service that runs the \"system bus\", using @var{dbus}, with
@ -297,7 +299,9 @@ (define polkit-service-type
(inherit config)
(actions
(append (polkit-configuration-actions config)
actions)))))))
actions)))))
(default-value (polkit-configuration))))
(define* (polkit-service #:key (polkit polkit))
"Return a service that runs the

22
gnu/services/desktop.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
@ -653,6 +653,20 @@ (module (file-append (elogind-package config)
(inherit pam)
(session (cons pam-elogind (pam-service-session pam)))))))
(define (elogind-shepherd-service config)
"Return a Shepherd service to start elogind according to @var{config}."
(list (shepherd-service
(requirement '(dbus-system))
(provision '(elogind))
(start #~(make-forkexec-constructor
(list #$(file-append (elogind-package config)
"/libexec/elogind/elogind"))
#:environment-variables
(list (string-append "ELOGIND_CONF_FILE="
#$(elogind-configuration-file
config)))))
(stop #~(make-kill-destructor)))))
(define elogind-service-type
(service-type (name 'elogind)
(extensions
@ -663,6 +677,12 @@ (define elogind-service-type
(service-extension polkit-service-type
(compose list elogind-package))
;; Start elogind from the Shepherd rather than waiting
;; for bus activation. This ensures that it can handle
;; events like lid close, etc.
(service-extension shepherd-root-service-type
elogind-shepherd-service)
;; Provide the 'loginctl' command.
(service-extension profile-service-type
(compose list elogind-package))

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