mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 12:00:35 +02:00
Code Releases Activity

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2017-10-10 22:33:28 +02:00
commit c01ef97594
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
185 changed files with 7440 additions and 3525 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.mailmap
View file

@ -65,6 +65,7 @@ Sou Bunnbu (宋文武) <iyzsong@gmail.com>
Sou Bunnbu (宋文武) <iyzsong@gmail.com> <iyzsong@member.fsf.org> Sou Bunnbu (宋文武) <iyzsong@gmail.com> <iyzsong@member.fsf.org>
Stefan Reichör <stefan@xsteve.at> Stefan Reichör <stefan@xsteve.at>
Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
Theodoros Foradis <theodoros.for@openmailbox.org> <theodoros@foradis.org>
Thomas Danckaert <thomas.danckaert@gmail.com> <post@thomasdanckaert.be> Thomas Danckaert <thomas.danckaert@gmail.com> <post@thomasdanckaert.be>
Tobias Geerinckx-Rice <me@tobias.gr> <tobias.geerinckx.rice@gmail.com> Tobias Geerinckx-Rice <me@tobias.gr> <tobias.geerinckx.rice@gmail.com>
Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz> Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz>

2
configure.ac
View file

@ -8,7 +8,7 @@ AC_INIT([GNU Guix],
[https://www.gnu.org/software/guix/]) [https://www.gnu.org/software/guix/])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \ AM_INIT_AUTOMAKE([1.14 gnu silent-rules subdir-objects \
color-tests parallel-tests -Woverride -Wno-portability]) color-tests parallel-tests -Woverride -Wno-portability])
# Enable silent rules by default. # Enable silent rules by default.

115
doc/guix.texi
View file

@ -2532,8 +2532,10 @@ Produce verbose output, writing build logs to the standard error output.
@item --url=@var{url} @item --url=@var{url}
Download Guix from the Git repository at @var{url}. Download Guix from the Git repository at @var{url}.
@vindex GUIX_PULL_URL
By default, the source is taken from its canonical Git repository at By default, the source is taken from its canonical Git repository at
@code{gnu.org}, for the stable branch of Guix. @code{gnu.org}, for the stable branch of Guix. To use a different source,
set the @code{GUIX_PULL_URL} environment variable.
@item --commit=@var{commit} @item --commit=@var{commit}
Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal
@ -3479,6 +3481,14 @@ build file @file{build.xml} with tasks to build the specified jar
archive. In this case the parameter @code{#:source-dir} can be used to archive. In this case the parameter @code{#:source-dir} can be used to
specify the source sub-directory, defaulting to ``src''. specify the source sub-directory, defaulting to ``src''.
The @code{#:main-class} parameter can be used with the minimal ant
buildfile to specify the main class of the resulting jar. This makes the
jar file executable. The @code{#:test-include} parameter can be used to
specify the list of junit tests to run. It defaults to
@code{(list "**/*Test.java")}. The @code{#:test-exclude} can be used to
disable some tests. It defaults to @code{(list "**/Abstract*.java")},
because abstract classes cannot be run as tests.
The parameter @code{#:build-target} can be used to specify the Ant task The parameter @code{#:build-target} can be used to specify the Ant task
that should be run during the @code{build} phase. By default the that should be run during the @code{build} phase. By default the
``jar'' task will be run. ``jar'' task will be run.
@ -12112,6 +12122,32 @@ Additional command line options to pass to @code{memcached}.
@end table @end table
@end deftp @end deftp
@defvr {Scheme Variable} mongodb-service-type
This is the service type for @uref{https://www.mongodb.com/, MongoDB}.
The value for the service type is a @code{mongodb-configuration} object.
@end defvr
@example
(service mongodb-service-type)
@end example
@deftp {Data Type} mongodb-configuration
Data type representing the configuration of mongodb.
@table @asis
@item @code{mongodb} (default: @code{mongodb})
The MongoDB package to use.
@item @code{config-file} (default: @code{%default-mongodb-configuration-file})
The configuration file for MongoDB.
@item @code{data-directory} (default: @code{"/var/lib/mongodb"})
This value is used to create the directory, so that it exists and is
owned by the mongodb user. It should match the data-directory which
MongoDB is configured to use through the configuration file.
@end table
@end deftp
@defvr {Scheme Variable} redis-service-type @defvr {Scheme Variable} redis-service-type
This is the service type for the @uref{https://redis.io/, Redis} This is the service type for the @uref{https://redis.io/, Redis}
key/value store, whose value is a @code{redis-configuration} object. key/value store, whose value is a @code{redis-configuration} object.
@ -17000,6 +17036,71 @@ Extra options will be passed to @code{git daemon}, please run
@end table @end table
@end deftp @end deftp
@subsubheading Cgit Service
@cindex Cgit service
@cindex Git, web interface
@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git
repositories written in C.
The following example will configure the service with default values.
By default, Cgit can be accessed on port 80 (@code{http://localhost:80}).
@example
(service nginx-service-type)
(service fcgiwrap-service-type)
(service cgit-service-type)
@end example
@deftp {Data Type} cgit-configuration
Data type representing the configuration of Cgit.
This type has the following parameters:
@table @asis
@item @code{config-file} (default: @code{(cgit-configuration-file)})
The configuration file to use for Cgit. This can be set to a
@dfn{cgit-configuration-file} record value, or any gexp
(@pxref{G-Expressions}).
For example, to instead use a local file, the @code{local-file} function
can be used:
@example
(service cgit-service-type
(cgit-configuration
(config-file (local-file "./my-cgitrc.conf"))))
@end example
@item @code{package} (default: @code{cgit})
The Cgit package to use.
@end table
@end deftp
@deftp {Data Type} cgit-configuration-file
Data type representing the configuration options for Cgit.
This type has the following parameters:
@table @asis
@item @code{css} (default: @code{"/share/cgit/cgit.css"})
URL which specifies the css document to include in all Cgit pages.
@item @code{logo} (default: @code{"/share/cgit/cgit.png"})
URL which specifies the source of an image which will be used as a logo
on all Cgit pages.
@item @code{virtual-root} (default: @code{"/"})
URL which, if specified, will be used as root for all Cgit links.
@item @code{repository-directory} (default: @code{"/srv/git"})
Name of the directory to scan for repositories.
@item @code{robots} (default: @code{(list "noindex" "nofollow")})
Text used as content for the ``robots'' meta-tag.
@end table
@end deftp
@node Setuid Programs @node Setuid Programs
@subsection Setuid Programs @subsection Setuid Programs
@ -19147,6 +19248,18 @@ Translation Project} so that as many users as possible can read them in
their native language. User interfaces search them and display them in their native language. User interfaces search them and display them in
the language specified by the current locale. the language specified by the current locale.
To allow @command{xgettext} to extract them as translatable strings,
synopses and descriptions @emph{must be literal strings}. This means
that you cannot use @code{string-append} or @code{format} to construct
these strings:
@lisp
(package
;; @dots{}
(synopsis "This is translatable")
(description (string-append "This is " "*not*" " translatable.")))
@end lisp
Translation is a lot of work so, as a packager, please pay even more Translation is a lot of work so, as a packager, please pay even more
attention to your synopses and descriptions as every change may entail attention to your synopses and descriptions as every change may entail
additional work for translators. In order to help them, it is possible additional work for translators. In order to help them, it is possible

13
gnu/build/activation.scm
View file

@ -353,24 +353,13 @@ they already exist."
;; Place where setuid programs are stored. ;; Place where setuid programs are stored.
"/run/setuid-programs") "/run/setuid-programs")
(define (link-or-copy source target)
"Attempt to make TARGET a hard link to SOURCE; if it fails, fall back to
copy SOURCE to TARGET."
(catch 'system-error
(lambda ()
(link source target))
(lambda args
;; Perhaps SOURCE and TARGET live in a different file system, so copy
;; SOURCE.
(copy-file source target))))
(define (activate-setuid-programs programs) (define (activate-setuid-programs programs)
"Turn PROGRAMS, a list of file names, into setuid programs stored under "Turn PROGRAMS, a list of file names, into setuid programs stored under
%SETUID-DIRECTORY." %SETUID-DIRECTORY."
(define (make-setuid-program prog) (define (make-setuid-program prog)
(let ((target (string-append %setuid-directory (let ((target (string-append %setuid-directory
"/" (basename prog)))) "/" (basename prog))))
(link-or-copy prog target) (copy-file prog target)
(chown target 0 0) (chown target 0 0)
(chmod target #o6555))) (chmod target #o6555)))

4
gnu/build/file-systems.scm
View file

@ -415,12 +415,12 @@ was READ is = to the given value."
(partition-predicate read-partition-label string=?)) (partition-predicate read-partition-label string=?))
(define partition-uuid-predicate (define partition-uuid-predicate
(partition-predicate read-partition-uuid bytevector=?)) (partition-predicate read-partition-uuid uuid=?))
(define luks-partition-uuid-predicate (define luks-partition-uuid-predicate
(partition-predicate (partition-predicate
(partition-field-reader read-luks-header luks-header-uuid) (partition-field-reader read-luks-header luks-header-uuid)
bytevector=?)) uuid=?))
(define (find-partition predicate) (define (find-partition predicate)
"Return the first partition found that matches PREDICATE, or #f if none "Return the first partition found that matches PREDICATE, or #f if none

29
gnu/local.mk
View file

@ -326,6 +326,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/plotutils.scm \ %D%/packages/plotutils.scm \
%D%/packages/polkit.scm \ %D%/packages/polkit.scm \
%D%/packages/popt.scm \ %D%/packages/popt.scm \
%D%/packages/profiling.scm \
%D%/packages/pth.scm \ %D%/packages/pth.scm \
%D%/packages/pulseaudio.scm \ %D%/packages/pulseaudio.scm \
%D%/packages/pumpio.scm \ %D%/packages/pumpio.scm \
@ -501,6 +502,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/networking.scm \ %D%/tests/networking.scm \
%D%/tests/rsync.scm \ %D%/tests/rsync.scm \
%D%/tests/ssh.scm \ %D%/tests/ssh.scm \
%D%/tests/version-control.scm \
%D%/tests/virtualization.scm \ %D%/tests/virtualization.scm \
%D%/tests/web.scm %D%/tests/web.scm
@ -541,7 +543,6 @@ dist_patch_DATA = \
%D%/packages/patches/binutils-ld-new-dtags.patch \ %D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/bluez-CVE-2017-1000250.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
@ -558,6 +559,7 @@ dist_patch_DATA = \
%D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/clang-libc-search-path.patch \ %D%/packages/patches/clang-libc-search-path.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clisp-remove-failing-test.patch \
%D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clucene-pkgconfig.patch \
%D%/packages/patches/clx-remove-demo.patch \ %D%/packages/patches/clx-remove-demo.patch \
%D%/packages/patches/cmake-fix-tests.patch \ %D%/packages/patches/cmake-fix-tests.patch \
@ -574,7 +576,7 @@ dist_patch_DATA = \
%D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \
%D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/curl-bounds-check.patch \ %D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/cvs-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \
@ -685,6 +687,7 @@ dist_patch_DATA = \
%D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-14042.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-14042.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-14165.patch \ %D%/packages/patches/graphicsmagick-CVE-2017-14165.patch \
%D%/packages/patches/graphicsmagick-CVE-2017-14649.patch \
%D%/packages/patches/graphite2-ffloat-store.patch \ %D%/packages/patches/graphite2-ffloat-store.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groff-source-date-epoch.patch \
@ -789,7 +792,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \
%D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-frame-length.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \
%D%/packages/patches/libmwaw-CVE-2017-9433.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \
@ -808,8 +810,16 @@ dist_patch_DATA = \
%D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libunistring-gnulib-multi-core.patch \
%D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libvisio-fix-tests.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \
%D%/packages/patches/libxfont-CVE-2017-13720.patch \
%D%/packages/patches/libxfont-CVE-2017-13722.patch \
%D%/packages/patches/libxml2-CVE-2017-0663.patch \
%D%/packages/patches/libxml2-CVE-2017-7375.patch \
%D%/packages/patches/libxml2-CVE-2017-7376.patch \
%D%/packages/patches/libxml2-CVE-2017-9047+CVE-2017-9048.patch \
%D%/packages/patches/libxml2-CVE-2017-9049+CVE-2017-9050.patch \
%D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \
@ -850,6 +860,7 @@ dist_patch_DATA = \
%D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \
%D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \
%D%/packages/patches/mozjs17-aarch64-support.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \
%D%/packages/patches/mozjs24-aarch64-support.patch \ %D%/packages/patches/mozjs24-aarch64-support.patch \
%D%/packages/patches/mozjs38-pkg-config-version.patch \ %D%/packages/patches/mozjs38-pkg-config-version.patch \
@ -888,12 +899,6 @@ dist_patch_DATA = \
%D%/packages/patches/openscenegraph-ffmpeg3.patch \ %D%/packages/patches/openscenegraph-ffmpeg3.patch \
%D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openexr-missing-samples.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjpeg-CVE-2017-12982.patch \
%D%/packages/patches/openjpeg-CVE-2017-14040.patch \
%D%/packages/patches/openjpeg-CVE-2017-14041.patch \
%D%/packages/patches/openjpeg-CVE-2017-14151.patch \
%D%/packages/patches/openjpeg-CVE-2017-14152.patch \
%D%/packages/patches/openjpeg-CVE-2017-14164.patch \
%D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \
%D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-runpath.patch \
@ -967,6 +972,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-genshi-isstring-helper.patch \ %D%/packages/patches/python-genshi-isstring-helper.patch \
%D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-nose-timer-drop-ordereddict.patch \
%D%/packages/patches/python-parse-too-many-fields.patch \ %D%/packages/patches/python-parse-too-many-fields.patch \
%D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
%D%/packages/patches/python-statsmodels-fix-tests.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \
@ -981,8 +987,7 @@ dist_patch_DATA = \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.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-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/qemu-CVE-2017-13711.patch \ %D%/packages/patches/python2-unittest2-remove-argparse.patch \
%D%/packages/patches/qemu-CVE-2017-14167.patch \
%D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quagga-reproducible-build.patch \
@ -1107,8 +1112,6 @@ dist_patch_DATA = \
%D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-fix-fd-leak.patch \
%D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch \ %D%/packages/patches/xmodmap-asprintf.patch \
%D%/packages/patches/xorg-server-CVE-2017-10971.patch \
%D%/packages/patches/xorg-server-CVE-2017-10972.patch \
%D%/packages/patches/libyaml-CVE-2014-9130.patch \ %D%/packages/patches/libyaml-CVE-2014-9130.patch \
%D%/packages/patches/zathura-plugindir-environment-variable.patch \ %D%/packages/patches/zathura-plugindir-environment-variable.patch \
%D%/packages/patches/zziplib-CVE-2017-5974.patch \ %D%/packages/patches/zziplib-CVE-2017-5974.patch \

238
gnu/packages/admin.scm
View file

@ -361,32 +361,31 @@ login, passwd, su, groupadd, and useradd.")
"05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace 'configure `(#:phases
(lambda* (#:key inputs outputs (modify-phases %standard-phases
#:allow-other-keys) (replace 'configure
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(man8 (string-append (let* ((out (assoc-ref outputs "out"))
out "/share/man/man8")) (man8 (string-append out "/share/man/man8"))
(sbin (string-append out "/sbin")) (sbin (string-append out "/sbin"))
(shadow (assoc-ref inputs "shadow")) (shadow (assoc-ref inputs "shadow"))
(login (string-append shadow (login (string-append shadow "/bin/login")))
"/bin/login"))) (substitute* "Makefile"
(substitute* "Makefile" (("^SBINDIR.*")
(("^SBINDIR.*") (string-append "SBINDIR = " out
(string-append "SBINDIR = " out "/sbin\n"))
"/sbin\n")) (("^MANDIR.*")
(("^MANDIR.*") (string-append "MANDIR = " out
(string-append "MANDIR = " out "/share/man/man8\n")))
"/share/man/man8\n")))
;; Pick the right 'login' by default. ;; Pick the right 'login' by default.
(substitute* "mingetty.c" (substitute* "mingetty.c"
(("\"/bin/login\"") (("\"/bin/login\"")
(string-append "\"" login "\""))) (string-append "\"" login "\"")))
(mkdir-p sbin) (mkdir-p sbin)
(mkdir-p man8))) (mkdir-p man8))
%standard-phases) #t)))
#:tests? #f)) ; no tests #:tests? #f)) ; no tests
(inputs `(("shadow" ,shadow))) (inputs `(("shadow" ,shadow)))
@ -725,25 +724,25 @@ by bandwidth they use.")
("perl-x11-protocol" ,perl-x11-protocol))) ("perl-x11-protocol" ,perl-x11-protocol)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'install 'set-load-paths (add-after 'install 'set-load-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Put the perl-tk and perl-x11-protocol modules in the perl inc ;; Put the perl-tk and perl-x11-protocol modules in the perl inc
;; path for PROG ;; path for PROG
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/bin/cssh")) (prog (string-append out "/bin/cssh"))
(perl-ver ,(package-version perl)) (perl-ver ,(package-version perl))
(x11-inc (string-append (x11-inc (string-append
(assoc-ref inputs "perl-x11-protocol") (assoc-ref inputs "perl-x11-protocol")
"/lib/perl5/site_perl/" perl-ver)) "/lib/perl5/site_perl/" perl-ver))
(tk-inc (string-append (tk-inc (string-append
(assoc-ref inputs "perl-tk") (assoc-ref inputs "perl-tk")
"/lib/perl5/site_perl/" perl-ver "/lib/perl5/site_perl/" perl-ver
"/x86_64-linux"))) "/x86_64-linux")))
(wrap-program (wrap-program
prog prog
`("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))) `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))
%standard-phases))) #t)))))
;; The clusterssh.sourceforge.net address requires login to view ;; The clusterssh.sourceforge.net address requires login to view
(home-page "https://sourceforge.net/projects/clusterssh/") (home-page "https://sourceforge.net/projects/clusterssh/")
(synopsis "Secure concurrent multi-server terminal control") (synopsis "Secure concurrent multi-server terminal control")
@ -908,13 +907,14 @@ commands and their arguments.")
"0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl")))) "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (replace 'configure
(chdir "wpa_supplicant") (lambda* (#:key outputs #:allow-other-keys)
(copy-file "defconfig" ".config") (chdir "wpa_supplicant")
(let ((port (open-file ".config" "al"))) (copy-file "defconfig" ".config")
(display " (let ((port (open-file ".config" "al")))
(display "
CONFIG_DEBUG_SYSLOG=y CONFIG_DEBUG_SYSLOG=y
# Choose GnuTLS (the default is OpenSSL.) # Choose GnuTLS (the default is OpenSSL.)
@ -924,26 +924,23 @@ commands and their arguments.")
CFLAGS += $(shell pkg-config libnl-3.0 --cflags) CFLAGS += $(shell pkg-config libnl-3.0 --cflags)
CONFIG_LIBNL32=y CONFIG_LIBNL32=y
CONFIG_READLINE=y\n" port) CONFIG_READLINE=y\n" port)
(close-port port))) (close-port port))))
(add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))
(man5 (string-append man "/man5"))
(man8 (string-append man "/man8")))
(define (copy-man-page target)
(lambda (file)
(install-file file target)))
(alist-cons-after (mkdir-p man5) (mkdir man8)
'install 'install-man-pages (for-each (copy-man-page man5)
(lambda* (#:key outputs #:allow-other-keys) (find-files "doc/docbook" "\\.5"))
(let* ((out (assoc-ref outputs "out")) (for-each (copy-man-page man8)
(man (string-append out "/share/man")) (find-files "doc/docbook" "\\.8"))
(man5 (string-append man "/man5")) #t))))
(man8 (string-append man "/man8")))
(define (copy-man-page target)
(lambda (file)
(install-file file target)))
(mkdir-p man5) (mkdir man8)
(for-each (copy-man-page man5)
(find-files "doc/docbook" "\\.5"))
(for-each (copy-man-page man8)
(find-files "doc/docbook" "\\.8"))
#t))
%standard-phases))
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "BINDIR=" (assoc-ref %outputs "out") (string-append "BINDIR=" (assoc-ref %outputs "out")
@ -980,25 +977,24 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases) ((#:phases phases)
`(alist-cons-after `(modify-phases ,phases
'configure 'configure-for-dbus (add-after 'configure 'configure-for-dbus
(lambda _ (lambda _
(let ((port (open-file ".config" "al"))) (let ((port (open-file ".config" "al")))
(display " (display "
CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS=y
CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_NEW=y
CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
(close-port port)) (close-port port))
#t) #t))
(alist-cons-after (add-after 'install-man-pages 'install-dbus-conf
'install-man-pages 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))
(let* ((out (assoc-ref outputs "out")) (dir (string-append out "/etc/dbus-1/system.d")))
(dir (string-append out "/etc/dbus-1/system.d"))) (mkdir-p dir)
(mkdir-p dir) (copy-file "dbus/dbus-wpa_supplicant.conf"
(copy-file "dbus/dbus-wpa_supplicant.conf" (string-append dir "/wpa_supplicant.conf")))
(string-append dir "/wpa_supplicant.conf")))) #t))))))))
,phases)))))))
(define-public wakelan (define-public wakelan
(package (package
@ -1014,22 +1010,22 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
"0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x")))) "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (replace 'configure
(let ((out (assoc-ref outputs "out"))) (lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append out "/bin")) (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/man/man1")) (mkdir-p (string-append out "/bin"))
(mkdir-p (string-append out "/share/man/man1"))
;; It's an old configure script that doesn't understand ;; It's an old configure script that doesn't understand
;; the extra options we pass. ;; the extra options we pass.
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--mandir=" out (string-append "--mandir=" out
"/share/man"))))) "/share/man")))))))
%standard-phases)
#:tests? #f)) #:tests? #f))
(home-page "http://kernel.org") ; really, no home page (home-page "http://kernel.org") ; really, no home page
(synopsis "Send a wake-on-LAN packet") (synopsis "Send a wake-on-LAN packet")
@ -1088,7 +1084,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
"HOST=_LINUX" "HOST=_LINUX"
"OPT_CFLAGS=-Wall -fno-strict-aliasing") "OPT_CFLAGS=-Wall -fno-strict-aliasing")
#:tests? #f ; no 'check' target. #:tests? #f ; no 'check' target.
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://acpica.org/") (home-page "http://acpica.org/")
(synopsis "Tools for the development and debug of ACPI tables") (synopsis "Tools for the development and debug of ACPI tables")
(description (description
@ -1198,7 +1194,7 @@ recover lost partitions and/or make non-booting disks bootable again.")
(base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9")))) (base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target #:tests? #f ; no check target
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "prefix=" out))))) (list (string-append "prefix=" out)))))
@ -1227,23 +1223,23 @@ environment variable is set and output is to tty.")
"#!$SHELL"))))) "#!$SHELL")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'build 'patch-/bin/sh (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'build 'patch-/bin/sh
;; Use the right shell when executing the watcher and (lambda* (#:key inputs #:allow-other-keys)
;; user-provided shell commands. ;; Use the right shell when executing the watcher and
(let ((bash (assoc-ref inputs "bash"))) ;; user-provided shell commands.
(substitute* '("src/direvent.c" "src/progman.c") (let ((bash (assoc-ref inputs "bash")))
(("\"/bin/sh\"") (substitute* '("src/direvent.c" "src/progman.c")
(string-append "\"" bash "/bin/sh\""))) (("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))
;; Adjust the 'shell.at' test accordingly. ;; Adjust the 'shell.at' test accordingly.
(substitute* "tests/testsuite" (substitute* "tests/testsuite"
(("SHELL=/bin/sh") (("SHELL=/bin/sh")
(string-append "SHELL=" bash "/bin/sh"))) (string-append "SHELL=" bash "/bin/sh")))
#t)) #t))))))
%standard-phases)))
(home-page "https://www.gnu.org/software/direvent/") (home-page "https://www.gnu.org/software/direvent/")
(synopsis "Daemon to monitor directories for events such as file removal") (synopsis "Daemon to monitor directories for events such as file removal")
(description (description
@ -1296,7 +1292,7 @@ various ways that may be running with too much privilege.")
"1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49")))) "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libcap-ng" ,libcap-ng))) (inputs `(("libcap-ng" ,libcap-ng)))
(home-page "http://www.smartmontools.org/") (home-page "https://www.smartmontools.org/")
(synopsis "S.M.A.R.T. harddisk control and monitoring tools") (synopsis "S.M.A.R.T. harddisk control and monitoring tools")
(description (description
"The smartmontools package contains utility programs to control and "The smartmontools package contains utility programs to control and
@ -1535,7 +1531,7 @@ displays a table of current bandwidth usage by pairs of hosts.")
(define-public munge (define-public munge
(package (package
(name "munge") (name "munge")
(version "0.5.12") (version "0.5.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/dun/munge/releases/" (uri (string-append "https://github.com/dun/munge/releases/"
@ -1543,7 +1539,7 @@ displays a table of current bandwidth usage by pairs of hosts.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1s0vlwgm3hcx75vcmjf2y3icy5nv8y07bx93w2cmm6a7x71y6wp9")))) "1nj486bbg1adfg298zck96vgx57kchcypc1zdz1n7w540vyksxcr"))))
(inputs (inputs
`(("openssl" ,openssl) `(("openssl" ,openssl)
("libgcrypt" ,libgcrypt))) ("libgcrypt" ,libgcrypt)))
@ -1700,7 +1696,7 @@ results (ndiff), and a packet generation and response analysis tool (nping).")
(list (string-append "DESTDIR=" out) (list (string-append "DESTDIR=" out)
"prefix=/")) "prefix=/"))
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs `(("python-2" ,python-2))) (inputs `(("python-2" ,python-2)))
(synopsis "Versatile resource statistics tool") (synopsis "Versatile resource statistics tool")
(description "Dstat is a versatile replacement for @command{vmstat}, (description "Dstat is a versatile replacement for @command{vmstat},

31
gnu/packages/algebra.scm
View file

@ -334,22 +334,21 @@ fast arithmetic.")
("mpfr" ,mpfr))) ("mpfr" ,mpfr)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(flint (assoc-ref inputs "flint")) (flint (assoc-ref inputs "flint"))
(gmp (assoc-ref inputs "gmp")) (gmp (assoc-ref inputs "gmp"))
(mpfr (assoc-ref inputs "mpfr"))) (mpfr (assoc-ref inputs "mpfr")))
;; do not pass "--enable-fast-install", which makes the ;; do not pass "--enable-fast-install", which makes the
;; homebrew configure process fail ;; homebrew configure process fail
(zero? (system* (zero? (system*
"./configure" "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--with-flint=" flint) (string-append "--with-flint=" flint)
(string-append "--with-gmp=" gmp) (string-append "--with-gmp=" gmp)
(string-append "--with-mpfr=" mpfr))))) (string-append "--with-mpfr=" mpfr)))))))))
%standard-phases)))
(synopsis "Arbitrary precision floating-point ball arithmetic") (synopsis "Arbitrary precision floating-point ball arithmetic")
(description (description
"Arb is a C library for arbitrary-precision floating-point ball "Arb is a C library for arbitrary-precision floating-point ball

38
gnu/packages/android.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,6 +26,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
@ -305,6 +307,42 @@ of device actions, such as installing and debugging apps, and it provides access
to a Unix shell that can run commands on the connected device or emulator.") to a Unix shell that can run commands on the connected device or emulator.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public android-udev-rules
(package
(name "android-udev-rules")
(version "20170910")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/M0Rf30/android-udev-rules")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 "0vic40n3si0dxag3dyc3hi3pn7cjpm5q378x8v2ys19n3iz9fp1g"))))
(build-system trivial-build-system)
(native-inputs `(("source" ,source)))
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let ((source (assoc-ref %build-inputs "source")))
(install-file (string-append source "/51-android.rules")
(string-append %output "/lib/udev/rules.d"))))))
(home-page "https://github.com/M0Rf30/android-udev-rules")
(synopsis "udev rules for Android devices")
(description "Provides a set of udev rules to allow using Android devices
with tools such as @command{adb} and @command{fastboot} without root
privileges. This package is intended to be added as a rule to the
@code{udev-service-type} in your @code{operating-system} configuration.
Additionally, an @code{adbusers} group must be defined and your user added to
it.
@emph{Simply installing this package will not have any effect.} It is meant
to be passed to the @code{udev} service.")
(license license:gpl3+)))
(define-public git-repo (define-public git-repo
(package (package
(name "git-repo") (name "git-repo")

25
gnu/packages/apr.scm
View file

@ -80,19 +80,18 @@ around or take advantage of platform-specific deficiencies or features.")
`(("expat" ,expat))) `(("expat" ,expat)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(apr (assoc-ref inputs "apr")) (apr (assoc-ref inputs "apr"))
(expat (assoc-ref inputs "expat"))) (expat (assoc-ref inputs "expat")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--with-apr=" apr) (string-append "--with-apr=" apr)
(string-append "--with-expat=" expat))))) (string-append "--with-expat=" expat)))))))
%standard-phases)
;; There are race conditions during 'make check'. Typically, the ;; There are race conditions during 'make check'. Typically, the
;; 'testall' executable is not built yet by the time 'make check' tries ;; 'testall' executable is not built yet by the time 'make check' tries

2
gnu/packages/aspell.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu> ;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

4
gnu/packages/assembly.scm
View file

@ -103,14 +103,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
(define-public lightning (define-public lightning
(package (package
(name "lightning") (name "lightning")
(version "2.1.0") (version "2.1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/lightning/lightning-" (uri (string-append "mirror://gnu/lightning/lightning-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz")))) "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("zlib" ,zlib))) (native-inputs `(("zlib" ,zlib)))
(synopsis "Library for generating assembly code at runtime") (synopsis "Library for generating assembly code at runtime")

261
gnu/packages/audio.scm
View file

@ -36,6 +36,7 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -79,6 +80,8 @@
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public alsa-modular-synth (define-public alsa-modular-synth
@ -186,7 +189,7 @@ streams from live audio.")
(define-public ardour (define-public ardour
(package (package
(name "ardour") (name "ardour")
(version "5.8") (version "5.12")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -203,7 +206,7 @@ streams from live audio.")
namespace ARDOUR { const char* revision = \"" version "\" ; }"))))) namespace ARDOUR { const char* revision = \"" version "\" ; }")))))
(sha256 (sha256
(base32 (base32
"1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1")) "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"))
(file-name (string-append name "-" version)))) (file-name (string-append name "-" version))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
@ -617,23 +620,21 @@ language and software synthesizer.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("/sbin/ldconfig") "true") (("/sbin/ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "libs")
#t) #t))
(alist-cons-after (add-after 'install 'install-symlink
'install (lambda _
'install-symlink (symlink "libclalsadrv.so"
(lambda _ (string-append (assoc-ref %outputs "out")
(symlink "libclalsadrv.so" "/lib/libclalsadrv.so.2"))))
(string-append (assoc-ref %outputs "out")
"/lib/libclalsadrv.so.2")))
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("fftw" ,fftw))) ("fftw" ,fftw)))
@ -972,11 +973,9 @@ follower.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack (add-after 'unpack 'remove-broken-symlinks
'remove-broken-symlinks (lambda _ (delete-file-recursively "m4") #t)))))
(lambda _ (delete-file-recursively "m4") #t)
%standard-phases)))
(inputs (inputs
`(("libsndfile" ,libsndfile) `(("libsndfile" ,libsndfile)
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
@ -1015,12 +1014,11 @@ also play midifiles using a Soundfont.")
("unzip" ,unzip))) ("unzip" ,unzip)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(substitute* "bootstrap" (("\r\n") "\n")) (substitute* "bootstrap" (("\r\n") "\n"))
(zero? (system* "sh" "bootstrap"))) (zero? (system* "sh" "bootstrap")))))))
%standard-phases)))
(home-page "http://www.audiocoding.com/faad2.html") (home-page "http://www.audiocoding.com/faad2.html")
(synopsis "MPEG-4 and MPEG-2 AAC decoder") (synopsis "MPEG-4 and MPEG-2 AAC decoder")
(description (description
@ -1130,7 +1128,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
(define-public guitarix (define-public guitarix
(package (package
(name "guitarix") (name "guitarix")
(version "0.35.6") (version "0.36.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1138,7 +1136,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41")))) "0nb0gwcmvc9xjh9pjasjbaqgpadanv4rw1njccpcmmin9xvicsqn"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -1674,7 +1672,7 @@ software.")
"TYPE=mdaPiano" "TYPE=mdaPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("lv2" ,lv2) `(("lv2" ,lv2)
("lvtk" ,lvtk))) ("lvtk" ,lvtk)))
@ -1697,7 +1695,7 @@ software.")
"TYPE=mdaEPiano" "TYPE=mdaEPiano"
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "http://elephly.net/lv2/mdaepiano.html") (home-page "http://elephly.net/lv2/mdaepiano.html")
(synopsis "LV2 port of the mda EPiano plugin") (synopsis "LV2 port of the mda EPiano plugin")
(description "An LV2 port of the mda EPiano VSTi."))) (description "An LV2 port of the mda EPiano VSTi.")))
@ -2090,19 +2088,19 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
(string-append "--with-default-path=" (string-append "--with-default-path="
(assoc-ref %outputs "out") "/etc/timidity")) (assoc-ref %outputs "out") "/etc/timidity"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'install 'install-config (add-after 'install 'install-config
(lambda _ (lambda _
(let ((out (string-append (assoc-ref %outputs "out") (let ((out (string-append (assoc-ref %outputs "out")
"/etc/timidity"))) "/etc/timidity")))
(mkdir-p out) (mkdir-p out)
(call-with-output-file (call-with-output-file
(string-append out "/timidity.cfg") (string-append out "/timidity.cfg")
(lambda (port) (lambda (port)
(format port (string-append "source " (format port (string-append "source "
(assoc-ref %build-inputs "freepats") (assoc-ref %build-inputs "freepats")
"/share/freepats/freepats.cfg")))))) "/share/freepats/freepats.cfg")))))
%standard-phases))) #t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("ao" ,ao) ("ao" ,ao)
@ -2141,16 +2139,15 @@ disks as various audio file formats.")
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'install 'remove-libvamp-hostsdk.la (add-after 'install 'remove-libvamp-hostsdk.la
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656 ;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656
(for-each delete-file (for-each delete-file
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(list (string-append out "/lib/libvamp-sdk.la") (list (string-append out "/lib/libvamp-sdk.la")
(string-append out "/lib/libvamp-hostsdk.la")))) (string-append out "/lib/libvamp-hostsdk.la"))))
#t) #t)))))
%standard-phases)))
(inputs (inputs
`(("libsndfile" ,libsndfile))) `(("libsndfile" ,libsndfile)))
(native-inputs (native-inputs
@ -2312,11 +2309,10 @@ Tracker 3 S3M and Impulse Tracker IT files.")
("file" ,file))) ("file" ,file)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'bootstrap (add-after 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "sh" "bootstrap"))) (zero? (system* "sh" "bootstrap")))))))
%standard-phases)))
(home-page "http://www.surina.net/soundtouch/") (home-page "http://www.surina.net/soundtouch/")
(synopsis (synopsis
"Audio processing library for changing tempo, pitch and playback rate") "Audio processing library for changing tempo, pitch and playback rate")
@ -2450,11 +2446,10 @@ portions of LAME.")
'(#:phases '(#:phases
;; Autoreconf is necessary because the audacity-compat patch modifies ;; Autoreconf is necessary because the audacity-compat patch modifies
;; .in files. ;; .in files.
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vif"))) (zero? (system* "autoreconf" "-vif")))))
%standard-phases)
#:tests? #f)) ;no 'check' target #:tests? #f)) ;no 'check' target
(home-page "http://www.portaudio.com/") (home-page "http://www.portaudio.com/")
(synopsis "Audio I/O library") (synopsis "Audio I/O library")
@ -2518,14 +2513,13 @@ synthesizer written in C++.")
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "CC" "gcc") (setenv "CC" "gcc")
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" (assoc-ref outputs "out"))))) (string-append "--prefix=" (assoc-ref outputs "out")))))))
%standard-phases)
;; No 'check' target. ;; No 'check' target.
#:tests? #f)) #:tests? #f))
(home-page "http://themaister.net/rsound.html") (home-page "http://themaister.net/rsound.html")
@ -2592,22 +2586,20 @@ result.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") #t) (chdir "libs") #t))
(alist-cons-after (add-after 'install 'install-symlink
'install (lambda _
'install-symlink (symlink "libzita-convolver.so"
(lambda _ (string-append (assoc-ref %outputs "out")
(symlink "libzita-convolver.so" "/lib/libzita-convolver.so.3"))))
(string-append (assoc-ref %outputs "out")
"/lib/libzita-convolver.so.3")))
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs `(("fftwf" ,fftwf))) (inputs `(("fftwf" ,fftwf)))
(home-page "http://kokkinizita.linuxaudio.org") (home-page "http://kokkinizita.linuxaudio.org")
(synopsis "Fast, partitioned convolution engine library") (synopsis "Fast, partitioned convolution engine library")
@ -2682,23 +2674,21 @@ provide high-quality sample rate conversion.")
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-makefile-and-enter-directory (add-after 'unpack 'patch-makefile-and-enter-directory
(lambda _ (lambda _
(substitute* "libs/Makefile" (substitute* "libs/Makefile"
(("ldconfig") "true") (("ldconfig") "true")
(("^LIBDIR =.*") "LIBDIR = lib\n")) (("^LIBDIR =.*") "LIBDIR = lib\n"))
(chdir "libs") (chdir "libs")
#t) #t))
(alist-cons-after (add-after 'install 'install-symlink
'install (lambda _
'install-symlink (symlink "libzita-alsa-pcmi.so"
(lambda _ (string-append (assoc-ref %outputs "out")
(symlink "libzita-alsa-pcmi.so" "/lib/libzita-alsa-pcmi.so.0"))))
(string-append (assoc-ref %outputs "out") ;; no configure script
"/lib/libzita-alsa-pcmi.so.0"))) (delete 'configure))))
;; no configure script
(alist-delete 'configure %standard-phases)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("fftw" ,fftw))) ("fftw" ,fftw)))
@ -2926,3 +2916,62 @@ mixers.")
(define-public python2-pyalsaaudio (define-public python2-pyalsaaudio
(package-with-python2 python-pyalsaaudio)) (package-with-python2 python-pyalsaaudio))
(define-public snd
(package
(name "snd")
(version "17.7")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
"snd-" version ".tar.gz"))
(sha256
(base32
"1vm0dy5qlycqkima7y5ajzvazyjybifa803fabjcpncjz08c26vp"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:tests? #f ; no tests
#:out-of-source? #f ; for the 'install-doc' phase
#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(docdir (string-append out "/share/doc/snd")))
(list "--with-alsa" "--with-jack" "--with-gmp"
(string-append "--with-doc-dir=" docdir)))
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(docdir (string-append out "/share/doc/snd")))
(mkdir-p docdir)
(for-each
(lambda (f)
(install-file f docdir))
(find-files "." "\\.html$|COPYING"))
(copy-recursively "pix" (string-append docdir "/pix"))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("fftw" ,fftw)
("flac" ,flac)
("gmp" ,gmp)
("gsl" ,gsl)
("gtk+" ,gtk+)
("jack" ,jack-1)
("libsamplerate" ,libsamplerate)
("mpc" ,mpc)
("mpfr" ,mpfr)
("mpg123" ,mpg123)
("speex" ,speex)
("timidity++" ,timidity++)
("vorbis-tools" ,vorbis-tools)
("wavpack" ,wavpack)))
(synopsis "Sound editor")
(home-page "https://ccrma.stanford.edu/software/snd/")
(description
"Snd is a sound editor modelled loosely after Emacs. It can be
customized and extended using either the s7 Scheme implementation (included in
the Snd sources), Ruby, or Forth.")
(license (license:non-copyleft "file://COPYING"))))

5
gnu/packages/autotools.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017 ng0 <ng0@libertad.pw> ;;; Copyright © 2017 ng0 <ng0@libertad.pw>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -194,7 +195,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
(define-public autoconf-archive (define-public autoconf-archive
(package (package
(name "autoconf-archive") (name "autoconf-archive")
(version "2017.03.21") (version "2017.09.28")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -202,7 +203,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq")))) "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.gnu.org/software/autoconf-archive/") (home-page "https://www.gnu.org/software/autoconf-archive/")
(synopsis "Collection of freely reusable Autoconf macros") (synopsis "Collection of freely reusable Autoconf macros")

46
gnu/packages/backup.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -119,7 +119,7 @@ spying and/or modification by the server.")
(define-public par2cmdline (define-public par2cmdline
(package (package
(name "par2cmdline") (name "par2cmdline")
(version "0.7.3") (version "0.7.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/Parchive/par2cmdline/archive/v" (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
@ -127,7 +127,7 @@ spying and/or modification by the server.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0dqwarc2aw5clgpf24d9dxh43b0k0z3l6kksn30arx9bdlmrk5rx")))) "0iwwskiag3262mvhinvnbk6n0qh6sh56m86y4d0m285v0jl0y9pa"))))
(native-inputs (native-inputs
`(("automake" ,automake) `(("automake" ,automake)
("autoconf" ,autoconf))) ("autoconf" ,autoconf)))
@ -279,20 +279,20 @@ random access nor for in-place modification.")
("nettle" ,nettle))) ("nettle" ,nettle)))
(arguments (arguments
`(#:parallel-build? #f ;race conditions `(#:parallel-build? #f ;race conditions
#:phases (alist-cons-before #:phases
'build 'remove-Werror (modify-phases %standard-phases
;; rdup uses a deprecated function from libarchive (add-before 'build 'remove-Werror
(lambda _ ;; rdup uses a deprecated function from libarchive
(substitute* "GNUmakefile" (lambda _
(("^(CFLAGS=.*)-Werror" _ front) front))) (substitute* "GNUmakefile"
(alist-cons-before (("^(CFLAGS=.*)-Werror" _ front) front))
'check 'pre-check #t))
(lambda _ (add-before 'check 'pre-check
(setenv "HOME" (getcwd)) (lambda _
(substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" (setenv "HOME" (getcwd))
(("/bin/cat") (which "cat")))) (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp"
(("/bin/cat") (which "cat")))
%standard-phases)))) #t)))))
(home-page "http://archive.miek.nl/projects/rdup/index.html") (home-page "http://archive.miek.nl/projects/rdup/index.html")
(synopsis "Provide a list of files to backup") (synopsis "Provide a list of files to backup")
(description (description
@ -322,9 +322,9 @@ list and implement the backup strategy.")
"CC=gcc") "CC=gcc")
#:tests? #f ;test input not distributed #:tests? #f ;test input not distributed
#:phases #:phases
(alist-delete ;; no configure phase
'configure ;no configure phase (modify-phases %standard-phases
%standard-phases))) (delete 'configure))))
(home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki") (home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki")
(synopsis "Tar-compatible archiver") (synopsis "Tar-compatible archiver")
(description (description
@ -448,13 +448,13 @@ detection, and lossless compression.")
(define-public borg (define-public borg
(package (package
(name "borg") (name "borg")
(version "1.0.11") (version "1.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "borgbackup" version)) (uri (pypi-uri "borgbackup" version))
(sha256 (sha256
(base32 (base32
"14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw")) "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each '(for-each
@ -526,7 +526,7 @@ detection, and lossless compression.")
("python-pytest" ,python-pytest-3.0) ("python-pytest" ,python-pytest-3.0)
;; For generating the documentation. ;; For generating the documentation.
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) ("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme)))
(inputs (inputs
`(("acl" ,acl) `(("acl" ,acl)
("lz4" ,lz4) ("lz4" ,lz4)

12
gnu/packages/base.scm
View file

@ -909,12 +909,12 @@ the 'share/locale' sub-directory of this package.")
,@(package-arguments glibc)))) ,@(package-arguments glibc))))
(substitute-keyword-arguments args (substitute-keyword-arguments args
((#:phases phases) ((#:phases phases)
`(alist-replace `(modify-phases ,phases
'build (replace 'build
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(zero? (system* "make" "localedata/install-locales" (zero? (system* "make" "localedata/install-locales"
"-j" (number->string (parallel-job-count))))) "-j" (number->string (parallel-job-count))))))
(alist-delete 'install ,phases))) (delete 'install)))
((#:configure-flags flags) ((#:configure-flags flags)
`(append ,flags `(append ,flags
;; Use $(libdir)/locale/X.Y as is the case by default. ;; Use $(libdir)/locale/X.Y as is the case by default.

67
gnu/packages/benchmark.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,8 +25,10 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages storage)) #:use-module (gnu packages storage)
#:use-module (ice-9 match))
(define-public fio (define-public fio
(package (package
@ -103,3 +106,65 @@ is to write a job file matching the I/O load one wants to simulate.")
;; are covered by other licenses. ;; are covered by other licenses.
(license (list license:gpl2 license:gpl2+ license:bsd-2 (license (list license:gpl2 license:gpl2+ license:bsd-2
license:public-domain)))) license:public-domain))))
;; Parameterized in anticipation of m(va)pich support
(define (imb mpi)
(package
(name (string-append "imb-" (package-name mpi)))
(version "2017.2")
(source
(origin
(method url-fetch)
(uri (match (string-split version #\.)
((major minor)
(string-append
"https://software.intel.com/sites/default/files/managed/76/6c/IMB_"
major "_Update" minor ".tgz"))))
(sha256 (base32 "11nczxm686rsppmw9gjc2p2sxc0jniv5kv18yxm1lzp5qfh5rqyb"))))
(build-system gnu-build-system)
(inputs
`(("mpi" ,mpi)))
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(let ((mpi-home (assoc-ref inputs "mpi")))
(zero?
;; Not safe for parallel build
(system* "make" "-C" "imb/src" "-f" "make_mpich" "SHELL=sh"
(string-append "MPI_HOME=" mpi-home))))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name))
(bin (string-append out "/bin")))
(with-directory-excursion "imb/src"
(for-each
(lambda (file)
(install-file file bin))
'("IMB-IO" "IMB-EXT" "IMB-MPI1" "IMB-NBC" "IMB-RMA")))
(mkdir-p doc)
(with-directory-excursion "imb"
(copy-recursively "license" doc)))
#t)))))
(home-page "https://software.intel.com/en-us/articles/intel-mpi-benchmarks")
(synopsis "Intel MPI Benchmarks")
(description
"This package provides benchmarks for implementations of the @dfn{Message
Passing Interface} (MPI). It contains MPI performance measurements for
point-to-point and global communication, and file, operations for a range of
message sizes. The generated benchmark data fully characterize:
@itemize
@item
Performance of a cluster system, including node performance, network latency,
and throughput;
@item
Efficiency of the MPI implementation.
@end itemize")
(license license:cpl1.0)))
(define-public imb-openmpi (imb openmpi))

256
gnu/packages/bioinformatics.scm
View file

@ -369,32 +369,33 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
'(#:tests? #f '(#:tests? #f
#:make-flags (list (string-append "BINDIR=" %output "/bin")) #:make-flags (list (string-append "BINDIR=" %output "/bin"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'unpack-tarballs (add-after 'unpack 'unpack-tarballs
(lambda _ (lambda _
;; FIXME: Bedops includes tarballs of minimally patched upstream ;; FIXME: Bedops includes tarballs of minimally patched upstream
;; libraries jansson, zlib, and bzip2. We cannot just use stock ;; libraries jansson, zlib, and bzip2. We cannot just use stock
;; libraries because at least one of the libraries (zlib) is ;; libraries because at least one of the libraries (zlib) is
;; patched to add a C++ function definition (deflateInit2cpp). ;; patched to add a C++ function definition (deflateInit2cpp).
;; Until the Bedops developers offer a way to link against system ;; Until the Bedops developers offer a way to link against system
;; libraries we have to build the in-tree copies of these three ;; libraries we have to build the in-tree copies of these three
;; libraries. ;; libraries.
;; See upstream discussion: ;; See upstream discussion:
;; https://github.com/bedops/bedops/issues/124 ;; https://github.com/bedops/bedops/issues/124
;; Unpack the tarballs to benefit from shebang patching. ;; Unpack the tarballs to benefit from shebang patching.
(with-directory-excursion "third-party" (with-directory-excursion "third-party"
(and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2")) (and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2"))
(zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2")) (zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2"))
(zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2")))) (zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2"))))
;; Disable unpacking of tarballs in Makefile. ;; Disable unpacking of tarballs in Makefile.
(substitute* "system.mk/Makefile.linux" (substitute* "system.mk/Makefile.linux"
(("^\tbzcat .*") "\t@echo \"not unpacking\"\n") (("^\tbzcat .*") "\t@echo \"not unpacking\"\n")
(("\\./configure") "CONFIG_SHELL=bash ./configure")) (("\\./configure") "CONFIG_SHELL=bash ./configure"))
(substitute* "third-party/zlib-1.2.7/Makefile.in" (substitute* "third-party/zlib-1.2.7/Makefile.in"
(("^SHELL=.*$") "SHELL=bash\n"))) (("^SHELL=.*$") "SHELL=bash\n"))
(alist-delete 'configure %standard-phases)))) #t))
(delete 'configure))))
(home-page "https://github.com/bedops/bedops") (home-page "https://github.com/bedops/bedops")
(synopsis "Tools for high-performance genomic feature operations") (synopsis "Tools for high-performance genomic feature operations")
(description (description
@ -1325,20 +1326,21 @@ splice junctions between exons.")
(arguments (arguments
'(#:tests? #f ;no "check" target '(#:tests? #f ;no "check" target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (let ((bin (string-append
(assoc-ref outputs "out") "/bin")) (assoc-ref outputs "out") "/bin"))
(doc (string-append (doc (string-append
(assoc-ref outputs "out") "/share/doc/bwa")) (assoc-ref outputs "out") "/share/doc/bwa"))
(man (string-append (man (string-append
(assoc-ref outputs "out") "/share/man/man1"))) (assoc-ref outputs "out") "/share/man/man1")))
(install-file "bwa" bin) (install-file "bwa" bin)
(install-file "README.md" doc) (install-file "README.md" doc)
(install-file "bwa.1" man))) (install-file "bwa.1" man))
;; no "configure" script #t))
(alist-delete 'configure %standard-phases)))) ;; no "configure" script
(delete 'configure))))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
;; Non-portable SSE instructions are used so building fails on platforms ;; Non-portable SSE instructions are used so building fails on platforms
;; other than x86_64. ;; other than x86_64.
@ -1815,10 +1817,9 @@ time.")
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'set-env (add-after 'unpack 'set-env
(lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1")) (lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1") #t)))))
%standard-phases)))
(inputs (inputs
`(("python-numpy" ,python2-numpy) `(("python-numpy" ,python2-numpy)
("python-pysam" ,python2-pysam) ("python-pysam" ,python2-pysam)
@ -2365,19 +2366,18 @@ dynamic programming or a variety of heuristics.")
(arguments (arguments
`(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'use-shared-boost-libs-and-set-bamtools-paths (add-after 'unpack 'use-shared-boost-libs-and-set-bamtools-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("set\\(Boost_USE_STATIC_LIBS ON\\)") (("set\\(Boost_USE_STATIC_LIBS ON\\)")
"set(Boost_USE_STATIC_LIBS OFF)") "set(Boost_USE_STATIC_LIBS OFF)")
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include") (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include")
(string-append (assoc-ref inputs "bamtools") "/include/bamtools"))) (string-append (assoc-ref inputs "bamtools") "/include/bamtools")))
(substitute* "src/CMakeLists.txt" (substitute* "src/CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib") (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib")
(string-append (assoc-ref inputs "bamtools") "/lib/bamtools"))) (string-append (assoc-ref inputs "bamtools") "/lib/bamtools")))
#t) #t)))))
%standard-phases)))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("bamtools" ,bamtools) ("bamtools" ,bamtools)
@ -2544,15 +2544,15 @@ results. The FASTX-Toolkit tools perform some of these preprocessing tasks.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/bin/")) "/bin/"))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'check (replace 'check
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "PATH" (string-append (setenv "PATH" (string-append
(assoc-ref outputs "out") "/bin:" (assoc-ref outputs "out") "/bin:"
(getenv "PATH"))) (getenv "PATH")))
(chdir "../flexbar_v2.5_src/test") (chdir "../flexbar_v2.5_src/test")
(zero? (system* "bash" "flexbar_validate.sh"))) (zero? (system* "bash" "flexbar_validate.sh"))))
(alist-delete 'install %standard-phases)))) (delete 'install))))
(inputs (inputs
`(("tbb" ,tbb) `(("tbb" ,tbb)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -2788,21 +2788,21 @@ association studies (GWAS).")
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'generate-from-cython-sources (add-after 'unpack 'generate-from-cython-sources
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Delete these C files to force fresh generation from pyx sources. ;; Delete these C files to force fresh generation from pyx sources.
(delete-file "grit/sparsify_support_fns.c") (delete-file "grit/sparsify_support_fns.c")
(delete-file "grit/call_peaks_support_fns.c") (delete-file "grit/call_peaks_support_fns.c")
(substitute* "setup.py" (substitute* "setup.py"
(("Cython.Setup") "Cython.Build") (("Cython.Setup") "Cython.Build")
;; Add numpy include path to fix compilation ;; Add numpy include path to fix compilation
(("pyx\", \\]") (("pyx\", \\]")
(string-append "pyx\", ], include_dirs = ['" (string-append "pyx\", ], include_dirs = ['"
(assoc-ref inputs "python-numpy") (assoc-ref inputs "python-numpy")
"/lib/python2.7/site-packages/numpy/core/include/" "/lib/python2.7/site-packages/numpy/core/include/"
"']"))) #t) "']")))
%standard-phases))) #t)))))
(inputs (inputs
`(("python-scipy" ,python2-scipy) `(("python-scipy" ,python2-scipy)
("python-numpy" ,python2-numpy) ("python-numpy" ,python2-numpy)
@ -2845,28 +2845,29 @@ estimates transcript expression.")
'() '()
'("POPCNT_CAPABILITY=0"))) '("POPCNT_CAPABILITY=0")))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-sources (add-after 'unpack 'patch-sources
(lambda _ (lambda _
;; XXX Cannot use snippet because zip files are not supported ;; XXX Cannot use snippet because zip files are not supported
(substitute* "Makefile" (substitute* "Makefile"
(("^CC = .*$") "CC = gcc") (("^CC = .*$") "CC = gcc")
(("^CPP = .*$") "CPP = g++") (("^CPP = .*$") "CPP = g++")
;; replace BUILD_HOST and BUILD_TIME for deterministic build ;; replace BUILD_HOST and BUILD_TIME for deterministic build
(("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"") (("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")) (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))
(substitute* '("hisat-build" "hisat-inspect") (substitute* '("hisat-build" "hisat-inspect")
(("/usr/bin/env") (which "env")))) (("/usr/bin/env") (which "env")))
(alist-replace #t))
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(for-each (lambda (file) (for-each (lambda (file)
(install-file file bin)) (install-file file bin))
(find-files (find-files
"." "."
"hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))) "hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))
(alist-delete 'configure %standard-phases))))) #t))
(delete 'configure))))
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(inputs (inputs
@ -4680,23 +4681,21 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
`(#:parallel-build? #f ; not supported `(#:parallel-build? #f ; not supported
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; Allow 'konfigure.perl' to find 'package.prl'. ;; Allow 'konfigure.perl' to find 'package.prl'.
(setenv "PERL5LIB" (setenv "PERL5LIB"
(string-append ".:" (getenv "PERL5LIB"))) (string-append ".:" (getenv "PERL5LIB")))
;; The 'configure' script doesn't recognize things like ;; The 'configure' script doesn't recognize things like
;; '--enable-fast-install'. ;; '--enable-fast-install'.
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--build-prefix=" (getcwd) "/build") (string-append "--build-prefix=" (getcwd) "/build")
(string-append "--prefix=" out))))) (string-append "--prefix=" out))))))
(alist-cons-after (add-after 'unpack 'enter-dir
'unpack 'enter-dir (lambda _ (chdir "ngs-sdk") #t)))))
(lambda _ (chdir "ngs-sdk") #t)
%standard-phases))))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
;; According to the test ;; According to the test
;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) ;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i)
@ -5460,17 +5459,16 @@ sequences.")
"-f" "Makefile.Linux" "-f" "Makefile.Linux"
"CC=gcc ${CCFLAGS}") "CC=gcc ${CCFLAGS}")
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'enter-dir (add-after 'unpack 'enter-dir
(lambda _ (chdir "src") #t) (lambda _ (chdir "src") #t))
(alist-replace (replace 'install
'install (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
(let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (mkdir-p bin)
(mkdir-p bin) (copy-recursively "../bin" bin))))
(copy-recursively "../bin" bin)))
;; no "configure" script ;; no "configure" script
(alist-delete 'configure %standard-phases))))) (delete 'configure))))
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(home-page "http://bioinf.wehi.edu.au/subread-package/") (home-page "http://bioinf.wehi.edu.au/subread-package/")
(synopsis "Tool kit for processing next-gen sequencing data") (synopsis "Tool kit for processing next-gen sequencing data")
@ -6163,7 +6161,7 @@ SELECT or UPDATE queries to an end-point.")
(define-public vsearch (define-public vsearch
(package (package
(name "vsearch") (name "vsearch")
(version "2.4.4") (version "2.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6173,7 +6171,7 @@ SELECT or UPDATE queries to an end-point.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1d8a4gjwaqdv57krlr80x18mg5py1bbdiqs5m0jdn38filc9z40k")) "1k8wf3qns4mqrsizywbkqcasqjw000m4drxsag3qd7390pwvf9kz"))
(patches (search-patches "vsearch-unbundle-cityhash.patch")) (patches (search-patches "vsearch-unbundle-cityhash.patch"))
(snippet (snippet
'(begin '(begin

33
gnu/packages/bittorrent.scm
View file

@ -74,23 +74,24 @@
"gui")) ; graphical user interface "gui")) ; graphical user interface
(arguments (arguments
'(#:glib-or-gtk-wrap-excluded-outputs '("out") '(#:glib-or-gtk-wrap-excluded-outputs '("out")
#:phases (alist-cons-after #:phases
'install 'move-gui (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'move-gui
;; Move the GUI to its own output, so that "out" doesn't (lambda* (#:key outputs #:allow-other-keys)
;; depend on GTK+. ;; Move the GUI to its own output, so that "out" doesn't
(let ((out (assoc-ref outputs "out")) ;; depend on GTK+.
(gui (assoc-ref outputs "gui"))) (let ((out (assoc-ref outputs "out"))
(mkdir-p (string-append gui "/bin")) (gui (assoc-ref outputs "gui")))
(rename-file (string-append out "/bin/transmission-gtk") (mkdir-p (string-append gui "/bin"))
(string-append gui (rename-file (string-append out "/bin/transmission-gtk")
"/bin/transmission-gtk")) (string-append gui
"/bin/transmission-gtk"))
;; Move the '.desktop' file as well. ;; Move the '.desktop' file as well.
(mkdir (string-append gui "/share")) (mkdir (string-append gui "/share"))
(rename-file (string-append out "/share/applications") (rename-file (string-append out "/share/applications")
(string-append gui "/share/applications")))) (string-append gui "/share/applications")))
%standard-phases))) #t)))))
(inputs (inputs
`(("inotify-tools" ,inotify-tools) `(("inotify-tools" ,inotify-tools)
("libevent" ,libevent) ("libevent" ,libevent)

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

@ -70,7 +70,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public meson (define-public meson
(package (package
(name "meson") (name "meson")
(version "0.42.0") (version "0.42.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/" (uri (string-append "https://github.com/mesonbuild/meson/"
@ -78,7 +78,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vyp9rkymzzzilhnf04ryszslyp9a0y0wf4agyijd4w5lcnqlcbc")))) "1494hdnd40g2v6pky34j0f2iwc6kwn51vck37qwz7nl2xr17b18q"))))
(build-system python-build-system) (build-system python-build-system)
(inputs `(("ninja", ninja))) (inputs `(("ninja", ninja)))
(propagated-inputs `(("python" ,python))) (propagated-inputs `(("python" ,python)))
@ -97,7 +97,7 @@ Python.")
(package (package
(inherit meson) (inherit meson)
(name "meson-for-build") (name "meson-for-build")
(version "0.42.0") (version "0.42.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/" (uri (string-append "https://github.com/mesonbuild/meson/"
@ -105,7 +105,7 @@ Python.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vyp9rkymzzzilhnf04ryszslyp9a0y0wf4agyijd4w5lcnqlcbc")) "1494hdnd40g2v6pky34j0f2iwc6kwn51vck37qwz7nl2xr17b18q"))
(patches (search-patches "meson-for-build-rpath.patch")))) (patches (search-patches "meson-for-build-rpath.patch"))))
;; People should probably install "meson", not "meson-for-build". ;; People should probably install "meson", not "meson-for-build".

24
gnu/packages/calendar.scm
View file

@ -84,13 +84,13 @@ data units.")
(define-public khal (define-public khal
(package (package
(name "khal") (name "khal")
(version "0.9.5") (version "0.9.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "khal" version)) (uri (pypi-uri "khal" version))
(sha256 (sha256
(base32 (base32
"0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr")))) "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -99,18 +99,24 @@ data units.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make installed package available for running the tests ;; Make installed package available for running the tests
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(zero? (system* "make" "--directory=doc/" "man")) (and
(install-file (zero? (system* "make" "--directory=doc/" "man"))
"doc/build/man/khal.1" (install-file
(string-append (assoc-ref outputs "out") "/share/man/man1")))) "doc/build/man/khal.1"
(string-append (assoc-ref outputs "out") "/share/man/man1")))))
;; The tests require us to choose a timezone.
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The tests require us to choose a timezone.
(setenv "TZ" (setenv "TZ"
(string-append (assoc-ref inputs "tzdata") (string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo/Zulu")) "/share/zoneinfo/Zulu"))
(zero? (system* "py.test" "tests"))))))) (zero? (system* "py.test" "tests" "-k"
(string-append
;; These tests are known to fail in when not
;; running in a TTY:
;; https://github.com/pimutils/khal/issues/683
"not test_printics_read_from_stdin "
"and not test_import_from_stdin"))))))))
(native-inputs (native-inputs
;; XXX Uses tmpdir_factory, introduced in pytest 2.8. ;; XXX Uses tmpdir_factory, introduced in pytest 2.8.
`(("python-pytest" ,python-pytest-3.0) `(("python-pytest" ,python-pytest-3.0)

2
gnu/packages/cdrom.scm
View file

@ -454,7 +454,7 @@ the data.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:phases (alist-delete 'configure %standard-phases) #:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "PREFIX=" (string-append "PREFIX="
(assoc-ref %outputs "out"))))) (assoc-ref %outputs "out")))))

48
gnu/packages/check.scm
View file

@ -9,6 +9,8 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -63,6 +65,20 @@ faults or other signals. The output from unit tests can be used within
source code editors and IDEs.") source code editors and IDEs.")
(license lgpl2.1+))) (license lgpl2.1+)))
;; XXX: Some packages require this newer version. Incorporate this
;; into the main 'check' package during the next rebuild cycle.
(define-public check-0.11.0
(package
(inherit check)
(version "0.11.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libcheck/check/releases"
"/download/" version "/check-" version ".tar.gz"))
(sha256
(base32
"05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"))))))
(define-public cunit (define-public cunit
(package (package
(name "cunit") (name "cunit")
@ -77,11 +93,10 @@ source code editors and IDEs.")
"057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm")))) "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:phases (arguments '(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'autoconf (add-before 'configure 'autoconf
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("automake" ,automake) `(("automake" ,automake)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
@ -294,3 +309,26 @@ generation.")
C++ but is used in C and C++ projects and frequently used in embedded systems C++ but is used in C and C++ projects and frequently used in embedded systems
but it works for any C/C++ project.") but it works for any C/C++ project.")
(license bsd-3))) (license bsd-3)))
(define-public python-parameterized
(package
(name "python-parameterized")
(version "0.6.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parameterized" version))
(sha256
(base32
"1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; there are no tests
(home-page "https://github.com/wolever/parameterized")
(synopsis "Parameterized testing with any Python test framework")
(description
"Parameterized is a Python library that aims to fix parameterized testing
for every Python test framework. It supports nose, py.test, and unittest.")
(license bsd-2)))
(define-public python2-parameterized
(package-with-python2 python-parameterized))

6
gnu/packages/code.scm
View file

@ -58,7 +58,11 @@
;; Needed to have cflow-mode.el installed. ;; Needed to have cflow-mode.el installed.
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(arguments
'(#:configure-flags (list (string-append "CPPFLAGS="
"-D" "CFLOW_PREPROC=\\\""
(assoc-ref %build-inputs "gcc")
"/bin/cpp\\\""))))
(home-page "https://www.gnu.org/software/cflow/") (home-page "https://www.gnu.org/software/cflow/")
(synopsis "Create a graph of control flow within a program") (synopsis "Create a graph of control flow within a program")
(description (description

39
gnu/packages/compression.scm
View file

@ -16,7 +16,7 @@
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -479,7 +479,7 @@ some compression ratio).")
(description (description
"Lzip is a lossless data compressor with a user interface similar to the "Lzip is a lossless data compressor with a user interface similar to the
one of gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses one of gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses
more than bzip2, which makes it well suited for software distribution and data more than bzip2, which makes it well-suited for software distribution and data
archiving. Lzip is a clean implementation of the LZMA algorithm.") archiving. Lzip is a clean implementation of the LZMA algorithm.")
(license license:gpl3+))) (license license:gpl3+)))
@ -530,14 +530,14 @@ decompressors when faced with corrupted input.")
`(("which" ,which))) `(("which" ,which)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'patch-source-shebangs 'unpatch-source-shebang (add-after 'patch-source-shebangs 'unpatch-source-shebang
;; revert the patch-shebang phase on a script which is ;; revert the patch-shebang phase on a script which is
;; in fact test data ;; in fact test data
(lambda _ (lambda _
(substitute* "tests/shar-1.ok" (substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh"))) (((which "sh")) "/bin/sh"))
%standard-phases))) #t)))))
(home-page "https://www.gnu.org/software/sharutils/") (home-page "https://www.gnu.org/software/sharutils/")
(synopsis "Archives in shell scripts, uuencode/uudecode") (synopsis "Archives in shell scripts, uuencode/uudecode")
(description (description
@ -1312,7 +1312,7 @@ RAR archives.")
(define-public zstd (define-public zstd
(package (package
(name "zstd") (name "zstd")
(version "1.3.1") (version "1.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/facebook/zstd/archive/v" (uri (string-append "https://github.com/facebook/zstd/archive/v"
@ -1320,17 +1320,7 @@ RAR archives.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1imddqjhczira626nf3nqmjwj3wb37xcfcwgkjydv2k6fpfbjbri")) "12krs9k5f408kyn0d7dwxqyc67177mgd14783ay10rafqsim8l5c"))))
(modules '((guix build utils)))
(snippet
;; Remove non-free source files.
'(begin
(for-each delete-file-recursively
(list
;; Commercial use of the following is not allowed.
"examples"
"LICENSE-examples"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1349,7 +1339,10 @@ zlib. In most scenarios, both compression and decompression can be performed in
trade-off between compression ratio and speed, without affecting decompression trade-off between compression ratio and speed, without affecting decompression
speed.") speed.")
(license (list license:bsd-3 ; the main top-level LICENSE file (license (list license:bsd-3 ; the main top-level LICENSE file
license:bsd-2 ; quite a few files have but 2 clauses license:bsd-2 ; many files explicitly state 2-Clause
license:gpl2 ; the mail top-level COPYING file
license:gpl3+ ; tests/gzip/*.sh
license:expat ; lib/dictBuilder/divsufsort.[ch]
license:public-domain ; zlibWrapper/examples/fitblk* license:public-domain ; zlibWrapper/examples/fitblk*
license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h}

31
gnu/packages/conky.scm
View file

@ -50,22 +50,21 @@
;; TODO: add 'ncurses.pc' to the ncurses package. ;; TODO: add 'ncurses.pc' to the ncurses package.
"-DBUILD_NCURSES=false") "-DBUILD_NCURSES=false")
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'add-freetype-to-search-path (add-after 'unpack 'add-freetype-to-search-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/ConkyPlatformChecks.cmake" (substitute* "cmake/ConkyPlatformChecks.cmake"
(("set\\(INCLUDE_SEARCH_PATH") (("set\\(INCLUDE_SEARCH_PATH")
(string-append (string-append
"set(INCLUDE_SEARCH_PATH " "set(INCLUDE_SEARCH_PATH "
(assoc-ref inputs "freetype") "/include/freetype2 "))) (assoc-ref inputs "freetype") "/include/freetype2 ")))
#t) #t))
(alist-replace (replace 'install
'install (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin)
(mkdir-p bin) (install-file "src/conky" bin))
(install-file "src/conky" bin))) #t)))))
%standard-phases))))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("ncurses" ,ncurses) ("ncurses" ,ncurses)

4
gnu/packages/crypto.scm
View file

@ -58,7 +58,7 @@
(define-public libsodium (define-public libsodium
(package (package
(name "libsodium") (name "libsodium")
(version "1.0.14") (version "1.0.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append (uri (list (string-append
@ -69,7 +69,7 @@
"releases/old/libsodium-" version ".tar.gz"))) "releases/old/libsodium-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1rvylybhxyn6ap3hrcingsl737zrqg12l7r91ns93j7xjz889z1w")))) "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Portable NaCl-based crypto library") (synopsis "Portable NaCl-based crypto library")
(description (description

40
gnu/packages/cups.scm
View file

@ -57,7 +57,7 @@
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.14.1") (version "1.17.7")
(source(origin (source(origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -65,7 +65,7 @@
"cups-filters-" version ".tar.xz")) "cups-filters-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0175jhqpsyn7bkh7w43ydhyws5zsdak05hr1fsadvzslvwqkffgi")) "1mg397kgfx0rs9j852f8ppmvaz2al5l75ildbgiqg6j3gwq5jssw"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; install backends, banners and filters to cups-filters output ;; install backends, banners and filters to cups-filters output
@ -93,6 +93,13 @@
#:configure-flags #:configure-flags
`("--disable-driverless" ; TODO: enable this `("--disable-driverless" ; TODO: enable this
"--disable-mutool" ; depends on yet another PDF library (mupdf) "--disable-mutool" ; depends on yet another PDF library (mupdf)
;; Look for the "domain socket of CUPS" in /var/run/cups.
"--localstatedir=/var"
;; Free software for the win.
"--with-acroread-path=evince"
,(string-append "--with-test-font-path=" ,(string-append "--with-test-font-path="
(assoc-ref %build-inputs "font-dejavu") (assoc-ref %build-inputs "font-dejavu")
"/share/fonts/truetype/DejaVuSans.ttf") "/share/fonts/truetype/DejaVuSans.ttf")
@ -103,7 +110,34 @@
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash")
"/bin/bash") "/bin/bash")
,(string-append "--with-rcdir=" ,(string-append "--with-rcdir="
(assoc-ref %outputs "out") "/etc/rc.d")))) (assoc-ref %outputs "out") "/etc/rc.d"))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-foomatic-hardcoded-file-names
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Foomatic has hardcoded file names we need to fix.
(let ((out (assoc-ref outputs "out"))
(gs (assoc-ref inputs "ghostscript")))
(substitute* "filter/foomatic-rip/foomaticrip.c"
(("/usr/local/lib/cups/filter")
(string-append out "/lib/cups/filter")))
#t)))
(add-after 'install 'wrap-filters
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Some filters expect to find 'gs' in $PATH. We cannot
;; just hard-code its absolute file name in the source
;; because foomatic-rip, for example, has tests like
;; 'startswith(cmd, "gs")'.
(let ((out (assoc-ref outputs "out"))
(ghostscript (assoc-ref inputs "ghostscript")))
(for-each (lambda (file)
(wrap-program file
`("PATH" ":" prefix
(,(string-append ghostscript
"/bin")))))
(find-files (string-append
out "/lib/cups/filter")))
#t))))))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for gdbus-codegen `(("glib" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))

21
gnu/packages/curl.scm
View file

@ -43,15 +43,15 @@
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
(version "7.55.0") (version "7.55.1")
(replacement curl-7.56.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.lzma")) version ".tar.xz"))
(patches (search-patches "curl-bounds-check.patch"))
(sha256 (sha256
(base32 (base32
"1785vxi0jamiv9d1wr1l45g0fm9ircxdfyfzf7ld8zv0z0i8bmfd")))) "1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.2 MiB of man3 pages "doc")) ;1.2 MiB of man3 pages
@ -131,3 +131,16 @@ tunneling, and so on.")
(license (license:non-copyleft "file://COPYING" (license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://curl.haxx.se/"))) (home-page "https://curl.haxx.se/")))
(define-public curl-7.56.0
(package
(inherit curl)
(version "7.56.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"0wni3zkw7jyrwgwkqnrkf2x2b7c78wsp7p4z6a246hz9l367nhrj"))))))

234
gnu/packages/databases.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
@ -19,6 +19,7 @@
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,8 +70,10 @@
#:use-module (gnu packages rdf) #:use-module (gnu packages rdf)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -154,14 +157,14 @@ and provides interfaces to the traditional file format.")
(define-public bdb (define-public bdb
(package (package
(name "bdb") (name "bdb")
(version "6.2.23") (version "6.2.32")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.oracle.com/berkeley-db/db-" (uri (string-append "http://download.oracle.com/berkeley-db/db-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7")))) "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; programs, libraries, headers (outputs '("out" ; programs, libraries, headers
"doc")) ; 94 MiB of HTML docs "doc")) ; 94 MiB of HTML docs
@ -169,34 +172,33 @@ and provides interfaces to the traditional file format.")
'(#:tests? #f ; no check target available '(#:tests? #f ; no check target available
#:disallowed-references ("doc") #:disallowed-references ("doc")
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch. ;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in" (substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*") (("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb"))) (string-append "docdir = " doc "/share/doc/bdb")))
(zero? (zero?
(system* "./dist/configure" (system* "./dist/configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash")) (string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash")) (string-append "SHELL=" (which "bash"))
;; Remove 7 MiB of .a files. ;; Remove 7 MiB of .a files.
"--disable-static" "--disable-static"
;; The compatibility mode is needed by some packages, ;; The compatibility mode is needed by some packages,
;; notably iproute2. ;; notably iproute2.
"--enable-compat185" "--enable-compat185"
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))) "--enable-cxx"))))))))
%standard-phases)))
(synopsis "Berkeley database") (synopsis "Berkeley database")
(description (description
"Berkeley DB is an embeddable database allowing developers the choice of "Berkeley DB is an embeddable database allowing developers the choice of
@ -224,39 +226,38 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
`(#:tests? #f ; no check target available `(#:tests? #f ; no check target available
#:disallowed-references ("doc") #:disallowed-references ("doc")
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
;; '--docdir' is not honored, so we need to patch. ;; '--docdir' is not honored, so we need to patch.
(substitute* "dist/Makefile.in" (substitute* "dist/Makefile.in"
(("docdir[[:blank:]]*=.*") (("docdir[[:blank:]]*=.*")
(string-append "docdir = " doc "/share/doc/bdb"))) (string-append "docdir = " doc "/share/doc/bdb")))
(zero? (zero?
(system* "./dist/configure" (system* "./dist/configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "CONFIG_SHELL=" (which "bash")) (string-append "CONFIG_SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash")) (string-append "SHELL=" (which "bash"))
;; Bdb doesn't recognize aarch64 as an architecture. ;; Bdb doesn't recognize aarch64 as an architecture.
,@(if (string=? "aarch64-linux" (%current-system)) ,@(if (string=? "aarch64-linux" (%current-system))
'("--build=aarch64-unknown-linux-gnu") '("--build=aarch64-unknown-linux-gnu")
'()) '())
;; Remove 7 MiB of .a files. ;; Remove 7 MiB of .a files.
"--disable-static" "--disable-static"
;; The compatibility mode is needed by some packages, ;; The compatibility mode is needed by some packages,
;; notably iproute2. ;; notably iproute2.
"--enable-compat185" "--enable-compat185"
;; The following flag is needed so that the inclusion ;; The following flag is needed so that the inclusion
;; of db_cxx.h into C++ files works; it leads to ;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))) "--enable-cxx"))))))))))
%standard-phases)))))
(define-public es-dump-restore (define-public es-dump-restore
(package (package
@ -357,6 +358,98 @@ and generic API, and was originally intended for use with dynamic web
applications.") applications.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public mongodb
(package
(name "mongodb")
(version "3.4.9")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mongodb/mongo/archive/r"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0gidwyvh3bdwmk2pccgkqkaln4ysgn8iwa7ihjzllsq0rdg95045"))
(patches
(list
(search-patch "mongodb-support-unknown-linux-distributions.patch")))))
(build-system gnu-build-system)
(inputs
`(("openssl" ,openssl)
("pcre" ,pcre)
("yaml-cpp" ,yaml-cpp)
("zlib" ,zlib)
("snappy" ,snappy)
("boost" ,boost)))
(native-inputs
`(("scons" ,scons)
("python" ,python-2)
("valgrind" ,valgrind)
("perl" ,perl)))
(arguments
`(#:phases
(let ((common-options
`(;; "--use-system-tcmalloc" TODO: Missing gperftools
"--use-system-pcre"
;; TODO
;; build/opt/mongo/db/fts/unicode/string.o failed: Error 1
;; --use-system-boost
"--use-system-snappy"
"--use-system-zlib"
"--use-system-valgrind"
;; "--use-system-stemmer" TODO: Missing relevant package
"--use-system-yaml"
"--disable-warnings-as-errors"
,(format #f "--jobs=~a" (parallel-job-count))
"--ssl")))
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase
(add-after 'unpack 'scons-propagate-environment
(lambda _
;; Modify the SConstruct file to arrange for
;; environment variables to be propagated.
(substitute* "SConstruct"
(("^env = Environment\\(")
"env = Environment(ENV=os.environ, "))
#t))
(add-after 'unpack 'create-version-file
(lambda _
(call-with-output-file "version.json"
(lambda (port)
(display ,(simple-format #f "{
\"version\": \"~A\"
}" version) port)))
#t))
(replace 'build
(lambda _
(zero? (apply system*
`("scons"
,@common-options
"mongod" "mongo" "mongos")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(or (not tests?)
(zero? (apply system*
`("scons"
,@common-options
"dbtest" "unittests"))))))
(replace 'install
(lambda _
(let ((bin (string-append (assoc-ref %outputs "out") "/bin")))
(install-file "mongod" bin)
(install-file "mongos" bin)
(install-file "mongo" bin))
#t))))))
(home-page "https://www.mongodb.org/")
(synopsis "High performance and high availability document database")
(description
"Mongo is a high-performance, high availability, schema-free
document-oriented database. A key goal of MongoDB is to bridge the gap
between key/value stores (which are fast and highly scalable) and traditional
RDBMS systems (which are deep in functionality).")
(license (list license:agpl3
;; Some parts are licensed under the Apache License
license:asl2.0))))
(define-public mysql (define-public mysql
(package (package
(name "mysql") (name "mysql")
@ -512,14 +605,14 @@ as a drop-in replacement of MySQL.")
(define-public postgresql (define-public postgresql
(package (package
(name "postgresql") (name "postgresql")
(version "9.6.5") (version "10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6")))) "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-uuid=e2fs") `(#:configure-flags '("--with-uuid=e2fs")
@ -1717,3 +1810,30 @@ implementation for Python.")
(define-public python2-orator (define-public python2-orator
(package-with-python2 (strip-python2-variant python-orator))) (package-with-python2 (strip-python2-variant python-orator)))
(define-public virtuoso-ose
(package
(name "virtuoso-ose")
(version "7.2.4.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/openlink/virtuoso-opensource/releases/"
"download/v" version "/virtuoso-opensource-" version ".tar.gz"))
(sha256
(base32 "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; Tests require a network connection.
(inputs
`(("openssl" ,openssl)
("net-tools" ,net-tools)))
(home-page "http://vos.openlinksw.com/owiki/wiki/VOS/")
(synopsis "Multi-model database system")
(description "Virtuoso is a scalable cross-platform server that combines
relational, graph, and document data management with web application server
and web services platform functionality.")
;; configure: error: ... can only be build on 64bit platforms
(supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))
(license license:gpl2)))

5
gnu/packages/dav.scm
View file

@ -55,13 +55,13 @@ clients.")
(define-public vdirsyncer (define-public vdirsyncer
(package (package
(name "vdirsyncer") (name "vdirsyncer")
(version "0.16.2") (version "0.16.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"19xqzxcgmpm2z56l2d4a1n4sqmhrnzfwx3d9avfzgldwyhlrz0da")))) "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -89,6 +89,7 @@ clients.")
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-localserver" ,python-pytest-localserver) ("python-pytest-localserver" ,python-pytest-localserver)
("python-pytest-subtesthack" ,python-pytest-subtesthack) ("python-pytest-subtesthack" ,python-pytest-subtesthack)
("python-urllib3" ,python-urllib3)
("python-wsgi-intercept" ,python-wsgi-intercept) ("python-wsgi-intercept" ,python-wsgi-intercept)
("radicale" ,radicale))) ("radicale" ,radicale)))
(propagated-inputs (propagated-inputs

70
gnu/packages/debug.scm
View file

@ -58,23 +58,24 @@
`(("perl" ,perl))) `(("perl" ,perl)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Makefile contains no install target ;; Makefile contains no install target
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(doc (string-append out "/share/doc/delta-" ,version))) (doc (string-append out "/share/doc/delta-" ,version)))
(begin (begin
(mkdir-p bin) (mkdir-p bin)
(mkdir-p doc) (mkdir-p doc)
(for-each (lambda (h) (for-each (lambda (h)
(install-file h doc)) (install-file h doc))
`("License.txt" ,@(find-files "www" ".*\\.html"))) `("License.txt" ,@(find-files "www" ".*\\.html")))
(for-each (lambda (b) (for-each (lambda (b)
(install-file b bin)) (install-file b bin))
`("delta" "multidelta" "topformflat"))))) `("delta" "multidelta" "topformflat"))))
(alist-delete 'configure %standard-phases)))) #t))
(delete 'configure))))
(home-page "http://delta.tigris.org/") (home-page "http://delta.tigris.org/")
(synopsis "Heuristical file minimizer") (synopsis "Heuristical file minimizer")
(description (description
@ -114,23 +115,24 @@ program to exhibit a bug.")
("sys-cpu" ,perl-sys-cpu) ("sys-cpu" ,perl-sys-cpu)
("term-readkey" ,perl-term-readkey))) ("term-readkey" ,perl-term-readkey)))
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'install 'set-load-paths (modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (add-after 'install 'set-load-paths
;; Tell creduce where to find the perl modules it needs. (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) ;; Tell creduce where to find the perl modules it needs.
(prog (string-append out "/bin/creduce"))) (let* ((out (assoc-ref outputs "out"))
(wrap-program (prog (string-append out "/bin/creduce")))
prog (wrap-program
`("PERL5LIB" ":" prefix prog
,(map (lambda (p) `("PERL5LIB" ":" prefix
(string-append (assoc-ref inputs p) ,(map (lambda (p)
"/lib/perl5/site_perl/" (string-append (assoc-ref inputs p)
,(package-version perl))) "/lib/perl5/site_perl/"
'("term-readkey" "exporter-lite" ,(package-version perl)))
"file-which" "getopt-tabular" '("term-readkey" "exporter-lite"
"regex-common" "sys-cpu")))))) "file-which" "getopt-tabular"
%standard-phases))) "regex-common" "sys-cpu")))))
#t)))))
(home-page "http://embed.cs.utah.edu/creduce") (home-page "http://embed.cs.utah.edu/creduce")
(synopsis "Reducer for interesting code") (synopsis "Reducer for interesting code")
(description (description

29
gnu/packages/display-managers.scm
View file

@ -132,16 +132,16 @@ Qt-style API for Wayland clients.")
(define-public sddm (define-public sddm
(package (package
(name "sddm") (name "sddm")
(version "0.15.0") (version "0.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/sddm/sddm" "https://github.com/sddm/sddm"
"/releases/download/v" version "/" "/releases/download/v" version "/"
"sddm-" version ".tar.gz")) "sddm-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0x1igkjm3k8q26xbmg0qah1fc2pn2sfc675w0xg42x7ncrdiw8d4")))) "0fwf1wsdak5yglykfyq4wbx9g9gi079n8ncjrdynz17hwwiql4z9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
@ -337,17 +337,18 @@ GTK+, lets you select a desktop session and log in to it.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'set-new-etc-location (modify-phases %standard-phases
(lambda _ (add-before 'configure 'set-new-etc-location
(substitute* "CMakeLists.txt" (lambda _
(("/etc") (substitute* "CMakeLists.txt"
(string-append (assoc-ref %outputs "out") "/etc")) (("/etc")
(("install.*systemd.*") (string-append (assoc-ref %outputs "out") "/etc"))
;; The build system's logic here is: if "Linux", then (("install.*systemd.*")
;; "systemd". Strip that. ;; The build system's logic here is: if "Linux", then
""))) ;; "systemd". Strip that.
%standard-phases) ""))
#t)))
#:configure-flags '("-DUSE_PAM=yes" #:configure-flags '("-DUSE_PAM=yes"
"-DUSE_CONSOLEKIT=no") "-DUSE_CONSOLEKIT=no")
#:tests? #f)) #:tests? #f))

12
gnu/packages/dns.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
@ -59,7 +59,7 @@
(define-public dnsmasq (define-public dnsmasq
(package (package
(name "dnsmasq") (name "dnsmasq")
(version "2.76") (version "2.78")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -67,7 +67,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb")))) "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -75,7 +75,7 @@
`(("dbus" ,dbus))) `(("dbus" ,dbus)))
(arguments (arguments
`(#:phases `(#:phases
(alist-delete 'configure %standard-phases) (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc" "CC=gcc"
"COPTS=\"-DHAVE_DBUS\"") "COPTS=\"-DHAVE_DBUS\"")
@ -483,14 +483,14 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.5.5") (version "2.6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1bwv2a290inkjb5x9a9sahls39rgaqyq9dwfrk1ilmzy9nmls87f")) "1zc3ybhcxgbysyy68kbmndh6xzy4jnr5iikyrf9s2sxzs1hlkq38"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

2
gnu/packages/electronics.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

153
gnu/packages/emacs.scm
View file

@ -304,14 +304,15 @@ editor (without an X toolkit)" )
"0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss")))) "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'post-install
(symlink "geiser-install.el" (lambda* (#:key outputs #:allow-other-keys)
(string-append (assoc-ref outputs "out") (symlink "geiser-install.el"
"/share/emacs/site-lisp/" (string-append (assoc-ref outputs "out")
"geiser-autoloads.el"))) "/share/emacs/site-lisp/"
%standard-phases))) "geiser-autoloads.el"))
#t)))))
(inputs `(("guile" ,guile-2.0))) (inputs `(("guile" ,guile-2.0)))
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://nongnu.org/geiser/") (home-page "http://nongnu.org/geiser/")
@ -770,25 +771,25 @@ provides an optional IDE-like error list.")
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (substitute* "Makefile"
(("/usr/local") (assoc-ref outputs "out")) (("/usr/local") (assoc-ref outputs "out"))
(("/site-lisp/emacs-wget") "/site-lisp"))) (("/site-lisp/emacs-wget") "/site-lisp"))
(alist-cons-before #t))
'build 'patch-exec-paths (add-before 'build 'patch-exec-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((wget (assoc-ref inputs "wget"))) (let ((wget (assoc-ref inputs "wget")))
(emacs-substitute-variables "wget.el" (emacs-substitute-variables "wget.el"
("wget-command" (string-append wget "/bin/wget"))))) ("wget-command" (string-append wget "/bin/wget"))))
(alist-cons-after #t))
'install 'post-install (add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads (emacs-generate-autoloads
"wget" (string-append (assoc-ref outputs "out") "wget" (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/"))) "/share/emacs/site-lisp/"))
%standard-phases))))) #t)))))
(home-page "http://www.emacswiki.org/emacs/EmacsWget") (home-page "http://www.emacswiki.org/emacs/EmacsWget")
(synopsis "Simple file downloader for Emacs based on wget") (synopsis "Simple file downloader for Emacs based on wget")
(description (description
@ -992,15 +993,16 @@ within a specified width. It is useful for displaying long track titles.")
"doc_DATA =\n"))))) "doc_DATA =\n")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'post-install
;; Add an autoloads file with the right name for guix.el. (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) ;; Add an autoloads file with the right name for guix.el.
(site (string-append out "/share/emacs/site-lisp"))) (let* ((out (assoc-ref outputs "out"))
(with-directory-excursion site (site (string-append out "/share/emacs/site-lisp")))
(symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))) (with-directory-excursion site
%standard-phases))) (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))
#t)))))
(native-inputs `(("emacs" ,emacs-minimal))) (native-inputs `(("emacs" ,emacs-minimal)))
(home-page "http://savannah.nongnu.org/projects/bbdb/") (home-page "http://savannah.nongnu.org/projects/bbdb/")
(synopsis "Contact management utility for Emacs") (synopsis "Contact management utility for Emacs")
@ -2461,7 +2463,7 @@ in @code{html-mode}.")
(define-public emacs-slime (define-public emacs-slime
(package (package
(name "emacs-slime") (name "emacs-slime")
(version "2.19") (version "2.20")
(source (source
(origin (origin
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
@ -2471,7 +2473,7 @@ in @code{html-mode}.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1jhaq5cn89k45nzyl0jd12gmjxnh1bq9jlfwrxba342agxsscb0p")))) "086lq5y4pvj9wihy0si02xxvyzpzz8mcg3hz1cvy9zxlyjwzr1gk"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (native-inputs
`(("texinfo" ,texinfo))) `(("texinfo" ,texinfo)))
@ -4973,7 +4975,7 @@ containing words from the rime project.")
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-async" ,emacs-async) `(("emacs-async" ,emacs-async)
("emacs-exwm" ,emacs-pyim-basedict) ("emacs-pyim-basedict" ,emacs-pyim-basedict)
("emacs-popup" ,emacs-popup) ("emacs-popup" ,emacs-popup)
("emacs-pos-tip" ,emacs-pos-tip))) ("emacs-pos-tip" ,emacs-pos-tip)))
(home-page "https://github.com/tumashu/pyim") (home-page "https://github.com/tumashu/pyim")
@ -4982,6 +4984,79 @@ containing words from the rime project.")
and cangjie.") and cangjie.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-el2org
(package
(name "emacs-el2org")
(version "0.6.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tumashu/el2org/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0gd3km1swwvg2w0kdi7370f54wgrflxn63gjgssfjc1iyc9sbqwq"))))
(build-system emacs-build-system)
(home-page "https://github.com/tumashu/el2org")
(synopsis "Convert Emacs-lisp file to org file")
(description "El2org is a simple tool, which can convert Emacs-lisp file
to org file, you can use this tool to write orgify commentary.")
(license license:gpl2+)))
(define-public emacs-mustache
(package
(name "emacs-mustache")
(version "0.23")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/Wilfred/mustache.el/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0k9lcgil7kykkv1ylrgwy1g13ldjjmgi2cwmysgyb2vlj3jbwpdj"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-ht" ,emacs-ht)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/Wilfred/mustache.el")
(synopsis "Mustache templating library for Emacs")
(description "Mustache templating library for Emacs, mustache is
a simple web template system, which is described as a logic-less system
because it lacks any explicit control flow statements, both looping and
conditional evaluation can be achieved using section tags processing lists
and lambdas.")
(license license:gpl3+)))
(define-public emacs-org2web
(package
(name "emacs-org2web")
(version "0.9.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/tumashu/org2web/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1c0ixcphlhp4c4qdiwq40bc3yp1gp1llp8pxrk4s7ny9n68s52zp"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-el2org" ,emacs-el2org)
("emacs-ht" ,emacs-ht)
("emacs-mustache" ,emacs-mustache)
("emacs-simple-httpd" ,emacs-simple-httpd)))
(home-page "https://github.com/tumashu/org2web")
(synopsis "Static site generator based on org-mode ")
(description "Org2web is a static site generator based on org-mode,
which code derived from Kelvin H's org-page.")
(license license:gpl2+)))
(define-public emacs-xelb (define-public emacs-xelb
(package (package
(name "emacs-xelb") (name "emacs-xelb")

147
gnu/packages/engineering.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -192,28 +192,27 @@ utilities.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'use-wish8.6 (add-after 'unpack 'use-wish8.6
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("wish85") "wish8.6"))) (("wish85") "wish8.6"))
(alist-cons-after #t))
'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
;; fix of the mesa package we wrap the pcb executable such that ;; fix of the mesa package we wrap the pcb executable such that
;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (string-append (assoc-ref inputs "udev") "/lib"))) (path (string-append (assoc-ref inputs "udev") "/lib")))
(wrap-program (string-append out "/bin/pcb") (wrap-program (string-append out "/bin/pcb")
`("LD_LIBRARY_PATH" ":" prefix (,path))))) `("LD_LIBRARY_PATH" ":" prefix (,path))))
(alist-cons-before #t))
'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t) #t)))))
%standard-phases)))))
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("mesa" ,mesa) ("mesa" ,mesa)
@ -1178,3 +1177,105 @@ servers, ...")
"ASCO brings circuit optimization capabilities to existing SPICE simulators using a "ASCO brings circuit optimization capabilities to existing SPICE simulators using a
high-performance parallel differential evolution (DE) optimization algorithm.") high-performance parallel differential evolution (DE) optimization algorithm.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public libngspice
;; Note: The ngspice's build system does not allow us to build both the
;; library and the executables in one go. Thus, we have two packages.
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
(package
(name "libngspice")
(version "26")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
version "/ngspice-" version ".tar.gz"))
(sha256
(base32
"02019ndcl057nq9z41nxycqba7wxlb081ibvfj9jv010nz431qji"))
(modules '((guix build utils)))
;; We remove the non-free cider and build without it.
(snippet
'(begin
(delete-file-recursively "src/ciderlib")
(delete-file "src/ciderinit")
(substitute* "configure"
(("src/ciderlib/Makefile") "")
(("src/ciderlib/input/Makefile") "")
(("src/ciderlib/support/Makefile") "")
(("src/ciderlib/oned/Makefile") "")
(("src/ciderlib/twod/Makefile") ""))))))
(build-system gnu-build-system)
(arguments
`(;; No tests for libngspice exist.
;; The transient tests for ngspice fail.
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-timestamps
(lambda _
(substitute* "configure"
(("`date`") "Do 1. Jan 00:00:00 UTC 1970"))
#t))
(add-after 'unpack 'delete-program-manuals
(lambda _
(substitute* "man/man1/Makefile.in"
(("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1")
"man_MANS = "))
#t))
(add-after 'install 'delete-script-files
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively
(string-append (assoc-ref outputs "out")
"/share/ngspice/scripts")))))
#:configure-flags
(list "--enable-openmp"
"--enable-xspice"
"--with-ngshared"
"--with-readline=yes")))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
(inputs
`(("libxaw" ,libxaw)
("mpi" ,openmpi)
("readline" ,readline)))
(home-page "http://ngspice.sourceforge.net/")
(synopsis "Mixed-level/mixed-signal circuit simulator")
(description
"Ngspice is a mixed-level/mixed-signal circuit simulator. It includes
@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that
provides code modeling support and simulation of digital components through
an embedded event driven algorithm.")
(license (list license:lgpl2.0+ ; code in frontend/numparam
(license:non-copyleft "file:///COPYING") ; spice3 bsd-style
license:public-domain)))) ; xspice
(define-public ngspice
;; The ngspice executables (see libngpsice above.)
(package (inherit libngspice)
(name "ngspice")
(arguments
(substitute-keyword-arguments (package-arguments libngspice)
((#:configure-flags flags)
`(delete "--with-ngshared" ,flags))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'delete-include-files
(lambda _
(substitute* "src/Makefile.in"
(("^SUBDIRS = misc maths frontend spicelib include/ngspice")
"SUBDIRS = misc maths frontend spicelib"))
#t))
(add-after 'install 'delete-cmpp-dlmain
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (file)
(delete-file
(string-append (assoc-ref outputs "out")
file)))
'("/bin/cmpp" "/share/ngspice/dlmain.c"))
#t))
(delete 'delete-program-manuals)
(delete 'delete-script-files)))))
(inputs
`(("libngspice" ,libngspice)
("readline" ,readline)))))

62
gnu/packages/finance.scm
View file

@ -22,37 +22,37 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages finance) (define-module (gnu packages finance)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages dns) #:use-module (gnu packages dns)
#:use-module (gnu packages emacs) #:use-module (gnu packages emacs)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages upnp) #:use-module (gnu packages upnp)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages gnuzilla)) #:use-module (gnu packages gnuzilla))
(define-public bitcoin-core (define-public bitcoin-core
(package (package

48
gnu/packages/firmware.scm
View file

@ -52,31 +52,31 @@
(patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (patches (search-patches "ath9k-htc-firmware-objcopy.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'configure 'pre-configure (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'configure 'pre-configure
(chdir "target_firmware") (lambda* (#:key inputs #:allow-other-keys)
(chdir "target_firmware")
;; 'configure' is a simple script that runs 'cmake' with ;; 'configure' is a simple script that runs 'cmake' with
;; the right flags. ;; the right flags.
(substitute* "configure" (substitute* "configure"
(("^TOOLCHAIN=.*$") (("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN=" (string-append "TOOLCHAIN="
(assoc-ref inputs "cross-gcc") (assoc-ref inputs "cross-gcc")
"\n")))) "\n")))
(alist-replace #t))
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(fw-dir (string-append out "/lib/firmware"))) (fw-dir (string-append out "/lib/firmware")))
(mkdir-p fw-dir) (mkdir-p fw-dir)
(for-each (lambda (file) (for-each (lambda (file)
(copy-file file (copy-file file
(string-append fw-dir "/" (string-append fw-dir "/"
(basename file)))) (basename file))))
(find-files "." "\\.fw$")) (find-files "." "\\.fw$"))
#t)) #t))))
%standard-phases))
#:tests? #f)) #:tests? #f))
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)

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

@ -5,6 +5,7 @@
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -22,19 +23,22 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages flashing-tools) (define-module (gnu packages flashing-tools)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages libftdi) #:use-module (gnu packages libftdi)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages qt)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages admin)) #:use-module (gnu packages admin))
@ -62,17 +66,16 @@
"CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no") "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no")
#:tests? #f ; no 'check' target #:tests? #f ; no 'check' target
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure)
(alist-cons-before (add-before 'build 'patch-exec-paths
'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys) (substitute* "dmi.c"
(substitute* "dmi.c" (("\"dmidecode\"")
(("\"dmidecode\"") (format #f "~S"
(format #f "~S" (string-append (assoc-ref inputs "dmidecode")
(string-append (assoc-ref inputs "dmidecode") "/sbin/dmidecode"))))
"/sbin/dmidecode"))))) #t)))))
%standard-phases))))
(home-page "http://flashrom.org/") (home-page "http://flashrom.org/")
(synopsis "Identify, read, write, erase, and verify ROM/flash chips") (synopsis "Identify, read, write, erase, and verify ROM/flash chips")
(description (description
@ -81,7 +84,7 @@ verifying and erasing flash chips. It is designed to flash
BIOS/EFI/coreboot/firmware/optionROM images on mainboards, BIOS/EFI/coreboot/firmware/optionROM images on mainboards,
network/graphics/storage controller cards, and various other network/graphics/storage controller cards, and various other
programmer devices.") programmer devices.")
(license gpl2))) (license license:gpl2)))
(define-public 0xffff (define-public 0xffff
(package (package
@ -112,7 +115,7 @@ programmer devices.")
for FIASCO images. It supports generating, unpacking, editing and for FIASCO images. It supports generating, unpacking, editing and
flashing of FIASCO images for Maemo devices. Use it with care. It can flashing of FIASCO images for Maemo devices. Use it with care. It can
brick your device.") brick your device.")
(license gpl3+))) (license license:gpl3+)))
(define-public avrdude (define-public avrdude
(package (package
@ -140,7 +143,7 @@ brick your device.")
"AVRDUDE is a utility to download/upload/manipulate the ROM and "AVRDUDE is a utility to download/upload/manipulate the ROM and
EEPROM contents of AVR microcontrollers using the in-system programming EEPROM contents of AVR microcontrollers using the in-system programming
technique (ISP).") technique (ISP).")
(license gpl2+))) (license license:gpl2+)))
(define-public dfu-programmer (define-public dfu-programmer
(package (package
@ -166,7 +169,7 @@ technique (ISP).")
"Dfu-programmer is a multi-platform command-line programmer for "Dfu-programmer is a multi-platform command-line programmer for
Atmel (8051, AVR, XMEGA & AVR32) chips with a USB bootloader supporting Atmel (8051, AVR, XMEGA & AVR32) chips with a USB bootloader supporting
ISP.") ISP.")
(license gpl2+))) (license license:gpl2+)))
(define-public dfu-util (define-public dfu-util
(package (package
@ -193,7 +196,7 @@ ranges from small devices like micro-controller boards up to mobile phones.
With dfu-util you are able to download firmware to your device or upload With dfu-util you are able to download firmware to your device or upload
firmware from it.") firmware from it.")
(home-page "http://dfu-util.sourceforge.net/") (home-page "http://dfu-util.sourceforge.net/")
(license gpl2+))) (license license:gpl2+)))
(define-public teensy-loader-cli (define-public teensy-loader-cli
;; The repo does not tag versions nor does it use releases, but a commit ;; The repo does not tag versions nor does it use releases, but a commit
@ -244,7 +247,7 @@ HalfKay bootloader is running, so you can upload new programs and run them.
You need to add the udev rules to make the Teensy update available for You need to add the udev rules to make the Teensy update available for
non-root users.") non-root users.")
(home-page "https://www.pjrc.com/teensy/loader_cli.html") (home-page "https://www.pjrc.com/teensy/loader_cli.html")
(license gpl3)))) (license license:gpl3))))
(define-public rkflashtool (define-public rkflashtool
(let ((commit "094bd6410cb016e487e2ccb1050c59eeac2e6dd1") (let ((commit "094bd6410cb016e487e2ccb1050c59eeac2e6dd1")
@ -278,4 +281,51 @@ non-root users.")
(description "Allows flashing of Rockchip based embedded linux devices. (description "Allows flashing of Rockchip based embedded linux devices.
The list of currently supported devices is: RK2818, RK2918, RK2928, RK3026, The list of currently supported devices is: RK2818, RK2918, RK2928, RK3026,
RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.") RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.")
(license bsd-2)))) (license license:bsd-2))))
(define-public heimdall
(package
(name "heimdall")
(version "1.4.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/Benjamin-Dobell/Heimdall"
"/archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1y7gwg3lipyp2zcysm2vid1qg5nwin9bxbvgzs28lz2rya4fz6sq"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
#:tests? #f; no tests
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-invocations
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("heimdall-frontend/source/aboutform.cpp"
"heimdall-frontend/source/mainwindow.cpp")
(("start[(]\"heimdall\"")
(string-append "start(\"" (assoc-ref outputs "out")
"/bin/heimdall\"")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
(lib (string-append (assoc-ref outputs "out") "/lib")))
(install-file "bin/heimdall" bin)
(install-file "bin/heimdall-frontend" bin)
(install-file "libpit/libpit.a" lib)
#t))))))
(inputs
`(("libusb" ,libusb)
("qtbase" ,qtbase)
("zlib" ,zlib)))
(home-page "http://glassechidna.com.au/heimdall/")
(synopsis "Flash firmware onto Samsung mobile devices")
(description "@command{heimdall} is a tool suite used to flash firmware (aka
ROMs) onto Samsung mobile devices. Heimdall connects to a mobile device over
USB and interacts with low-level software running on the device, known as Loke.
Loke and Heimdall communicate via the custom Samsung-developed protocol typically
referred to as the \"Odin 3 protocol\".")
(license license:expat)))

42
gnu/packages/fltk.scm
View file

@ -63,27 +63,27 @@
(list "--enable-shared" (list "--enable-shared"
(string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib")) (string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib"))
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'patch-makeinclude (add-before 'configure 'patch-makeinclude
(lambda _ (lambda _
(substitute* "makeinclude.in" (substitute* "makeinclude.in"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
(alist-cons-after #t))
'install 'patch-config (add-after 'install 'patch-config
;; Provide -L flags for image libraries when querying fltk-config to ;; Provide -L flags for image libraries when querying fltk-config to
;; avoid propagating inputs. ;; avoid propagating inputs.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(use-modules (srfi srfi-26)) (use-modules (srfi srfi-26))
(let* ((conf (string-append (assoc-ref outputs "out") (let* ((conf (string-append (assoc-ref outputs "out")
"/bin/fltk-config")) "/bin/fltk-config"))
(jpeg (assoc-ref inputs "libjpeg")) (jpeg (assoc-ref inputs "libjpeg"))
(png (assoc-ref inputs "libpng")) (png (assoc-ref inputs "libpng"))
(zlib (assoc-ref inputs "zlib"))) (zlib (assoc-ref inputs "zlib")))
(substitute* conf (substitute* conf
(("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg")) (("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg"))
(("-lpng") (string-append "-L" png "/lib -lpng")) (("-lpng") (string-append "-L" png "/lib -lpng"))
(("-lz") (string-append "-L" zlib "/lib -lz"))))) (("-lz") (string-append "-L" zlib "/lib -lz"))))
%standard-phases)))) #t)))))
(home-page "http://www.fltk.org") (home-page "http://www.fltk.org")
(synopsis "3D C++ GUI library") (synopsis "3D C++ GUI library")
(description "FLTK is a C++ GUI toolkit providing modern GUI functionality (description "FLTK is a C++ GUI toolkit providing modern GUI functionality

27
gnu/packages/fontutils.scm
View file

@ -325,33 +325,24 @@ X11-system or any other graphical user interface.")
(define-public teckit (define-public teckit
(package (package
(name "teckit") (name "teckit")
(version "2.5.4") (version "2.5.7")
(source (origin (source (origin
;; Downloaded tarballs vary with each download, so we use an (method url-fetch)
;; svn snapshot. The 2.5.4 release seems to be made in r128, (uri (string-append
;; but r132 updates additional files to contain the correct "https://github.com/silnrsi/teckit/releases/download/v"
;; version number (r129 to r131 do not concern TRUNK). version "/teckit-" version ".tar.gz"))
(method svn-fetch)
(uri (svn-reference
(url "https://scripts.sil.org/svn-public/teckit/TRUNK")
(revision 132)))
(file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"1xqkqgw30pb24snh46srmjs2j4zhz2dfi5pf7znia0k34mrpwivz")))) "1pbp97vcpj6x4yixx6ww0vsi1rrr99fksxdjafs6gdargzd24cj4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib))) (inputs
`(("zlib" ,zlib)
("expat" ,expat)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("perl" ,perl))) ; for the tests ("perl" ,perl))) ; for the tests
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autogen
(lambda _
(zero? (system* "sh" "autogen.sh")))))))
(synopsis "Toolkit for encoding conversions") (synopsis "Toolkit for encoding conversions")
(description (description
"TECkit is a low-level toolkit intended to be used by other applications "TECkit is a low-level toolkit intended to be used by other applications

2
gnu/packages/fpga.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;

51
gnu/packages/freedesktop.scm
View file

@ -357,26 +357,25 @@ manager for the current system.")
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "XDG_DATA_DIRS" (setenv "XDG_DATA_DIRS"
(string-append (assoc-ref inputs "shared-mime-info") (string-append (assoc-ref inputs "shared-mime-info")
"/share/")) "/share/"))
(substitute* "test/test-icon.py" (substitute* "test/test-icon.py"
(("/usr/share/icons/hicolor/index.theme") (("/usr/share/icons/hicolor/index.theme")
(string-append (assoc-ref inputs "hicolor-icon-theme") (string-append (assoc-ref inputs "hicolor-icon-theme")
"/share/icons/hicolor/index.theme")) "/share/icons/hicolor/index.theme"))
;; FIXME: This test fails because the theme contains the unknown ;; FIXME: This test fails because the theme contains the unknown
;; key "Scale". ;; key "Scale".
(("theme.validate\\(\\)") "#")) (("theme.validate\\(\\)") "#"))
;; One test fails with: ;; One test fails with:
;; AssertionError: 'x-apple-ios-png' != 'png' ;; AssertionError: 'x-apple-ios-png' != 'png'
(substitute* "test/test-mime.py" (substitute* "test/test-mime.py"
(("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
(zero? (system* "nosetests" "-v"))) (zero? (system* "nosetests" "-v")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("shared-mime-info" ,shared-mime-info) ;for tests `(("shared-mime-info" ,shared-mime-info) ;for tests
("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests
@ -403,7 +402,19 @@ Python.")
(base32 (base32
"0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39")))) "0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments `(#:parallel-tests? #f)) (arguments
`(#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
;; Remove record shapes to workaround graphviz 2.40.1 problems.
;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
;; This will likely be fixed upstream in the next release.
;; https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html
(add-before 'build 'fix-graphviz
(lambda _
(substitute* "doc/doxygen/dot/x-architecture.gv"
(("Mrecord") "none"))
#t)))))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
("graphviz" ,graphviz) ("graphviz" ,graphviz)

4
gnu/packages/ftp.scm
View file

@ -46,7 +46,7 @@
(define-public lftp (define-public lftp
(package (package
(name "lftp") (name "lftp")
(version "4.8.2") (version "4.8.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; See https://lftp.tech/get.html for mirrors. ;; See https://lftp.tech/get.html for mirrors.
@ -58,7 +58,7 @@
"ftp/lftp/lftp-" version ".tar.xz"))) "ftp/lftp/lftp-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"176d90amkm1klwjpfpzdsvmjnyri8f74bv4fpip8app0fs25p1sw")))) "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

118
gnu/packages/games.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com> ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
@ -133,6 +133,7 @@
#:use-module (gnu packages gnuzilla) #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (guix build utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -2796,60 +2797,67 @@ http://lavachat.symlynx.com/unix/")
(license license:gpl2+))) (license license:gpl2+)))
(define-public red-eclipse (define-public red-eclipse
(let ((data-sources (let ((release "1.5.8")
'(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx") (revision 2)
("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a") (data-sources
("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd") '(("acerspyro" "0zmg78scrfdv33h7vszqvzylcqjwg7d5b0j2riav3rjfh326j8xx")
("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq") ("actors" "0l00rsvppqzdpsikm5qpj38jiygirszxlzay2nxp4g4n2qjq0m4a")
("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5") ("appleflap" "0jhfr7f13hk3nswwxqc4jajriipr6zz6j63v955nv4sgxs7lzbjd")
("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m") ("blendbrush" "1nk0zaisbqf2khrivq8ls6z2lnh6d51m133m2ppxk7k4c9gq1imq")
("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s") ("caustics" "1hq08k476wayi0kmk4ps8h6jr75yinq04f1r2p8r79xsdpxq9my5")
("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz") ("crosshairs" "1gmrmjm7i7n9py0qrzamk7ygi63yx1mr2pp6iwz2vwngprl03n8m")
("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c") ("dziq" "0gr36ydrv8syjxv7w9dw3ix8waaq201fzxr0klkqp260p8xp215s")
("elyvisions" "05syxlpsap6nfwxnnd0ls7qj1p4vhw2jxi41pi5inwpfifapfphz")
("fonts" "184syks602xc657q08973w5ji50x5zssvd4vp2q2ig8m68iyr51c")
("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y687ya") ("freezurbern" "020gpgcpy4rqjd9d18npfm96j8f02jcjnccbxcgzk1yb58y687ya")
("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k") ("john" "0hj5kwlb2gb0gsnl9bk7dkqlk8r7vxcw8gxpgrb3kfn8d9cwcb7k")
("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz") ("jojo" "0fij06040r7s5p7jksxm7wxi9jqwkhhm8iywys0dagk8j2wcbvsz")
("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf") ("jwin" "0ysfynjvypc8dszf7rsvk02jgw8fmsli49vy2xpm83zpkrqpddgf")
("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6crr11") ("luckystrike" "1bm0xdqjv35ry5xwbzw3a3v1xf2gj1jwfg29nyl6w3ch0h6crr11")
("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma") ("maps" "0c9d1zxmpnngwhchzw6xb6cf84cx8xyycmdqcvyhamrd95d96qma")
("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil") ("mayhem" "133pdql7ari159skd9qdmw0p1m73x32d1v6jswkz0xwk8vgxmkil")
("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x") ("mikeplus64" "1d5npn9wlw0mviz9vhzzcsj98jvfh1wbvlh1nyqfj4ws5nfxhs7x")
("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn") ("misc" "19x2ps6yxnfrz0xdhqdwncaq25ds7i4w2l8sdfi95yh2r7c5k1qn")
("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c") ("nieb" "15029nipl92cb0jbh46z00k51hf3jk4v05pwx266b6b11bapdz0c")
("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp") ("nobiax" "0k9apim5z4ihd5ajmnbq4gyh24w872dv0mr5v8wqn31a8gxzahhp")
("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m") ("particles" "06827r9pnhzjil381xiwcbc93v9nxin7qlr59yrvk9gdzxmklk9m")
("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1") ("philipk" "1l6fhl6qz471vjn05hvk29bm8dhwnzqbmi2hdylpa9k998nzkfc1")
("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7nd2bqh") ("projectiles" "03ay8ik52n3vx723swqlnl5gpkzf1v1gadwj3zcnh43ch7nd2bqh")
("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc") ("props" "1yxz7gfmb79sqqrkyfdzp4ar9rf5f1kpfij4nrkk1l8vbw9liksc")
("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6") ("skyboxes" "1mm98mhb6yhb006p1hlic91jcwjxhq79mblxciwbqqa9c5g4yki6")
("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44") ("snipergoth" "1vlpmwlg71g6l5b706gp82bc07i5bbw2zphzynm2fx49za0zdi44")
("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg") ("sounds" "156g5wh8cvdh6zr33haqm566sd28ylnzdf2h4pqzpxbb2i19vbfg")
("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh") ("textures" "0wkhl5cgymr9kslzhksi83hs15rb0q01xvax5khi6b4dcl3mrmsh")
("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav") ("torley" "1xlag6ndjyqafl984n6d9zi96dv9aif7vrc2nvikc3iwgjwlbxav")
("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd") ("trak" "12x9ix8zkqn9svy56qmdgj4x2814qh25f4srplgq691lqn9qjhvd")
("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5") ("ulukai" "0gz1hd8hca2biskc85hw4jjacpsmqg9x4w6cwrka8x987xmc92k5")
("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7") ("unnamed" "09v8fjy6jqypm1i121kilg3z6zpw7dm0i4gxhd9b7ihprvzvy8r7")
("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462") ("vanities" "0m3vfq9l71pbb80qz4s3k8r5azmm158chqbw8snch09ymxm6h462")
("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn") ("vegetation" "07yzm9lbzr624j4i652ny5p762p83gadg40c1k8gwff4y7yk55gn")
("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x") ("weapons" "05fsp17gdrhjqdwia7rwdw9gcijaqwcnny8lf6krms43xmn8cj0x")
("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2")))) ("wicked" "0jjgwzdibr5my369gwvmvbklpjlwq939zgf643rv0168xc087xb2"))))
(package (package
(name "red-eclipse") (name "red-eclipse")
(version "1.5.8") (version (if (zero? revision)
release
(string-append release "-"
(number->string revision))))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/red-eclipse/base" (uri (string-append "https://github.com/red-eclipse/base"
"/archive/v" version ".tar.gz")) "/archive/v" release ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ah92axwcai0fhgm7pvfb2dxvfdiwwyh8iqyiffndh6782hxz3bc")))) "0r66rsqxvd7hxrhb0fahqqmf3r0cw2drhv5vndbswcq90l1bxfmf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags (list "CC=gcc" "-Csrc" #:make-flags (list "CC=gcc" "-Csrc"
(string-append "INSTDIR=" (string-append "INSTDIR="
(assoc-ref %outputs "out") "/bin")) (assoc-ref %outputs "out") "/bin")
(string-append "prefix="
(assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-data (add-after 'unpack 'unpack-data
@ -2862,10 +2870,25 @@ http://lavachat.symlynx.com/unix/")
"-Cdata" "-Cdata"
"--transform" "--transform"
(string-append "s/" (string-append "s/"
name "-" ,version "/" name "-" ,release "/"
name "/"))) name "/")))
(list ,@(map car data-sources))) (list ,@(map car data-sources)))
#t)) #t))
(add-after 'unpack-data 'add-store-data-package-path-as-default
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "src/engine/server.cpp"
(("(else[[:space:]]*)((addpackagedir\\()\"data\"(\\);))" _ else_part addpackagedir_original addpackagedir_open addpackagedir_close)
(string-append else_part
"{ "
addpackagedir_open
"\""
(assoc-ref outputs "out")
"/share/redeclipse/data\""
addpackagedir_close
" "
addpackagedir_original
" }")))
#t))
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-after 'set-paths 'set-sdl-paths (add-after 'set-paths 'set-sdl-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -2881,7 +2904,10 @@ http://lavachat.symlynx.com/unix/")
(copy-file "doc/examples/servinit.cfg" (copy-file "doc/examples/servinit.cfg"
(string-append out "/config/servinit.cfg")) (string-append out "/config/servinit.cfg"))
(copy-recursively "data" (copy-recursively "data"
(string-append out "/data"))) (string-append out "/share/redeclipse/data"))
(mkdir-p (string-append out "/lib/redeclipse"))
(symlink (string-append out "/share/redeclipse/data")
(string-append out "/lib/redeclipse/data")))
#t)) #t))
(add-after 'copy-data 'wrap-program (add-after 'copy-data 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -2928,7 +2954,7 @@ exec -a \"$0\" ~a/.redeclipse_server_linux-real~%"
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/red-eclipse/" "https://github.com/red-eclipse/"
name "/archive/v" version ".tar.gz")) name "/archive/v" release ".tar.gz"))
(sha256 (base32 hash)) (sha256 (base32 hash))
(file-name (string-append name "-" version (file-name (string-append name "-" version
".tar.gz")))))) ".tar.gz"))))))
@ -3045,7 +3071,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(define-public mgba (define-public mgba
(package (package
(name "mgba") (name "mgba")
(version "0.6.0") (version "0.6.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mgba-emu/mgba/archive/" (uri (string-append "https://github.com/mgba-emu/mgba/archive/"
@ -3053,7 +3079,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"01zy2w5pihlkrmbm51icgyff6iqyqa5ha6qrm4aj8ibzznz03kyq")) "0xmq1q1j71hnpd49wm91cqq8w5zdhb921cm17jchp4qjmaqgwy3w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Make sure we don't use the bundled software. ;; Make sure we don't use the bundled software.
@ -3898,7 +3924,7 @@ to the Space Age.")
(define-public no-more-secrets (define-public no-more-secrets
(package (package
(name "no-more-secrets") (name "no-more-secrets")
(version "0.3.2") (version "0.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3907,7 +3933,7 @@ to the Space Age.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"00mzdif859vm75n1igrffh8c07p1nr4rlm3yb7lrkwwxhrw8xzla")))) "1kpx1rirc3i7fb4lymp0hx5rqr0s2ay4za261rw3bcy6d23l1kyg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f

19
gnu/packages/gd.scm
View file

@ -122,15 +122,16 @@ most common applications of GD involve website development.")
(assoc-ref %build-inputs i))) (assoc-ref %build-inputs i)))
'("zlib" "png" "ft" "jpeg" "fontconfig")) '("zlib" "png" "ft" "jpeg" "fontconfig"))
#:tests? #f ;; Failed 1/2 test programs. 1/12 subtests failed. #:tests? #f ;; Failed 1/2 test programs. 1/12 subtests failed.
#:phases (alist-cons-after #:phases
'configure 'clear-autogenerated-files (modify-phases %standard-phases
(lambda _ (add-after 'configure 'clear-autogenerated-files
;; This file is autogenerated by its .PLS script at build (lambda _
;; time, but file creation fails because that file already ;; This file is autogenerated by its .PLS script at build
;; exists in the distribution with non-writable ;; time, but file creation fails because that file already
;; permissions, so delete it first. ;; exists in the distribution with non-writable
(delete-file "bdf_scripts/bdf2gdfont.pl")) ;; permissions, so delete it first.
%standard-phases))) (delete-file "bdf_scripts/bdf2gdfont.pl")
#t)))))
(home-page "http://search.cpan.org/dist/GD") (home-page "http://search.cpan.org/dist/GD")
(synopsis "Perl interface to the GD graphics library") (synopsis "Perl interface to the GD graphics library")
(description "GD.pm is an autoloadable interface module for libgd, a (description "GD.pm is an autoloadable interface module for libgd, a

20
gnu/packages/ghostscript.scm
View file

@ -131,6 +131,7 @@ printing, and psresize, for adjusting page sizes.")
(define-public ghostscript (define-public ghostscript
(package (package
(name "ghostscript") (name "ghostscript")
(replacement ghostscript-9.22)
(version "9.21") (version "9.21")
(source (source
(origin (origin
@ -254,6 +255,25 @@ output file formats and printers.")
(home-page "https://www.ghostscript.com/") (home-page "https://www.ghostscript.com/")
(license license:agpl3+))) (license license:agpl3+)))
(define ghostscript-9.22
(package
(inherit ghostscript)
(version "9.22")
(source
(origin
(inherit (package-source ghostscript))
(uri (string-append "https://github.com/ArtifexSoftware/"
"ghostpdl-downloads/releases/download/gs"
(string-delete #\. version)
"/ghostscript-" version ".tar.xz"))
(sha256
(base32
"1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61"))
(patches (search-patches "ghostscript-runpath.patch"
"ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch"
"ghostscript-no-header-uuid.patch"))))))
(define-public ghostscript/x (define-public ghostscript/x
(package/inherit ghostscript (package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x")) (name (string-append (package-name ghostscript) "-with-x"))

5
gnu/packages/gkrellm.scm
View file

@ -49,10 +49,7 @@
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:tests? #f ; there is no check target `(#:tests? #f ; there is no check target
#:phases #:phases (modify-phases %standard-phases (delete 'configure))
(alist-delete
'configure
%standard-phases)
#:make-flags #:make-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "INSTALLROOT=" out) (list (string-append "INSTALLROOT=" out)

25
gnu/packages/gl.scm
View file

@ -217,17 +217,19 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "17.1.4") (version "17.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/" (uri (list (string-append "https://mesa.freedesktop.org/archive/"
"mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
"mesa-" version ".tar.xz") "mesa-" version ".tar.xz")
(string-append "ftp://ftp.freedesktop.org/pub/mesa/" (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"1bcwxin7nmbnv92xav381b6qxscsx1zzc71ryfvj03cglbkb1wq6")) "07msr6xismw2jq87irwhz7vygvzj6hi38d71paij9zvwh8bmsf3p"))
(patches (patches
(search-patches "mesa-wayland-egl-symbols-check-mips.patch" (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
"mesa-skip-disk-cache-test.patch")))) "mesa-skip-disk-cache-test.patch"))))
@ -253,13 +255,14 @@ also known as DXTn or DXTC) for Mesa.")
("libxvmc" ,libxvmc) ("libxvmc" ,libxvmc)
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
`(("llvm" ,llvm))) `(("llvm" ,llvm-3.9.1))) ; exactly 3.9.0 or 3.9.1 for swrast
(_ (_
`())) `()))
("makedepend" ,makedepend) ("makedepend" ,makedepend)
("presentproto" ,presentproto) ("presentproto" ,presentproto)
("s2tc" ,s2tc) ("s2tc" ,s2tc)
("wayland" ,wayland))) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python-2)
@ -267,13 +270,17 @@ also known as DXTn or DXTC) for Mesa.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'(,@(match (%current-system) '(,@(match (%current-system)
((or "armhf-linux" "aarch64-linux") ("armhf-linux"
'("--with-gallium-drivers=freedreno,nouveau,r300,r600,svga,swrast,vc4,virgl")) ;; TODO: Add etnaviv when enabled in libdrm.
'("--with-gallium-drivers=freedreno,imx,nouveau,r300,r600,svga,swrast,vc4,virgl"))
("aarch64-linux"
;; TODO: Fix svga driver for aarch64.
'("--with-gallium-drivers=freedreno,nouveau,r300,r600,swrast,vc4,virgl"))
(_ (_
'("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,virgl"))) '("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio ;; omx requires libomxil-bellagio
"--with-egl-platforms=x11,drm,wayland" "--with-platforms=x11,drm,wayland,surfaceless"
"--enable-glx-tls" ;Thread Local Storage, improves performance "--enable-glx-tls" ;Thread Local Storage, improves performance
;; "--enable-opencl" ;; "--enable-opencl"
;; "--enable-omx" ;; "--enable-omx"
@ -422,7 +429,7 @@ glxgears, glxheads, and glxinfo.")
(("/lib64") "/lib"))))) (("/lib64") "/lib")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "GLEW_PREFIX=" #:make-flags (list (string-append "GLEW_PREFIX="
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
(string-append "GLEW_DEST=" (string-append "GLEW_DEST="

39
gnu/packages/glib.scm
View file

@ -67,7 +67,7 @@
(define dbus (define dbus
(package (package
(name "dbus") (name "dbus")
(version "1.10.18") (version "1.10.22")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -75,7 +75,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0")) "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"))
(patches (search-patches "dbus-helper-search-path.patch")))) (patches (search-patches "dbus-helper-search-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -137,7 +137,7 @@ shared NFS home directories.")
(define glib (define glib
(package (package
(name "glib") (name "glib")
(version "2.52.2") (version "2.52.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" (uri (string-append "mirror://gnome/sources/"
@ -145,7 +145,7 @@ shared NFS home directories.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1l65kab6jr9zlllgbjcbvrbgah3sdd577fpw4pdb2j195ag5s3ph")) "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5"))
(patches (search-patches "glib-tests-timer.patch")))) (patches (search-patches "glib-tests-timer.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ; everything (outputs '("out" ; everything
@ -504,22 +504,23 @@ has an ease of use unmatched by other C++ callback libraries.")
"1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z")))) "1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'build 'pre-build (modify-phases %standard-phases
(lambda _ (add-before 'build 'pre-build
;; This test uses /etc/fstab as an example file to read (lambda _
;; from; choose a better example. ;; This test uses /etc/fstab as an example file to read
(substitute* "tests/giomm_simple/main.cc" ;; from; choose a better example.
(("/etc/fstab") (substitute* "tests/giomm_simple/main.cc"
(string-append (getcwd) (("/etc/fstab")
"/tests/giomm_simple/main.cc"))) (string-append (getcwd)
"/tests/giomm_simple/main.cc")))
;; This test does a DNS lookup, and then expects to be able ;; This test does a DNS lookup, and then expects to be able
;; to open a TLS session; just skip it. ;; to open a TLS session; just skip it.
(substitute* "tests/giomm_tls_client/main.cc" (substitute* "tests/giomm_tls_client/main.cc"
(("Gio::init.*$") (("Gio::init.*$")
"return 77;\n"))) "return 77;\n"))
%standard-phases))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin"))) ("glib" ,glib "bin")))
(propagated-inputs (propagated-inputs

198
gnu/packages/gnome.scm
View file

@ -812,16 +812,16 @@ for settings shared by various components of the GNOME desktop.")
("perl-xml-simple" ,perl-xml-simple))) ("perl-xml-simple" ,perl-xml-simple)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-after (modify-phases %standard-phases
'install 'set-load-paths (add-after 'install 'set-load-paths
;; Tell 'icon-name-mapping' where XML::Simple is. ;; Tell 'icon-name-mapping' where XML::Simple is.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(prog (string-append out "/libexec/icon-name-mapping"))) (prog (string-append out "/libexec/icon-name-mapping")))
(wrap-program (wrap-program
prog prog
`("PERL5LIB" = ,(list (getenv "PERL5LIB")))))) `("PERL5LIB" = ,(list (getenv "PERL5LIB")))))
%standard-phases))) #t)))))
(home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification") (home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification")
(synopsis (synopsis
"Utility to implement the Freedesktop Icon Naming Specification") "Utility to implement the Freedesktop Icon Naming Specification")
@ -1055,7 +1055,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
(define-public glade3 (define-public glade3
(package (package
(name "glade") (name "glade")
(version "3.20.0") (version "3.20.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1063,7 +1063,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zhqvhagy0m85p54jfiayfl0v9af7g0lj7glw8sfwh7cbp56vnc2")))) "1pxikhzdzd092d4x3nacf5gfzi3mvhywrhcfqc07xakbsinnfr40"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:tests? #f ; needs X, GL, and software rendering `(#:tests? #f ; needs X, GL, and software rendering
@ -1165,7 +1165,7 @@ dealing with different structured file formats.")
(define-public librsvg (define-public librsvg
(package (package
(name "librsvg") (name "librsvg")
(version "2.40.17") (version "2.40.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1173,7 +1173,7 @@ dealing with different structured file formats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6")))) "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1263,12 +1263,12 @@ functionality was designed to be as reusable and portable as possible.")
'("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* "linc2/src/Makefile.in" (substitute* "linc2/src/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("libidl" ,libidl))) ("libidl" ,libidl)))
(native-inputs (native-inputs
@ -1303,12 +1303,12 @@ featuring mature C, C++ and Python bindings.")
'("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS")
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* "activation-server/Makefile.in" (substitute* "activation-server/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("popt" ,popt) (inputs `(("popt" ,popt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
;; The following are Required by the .pc file ;; The following are Required by the .pc file
@ -1411,19 +1411,18 @@ designed to be accessed through the MIME functions in GnomeVFS.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'ignore-deprecations (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* '("libgnomevfs/Makefile.in" (substitute* '("libgnomevfs/Makefile.in"
"daemon/Makefile.in") "daemon/Makefile.in")
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
#t) #t))
(alist-cons-before (add-before 'configure 'patch-test-async-cancel-to-never-fail
'configure 'patch-test-async-cancel-to-never-fail (lambda _
(lambda _ (substitute* "test/test-async-cancel.c"
(substitute* "test/test-async-cancel.c" (("EXIT_FAILURE") "77"))
(("EXIT_FAILURE") "77"))) #t)))))
%standard-phases))))
(inputs `(("libxml2" ,libxml2) (inputs `(("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("gconf" ,gconf) ("gconf" ,gconf)
@ -1458,12 +1457,12 @@ to access local and remote files with a single consistent API.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'enable-deprecated (add-before 'configure 'enable-deprecated
(lambda _ (lambda _
(substitute* "libgnome/Makefile.in" (substitute* "libgnome/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
%standard-phases))) #t)))))
(inputs `(("libxml2" ,libxml2))) (inputs `(("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for glib-mkenums, etc. `(("glib" ,glib "bin") ; for glib-mkenums, etc.
@ -1698,18 +1697,17 @@ since ca. 2006, when GTK+ itself incorporated printing support.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xorg-server (assoc-ref inputs "xorg-server"))
(disp ":1")) (disp ":1"))
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(setenv "DISPLAY" disp) (setenv "DISPLAY" disp)
;; There must be a running X server and make check doesn't start one. ;; There must be a running X server and make check doesn't start one.
;; Therefore we must do it. ;; Therefore we must do it.
(zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))) (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)))))))))
%standard-phases)))
;; Mentioned as Required by the .pc file ;; Mentioned as Required by the .pc file
(propagated-inputs `(("libxml2" ,libxml2))) (propagated-inputs `(("libxml2" ,libxml2)))
(inputs (inputs
@ -1823,14 +1821,13 @@ Hints specification (EWMH).")
(base32 "05fvzbs5bin05bbsr4dp79aiva3lnq0a3a40zq55i13vnsz70l0n")))) (base32 "05fvzbs5bin05bbsr4dp79aiva3lnq0a3a40zq55i13vnsz70l0n"))))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'fix-pcre-check (add-after 'unpack 'fix-pcre-check
(lambda _ (lambda _
;; Only glib.h can be included directly. See ;; Only glib.h can be included directly. See
;; https://bugzilla.gnome.org/show_bug.cgi?id=670316 ;; https://bugzilla.gnome.org/show_bug.cgi?id=670316
(substitute* "configure" (substitute* "configure"
(("glib/gregex\\.h") "glib.h")) #t) (("glib/gregex\\.h") "glib.h")) #t)))
%standard-phases)
,@(package-arguments goffice))) ,@(package-arguments goffice)))
(propagated-inputs (propagated-inputs
@ -2053,7 +2050,7 @@ editors, IDEs, etc.")
(package (package
(inherit vte) (inherit vte)
(name "vte-ng") (name "vte-ng")
(version "0.48.3.a") (version "0.50.1.a")
(native-inputs (native-inputs
`(("gtk-doc" ,gtk-doc) `(("gtk-doc" ,gtk-doc)
("gperf" ,gperf) ("gperf" ,gperf)
@ -2068,7 +2065,7 @@ editors, IDEs, etc.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wdkf090zclqy11hxdjgy8f6fgzajl0xzzirajikhbaiill7f8zh")))) "1r70jysdrc7r1vyn3mikpc8hh7rm4lpr0psakj8yssy11p451pja"))))
(arguments (arguments
`(#:configure-flags '("CXXFLAGS=-Wformat=0") `(#:configure-flags '("CXXFLAGS=-Wformat=0")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
@ -2172,7 +2169,7 @@ and RDP protocols.")
(define-public dconf (define-public dconf
(package (package
(name "dconf") (name "dconf")
(version "0.26.0") (version "0.26.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2181,7 +2178,7 @@ and RDP protocols.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6")))) "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
@ -2203,19 +2200,19 @@ and RDP protocols.")
(assoc-ref %outputs "out") "/lib") (assoc-ref %outputs "out") "/lib")
"--disable-gtk-doc-html") ; FIXME: requires gtk-doc "--disable-gtk-doc-html") ; FIXME: requires gtk-doc
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'fix-docbook (add-before 'configure 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "docs/Makefile.in" (substitute* "docs/Makefile.in"
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
(string-append (assoc-ref inputs "docbook-xsl") (string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-" "/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl) ,(package-version docbook-xsl)
"/manpages/docbook.xsl"))) "/manpages/docbook.xsl")))
(setenv "XML_CATALOG_FILES" (setenv "XML_CATALOG_FILES"
(string-append (assoc-ref inputs "docbook-xml") (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))) "/xml/dtd/docbook/catalog.xml"))
%standard-phases))) #t)))))
(home-page "https://developer.gnome.org/dconf") (home-page "https://developer.gnome.org/dconf")
(synopsis "Low-level GNOME configuration system") (synopsis "Low-level GNOME configuration system")
(description "Dconf is a low-level configuration system. Its main purpose (description "Dconf is a low-level configuration system. Its main purpose
@ -3091,7 +3088,7 @@ playlists in a variety of formats.")
(define-public aisleriot (define-public aisleriot
(package (package
(name "aisleriot") (name "aisleriot")
(version "3.22.2") (version "3.22.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -3099,7 +3096,7 @@ playlists in a variety of formats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0a8cir7vgi67sncl0m7cypq11amardm7r68gr3q52a11l8ajycdx")))) "12bqbyiqn2dwknz7ndgwgqqqz993s1ynh8qb82sshr7fy4zw8qph"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -3114,7 +3111,7 @@ playlists in a variety of formats.")
("xmllint" ,libxml2))) ("xmllint" ,libxml2)))
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("guile" ,guile-2.0) ("guile" ,guile-2.2)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("librsvg" ,librsvg))) ("librsvg" ,librsvg)))
(home-page "https://wiki.gnome.org/Apps/Aisleriot") (home-page "https://wiki.gnome.org/Apps/Aisleriot")
@ -4933,7 +4930,7 @@ users.")
(define-public network-manager (define-public network-manager
(package (package
(name "network-manager") (name "network-manager")
(version "1.8.2") (version "1.8.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/" (uri (string-append "mirror://gnome/sources/NetworkManager/"
@ -4941,7 +4938,7 @@ users.")
"NetworkManager-" version ".tar.xz")) "NetworkManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi")) "04lj081a5cdkhcnj1xs77chhy08d2h0648kmj1csxp46cfrjwpk2"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -5057,7 +5054,7 @@ services.")
(define-public network-manager-openvpn (define-public network-manager-openvpn
(package (package
(name "network-manager-openvpn") (name "network-manager-openvpn")
(version "1.2.10") (version "1.8.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -5066,7 +5063,7 @@ services.")
"/NetworkManager-openvpn-" version ".tar.xz")) "/NetworkManager-openvpn-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0q9x61fq509gybz3ljzyvf9zn8nlya1r2vk7jl0gk3fp76jsg1mc")))) "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-absolute-paths"))) '(#:configure-flags '("--enable-absolute-paths")))
@ -5111,7 +5108,7 @@ to virtual private networks (VPNs) via OpenVPN.")
(define-public network-manager-applet (define-public network-manager-applet
(package (package
(name "network-manager-applet") (name "network-manager-applet")
(version "1.8.2") (version "1.8.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5119,7 +5116,7 @@ to virtual private networks (VPNs) via OpenVPN.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry")))) "0ag3pvjp58ykrzsjfbdxi0j5xd2i796jk7nns67zy03xwg9i0l0h"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments '(#:configure-flags '("--disable-migration"))) (arguments '(#:configure-flags '("--disable-migration")))
(native-inputs (native-inputs
@ -6065,7 +6062,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.")
(define-public gnome-calendar (define-public gnome-calendar
(package (package
(name "gnome-calendar") (name "gnome-calendar")
(version "3.24.3") (version "3.26.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -6073,22 +6070,27 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1v7k1wcl5yg9bd4l0rz0z03h32d35zgfp4qzz21widjcyis41jry")))) "03n51mvlc0vabr1rx9577z927icl3mrxrrv8zckfjav6p4vwg8hr"))))
(build-system glib-or-gtk-build-system) (build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
;; gnome-calendar has to be installed before the tests can be run
;; https://bugzilla.gnome.org/show_bug.cgi?id=788224
#:tests? #f))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("gettext" ,gettext-minimal)
("glib-bin" ,glib "bin") ; For glib-compile-schemas
("gtk+-bin" ,gtk+ "bin") ; For gtk-update-icon-cache
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("bdb" ,bdb) `(("evolution-data-server" ,evolution-data-server)
("desktop-file-utils" ,desktop-file-utils)
("evolution-data-server" ,evolution-data-server)
("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts" ,gnome-online-accounts)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(home-page "https://wiki.gnome.org/Apps/Calendar") (home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application") (synopsis "GNOME's calendar application")
(description (description
"GNOME Calendar is a simple calendar application designed to fit the GNOME "GNOME Calendar is a simple calendar application designed to fit the GNOME
desktop. It supports multiple calendars, monthly view and yearly view.") desktop. It supports multiple calendars, month, week and year view.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public gnome-todo (define-public gnome-todo

8
gnu/packages/gnunet.scm
View file

@ -186,14 +186,14 @@ and support for SSL3 and TLS.")
(define-public gnurl (define-public gnurl
(package (package
(name "gnurl") (name "gnurl")
(version "7.55.1-4") (version "7.56.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gnunet.org/sites/default/files/" (uri (string-append "https://gnunet.org/sites/default/files/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"09c1bfwiwxqlh0dl839lslwhvkf98bvpyg9x4pcn3sagz0i8hxfl")))) "18inbbqg7jygxa37x313ivc51p215fkp0ppw3xznk6d5ci4bs8fg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 1.5 MiB of man3 pages "doc")) ; 1.5 MiB of man3 pages
@ -234,10 +234,6 @@ and support for SSL3 and TLS.")
#t))) #t)))
(replace 'check (replace 'check
(lambda _ (lambda _
;; It is unclear why test1026 fails, however the content of it
;; suggests that it is not vital for gnurl.
(delete-file "tests/data/test1026")
(substitute* "tests/runtests.pl" (substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))

4
gnu/packages/golang.scm
View file

@ -204,7 +204,7 @@ sequential processes (CSP) concurrent programming features added.")
(package (package
(inherit go-1.4) (inherit go-1.4)
(name "go") (name "go")
(version "1.9") (version "1.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -212,7 +212,7 @@ sequential processes (CSP) concurrent programming features added.")
name version ".src.tar.gz")) name version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"14z9azh8pk5cwyl2qdk893j68lk0cca7a9b8k2hpn5pd52825ax4")))) "03jmrgqq852wqyphvd8p46i32f72xki3bmylhkxf0kynqyfzqjm8"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments go-1.4) (substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases) ((#:phases phases)

17
gnu/packages/gprolog.scm
View file

@ -41,14 +41,15 @@
`(#:configure-flags `(#:configure-flags
(list (string-append (list (string-append
"--with-install-dir=" %output "/share/gprolog")) "--with-install-dir=" %output "/share/gprolog"))
#:phases (alist-cons-before #:phases
'configure 'change-dir-n-fix-shells (modify-phases %standard-phases
(lambda _ (add-before 'configure 'change-dir-n-fix-shells
(chdir "src") (lambda _
(substitute* "configure" (chdir "src")
(("-/bin/sh") (string-append "-" (which "sh"))) (substitute* "configure"
(("= /bin/sh") (string-append "= " (which "sh"))))) (("-/bin/sh") (string-append "-" (which "sh")))
%standard-phases))) (("= /bin/sh") (string-append "= " (which "sh"))))
#t)))))
(home-page "https://www.gnu.org/software/gprolog/") (home-page "https://www.gnu.org/software/gprolog/")
(synopsis "Prolog compiler") (synopsis "Prolog compiler")
(description (description

19
gnu/packages/gps.scm
View file

@ -102,15 +102,16 @@ manipulate maps.")
"006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb")))) "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'configure (modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (replace 'configure
;; This is a rudimentary build system. (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Makefile" ;; This is a rudimentary build system.
(("prefix[[:blank:]]*=.*$") (substitute* "Makefile"
(string-append "prefix = " (assoc-ref outputs "out") (("prefix[[:blank:]]*=.*$")
"\n")))) (string-append "prefix = " (assoc-ref outputs "out")
%standard-phases) "\n")))
#t)))
#:tests? #f)) #:tests? #f))
(inputs (inputs
`(("gtk+" ,gtk+-2) `(("gtk+" ,gtk+-2)

13
gnu/packages/graphics.scm
View file

@ -630,13 +630,12 @@ and understanding different BRDFs (and other component functions).")
(string-append "--x-libraries=" (assoc-ref %build-inputs "libx11") (string-append "--x-libraries=" (assoc-ref %build-inputs "libx11")
"/lib")) "/lib"))
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda _ (lambda _
;; let's call configure from configure phase and not now ;; let's call configure from configure phase and not now
(substitute* "autogen.sh" (("./configure") "# ./configure")) (substitute* "autogen.sh" (("./configure") "# ./configure"))
(zero? (system* "sh" "autogen.sh"))) (zero? (system* "sh" "autogen.sh")))))))
%standard-phases)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("libtool" ,libtool) ("libtool" ,libtool)

72
gnu/packages/graphviz.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,51 +44,41 @@
(define-public graphviz (define-public graphviz
(package (package
(name "graphviz") (name "graphviz")
(version "2.38.0") (version "2.40.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-" "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1")))) "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input.
'(#:tests? #f '(#:tests? #f
#:phases
#:phases (alist-cons-before (modify-phases %standard-phases
'build 'pre-build (add-after 'install 'move-docs
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
;; Work around bogus makefile when using an external (let ((out (assoc-ref outputs "out"))
;; libltdl. Failing to do so, one hits this error: (doc (assoc-ref outputs "doc")))
;; "No rule to make target `-lltdl', needed by `libgvc.la'." (mkdir-p (string-append doc "/share/graphviz"))
(substitute* "lib/gvc/Makefile" (rename-file (string-append out "/share/graphviz/doc")
(("am__append_5 *=.*") (string-append doc "/share/graphviz/doc"))
"am_append_5 =\n"))) #t)))
(alist-cons-after (add-after 'move-docs 'move-guile-bindings
'install 'move-docs (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))
(let ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))
(doc (assoc-ref outputs "doc"))) (extdir (string-append lib
(mkdir-p (string-append doc "/share/graphviz")) "/guile/2.0/extensions")))
(rename-file (string-append out "/share/graphviz/doc") (mkdir-p extdir)
(string-append doc "/share/graphviz/doc")) (rename-file (string-append
#t)) lib "/graphviz/guile/libgv_guile.so")
(alist-cons-after (string-append extdir
'move-docs 'move-guile-bindings "/libgv_guile.so"))
(lambda* (#:key outputs #:allow-other-keys) #t))))))
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(extdir (string-append lib
"/guile/2.0/extensions")))
(mkdir-p extdir)
(rename-file (string-append
lib "/graphviz/guile/libgv_guile.so")
(string-append extdir
"/libgv_guile.so"))))
%standard-phases)))))
(inputs (inputs
`(("libXrender" ,libxrender) `(("libXrender" ,libxrender)
("libX11" ,libx11) ("libX11" ,libx11)

4
gnu/packages/gstreamer.scm
View file

@ -280,10 +280,10 @@ developers consider to have good quality code and correct functionality.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-openjpeg-reference (add-after 'unpack 'patch-openjpeg-reference
(lambda _ (lambda _
;; Remove hard-coded openjpeg-2.1 path. 2.2 is API- and ;; Remove hard-coded openjpeg-2.2 path. 2.3 is API- and
;; ABI-compatible. ;; ABI-compatible.
(substitute* "ext/openjpeg/gstopenjpeg.h" (substitute* "ext/openjpeg/gstopenjpeg.h"
(("<openjpeg-2\\.1/") "<openjpeg-2.2/")) (("<openjpeg-2\\.2/") "<openjpeg-2.3/"))
#t))))) #t)))))
(propagated-inputs (propagated-inputs
`(("gst-plugins-base" ,gst-plugins-base))) `(("gst-plugins-base" ,gst-plugins-base)))

96
gnu/packages/gtk.scm
View file

@ -105,14 +105,14 @@ tools have full access to view and control running applications.")
(define-public cairo (define-public cairo
(package (package
(name "cairo") (name "cairo")
(version "1.14.8") (version "1.14.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cairographics.org/releases/cairo-" (uri (string-append "https://cairographics.org/releases/cairo-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"082ypjlh03ss5616amgjp9ap3xwwccyh2knyyrj1a4d4x65dkwni")) "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"))
(patches (search-patches "cairo-CVE-2016-9082.patch")))) (patches (search-patches "cairo-CVE-2016-9082.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
@ -171,7 +171,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public harfbuzz (define-public harfbuzz
(package (package
(name "harfbuzz") (name "harfbuzz")
(version "1.4.6") (version "1.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/" (uri (string-append "https://www.freedesktop.org/software/"
@ -179,7 +179,7 @@ affine transformation (scale, rotation, shear, etc.).")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"14yj514yfy373np3gxk930a443j1zgnwg6mm0kdzzjr0rn0qp9r1")))) "0lbwzif7ndvx1iqzp7wxv6j3ilal6di2vj33cy3bha97mpyqv0sn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"bin")) ; 160K, only hb-view depend on cairo "bin")) ; 160K, only hb-view depend on cairo
@ -209,7 +209,7 @@ affine transformation (scale, rotation, shear, etc.).")
(define-public pango (define-public pango
(package (package
(name "pango") (name "pango")
(version "1.40.6") (version "1.40.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/" (uri (string-append "mirror://gnome/sources/pango/"
@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0wz5b5knpw4gfvz3ny8l6h2ca3bpqqyh55mffkyzgsd1hdrjn5fa")))) "1z0w2vrx3qh3aryfkbfijkcxxr3yjbxc2l4b0yy8rcp2wjlakwbm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
@ -279,16 +279,17 @@ functions which were removed.")
"0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'set-flags (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-before 'configure 'set-flags
;; Compile with C++11, required by gtkmm. (lambda* (#:key outputs #:allow-other-keys)
(setenv "CXXFLAGS" "-std=c++11") ;; Compile with C++11, required by gtkmm.
;; Allow 'bin/ganv_bench' to find libganv-1.so. (setenv "CXXFLAGS" "-std=c++11")
(setenv "LDFLAGS" ;; Allow 'bin/ganv_bench' to find libganv-1.so.
(string-append "-Wl,-rpath=" (setenv "LDFLAGS"
(assoc-ref outputs "out") "/lib"))) (string-append "-Wl,-rpath="
%standard-phases) (assoc-ref outputs "out") "/lib"))
#t)))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(inputs (inputs
`(("gtk" ,gtk+-2) `(("gtk" ,gtk+-2)
@ -349,24 +350,24 @@ diagrams.")
`(#:phases `(#:phases
;; Unfortunately, some of the tests in "make check" are highly dependent ;; Unfortunately, some of the tests in "make check" are highly dependent
;; on the environment therefore, some black magic is required. ;; on the environment therefore, some black magic is required.
(alist-cons-before (modify-phases %standard-phases
'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xorg-server (assoc-ref inputs "xorg-server"))
(mime (assoc-ref inputs "shared-mime-info"))) (mime (assoc-ref inputs "shared-mime-info")))
;; There must be a running X server and make check doesn't start one. ;; There must be a running X server and make check doesn't start one.
;; Therefore we must do it. ;; Therefore we must do it.
(system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0 ;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
(system "ln -s gtksourceview gtksourceview-2.0") (system "ln -s gtksourceview gtksourceview-2.0")
(setenv "XDG_DATA_HOME" (getcwd)) (setenv "XDG_DATA_HOME" (getcwd))
;; Finally, the mimetypes must be available. ;; Finally, the mimetypes must be available.
(setenv "XDG_DATA_DIRS" (string-append mime "/share/")) )) (setenv "XDG_DATA_DIRS" (string-append mime "/share/")))
%standard-phases))) #t)))))
(synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget") (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget")
(description (description
"GtkSourceView is a portable C library that extends the standard GTK+ "GtkSourceView is a portable C library that extends the standard GTK+
@ -653,7 +654,7 @@ application suites.")
(name "gtk+") (name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
;; mate.scm will also need to be updated. ;; mate.scm will also need to be updated.
(version "3.22.15") (version "3.22.21")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -661,7 +662,7 @@ application suites.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nqgb71vx222g9fd2p017948hqybnyi69xs3n2d64clim7115868")) "11vb1shgr4rlayfk0b858gz986jsn2mpjlxvr89b2kgvbjlc3lqv"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(outputs '("out" "bin" "doc")) (outputs '("out" "bin" "doc"))
@ -875,18 +876,19 @@ images onto Cairo surfaces.")
"godir = $(moddir)\n"))))) "godir = $(moddir)\n")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'post-install (modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (add-after 'install 'post-install
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(bin (string-append out "/bin")) (let* ((out (assoc-ref outputs "out"))
(guile (assoc-ref inputs "guile"))) (bin (string-append out "/bin"))
(substitute* (find-files bin ".*") (guile (assoc-ref inputs "guile")))
(("guile") (substitute* (find-files bin ".*")
(string-append guile "/bin/guile -L " (("guile")
out "/share/guile/site/2.0 -C " (string-append guile "/bin/guile -L "
out "/share/guile/site/2.0 "))))) out "/share/guile/site/2.0 -C "
%standard-phases))) out "/share/guile/site/2.0 "))))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2)))
(propagated-inputs (propagated-inputs
@ -1160,7 +1162,7 @@ extensive documentation, including API reference and a tutorial.")
`(#:python ,python-2 `(#:python ,python-2
,@(substitute-keyword-arguments (package-arguments python-pycairo) ,@(substitute-keyword-arguments (package-arguments python-pycairo)
((#:phases phases) ((#:phases phases)
`(alist-delete 'patch-waf ,phases)) `(modify-phases ,phases (delete 'patch-waf)))
((#:native-inputs native-inputs) ((#:native-inputs native-inputs)
`(alist-delete "python-waf" ,native-inputs))))) `(alist-delete "python-waf" ,native-inputs)))))
;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
@ -1254,7 +1256,7 @@ write GNOME applications.")
#:test-target "test" #:test-target "test"
#:tests? #f ; Tests fail with "Gtk cannot open display:" #:tests? #f ; Tests fail with "Gtk cannot open display:"
#:phases #:phases
(alist-delete 'configure %standard-phases))) (modify-phases %standard-phases (delete 'configure))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://pwmt.org/projects/girara/") (home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces") (synopsis "Library for minimalistic gtk+3 user interfaces")

81
gnu/packages/guile-wm.scm
View file

@ -83,50 +83,51 @@ dependencies.")
#:configure-flags (list (string-append "--datadir=" #:configure-flags (list (string-append "--datadir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))
#:phases (alist-cons-before #:phases
'configure 'set-go-directory (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-before 'configure 'set-go-directory
;; Install .go files to $out/share/guile/site/2.0. (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) ;; Install .go files to $out/share/guile/site/2.0.
(substitute* "module/Makefile.in" (let ((out (assoc-ref outputs "out")))
(("^wmdir = .*$") (substitute* "module/Makefile.in"
(string-append "wmdir = " out (("^wmdir = .*$")
"/share/guile/site/2.0\n"))))) (string-append "wmdir = " out
(alist-cons-after "/share/guile/site/2.0\n"))))
'install 'set-load-path #t))
(lambda* (#:key inputs outputs #:allow-other-keys) (add-after 'install 'set-load-path
;; Put Guile-XCB's and Guile-WM's modules in the (lambda* (#:key inputs outputs #:allow-other-keys)
;; search path of PROG. ;; Put Guile-XCB's and Guile-WM's modules in the
(let* ((out (assoc-ref outputs "out")) ;; search path of PROG.
(prog (string-append out "/bin/guile-wm")) (let* ((out (assoc-ref outputs "out"))
(mods (string-append (prog (string-append out "/bin/guile-wm"))
out "/share/guile/site/2.0")) (mods (string-append
(xcb (string-append out "/share/guile/site/2.0"))
(assoc-ref inputs "guile-xcb") (xcb (string-append
"/share/guile/site/2.0"))) (assoc-ref inputs "guile-xcb")
(wrap-program "/share/guile/site/2.0")))
prog (wrap-program
`("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) prog
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb))
(,mods ,xcb))))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(alist-cons-after (,mods ,xcb))))
'install 'install-xsession #t))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'install-xsession
;; add a .desktop file to xsessions (lambda* (#:key outputs #:allow-other-keys)
(let ((xsessions (string-append ;; add a .desktop file to xsessions
%output "/share/xsessions"))) (let ((xsessions (string-append
(mkdir-p xsessions) %output "/share/xsessions")))
(call-with-output-file (string-append (mkdir-p xsessions)
xsessions "/guile-wm.desktop") (call-with-output-file (string-append
(lambda (port) xsessions "/guile-wm.desktop")
(format port (lambda (port)
"[Desktop Entry]~@ (format port
"[Desktop Entry]~@
Name=~a~@ Name=~a~@
Comment=~a~@ Comment=~a~@
Exec=~a/bin/guile-wm~@ Exec=~a/bin/guile-wm~@
Type=Application~%" Type=Application~%"
,name ,synopsis %output))))) ,name ,synopsis %output))))
%standard-phases))))) #t)))))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)
("guile-xcb" ,guile-xcb))) ("guile-xcb" ,guile-xcb)))

82
gnu/packages/guile.scm
View file

@ -13,7 +13,8 @@
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 ng0 <ng0@infotropique.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -94,24 +95,24 @@
(arguments '(#:configure-flags '("--disable-error-on-warning") (arguments '(#:configure-flags '("--disable-error-on-warning")
;; Insert a phase before `configure' to patch things up. ;; Insert a phase before `configure' to patch things up.
#:phases (alist-cons-before #:phases
'configure (modify-phases %standard-phases
'patch-stuff (add-before 'configure 'patch-stuff
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Add a call to `lt_dladdsearchdir' so that ;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the ;; `libguile-readline.so' & co. are in the
;; loader's search path. ;; loader's search path.
(substitute* "libguile/dynl.c" (substitute* "libguile/dynl.c"
(("lt_dlinit.*$" match) (("lt_dlinit.*$" match)
(format #f (format #f
" ~a~% lt_dladdsearchdir(\"~a/lib\");~%" " ~a~% lt_dladdsearchdir(\"~a/lib\");~%"
match match
(assoc-ref outputs "out")))) (assoc-ref outputs "out"))))
;; The usual /bin/sh... ;; The usual /bin/sh...
(substitute* "ice-9/popen.scm" (substitute* "ice-9/popen.scm"
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))
%standard-phases))) #t)))))
(inputs `(("gawk" ,gawk) (inputs `(("gawk" ,gawk)
("readline" ,readline))) ("readline" ,readline)))
@ -1966,4 +1967,49 @@ HTML (via SXML) or any other format for rendering.")
It has a nice, simple s-expression based syntax.") It has a nice, simple s-expression based syntax.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-colorized
(package
(name "guile-colorized")
(version "0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/NalaGinrut/guile-colorized/"
"archive/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"16xhc3an6aglnca8xl3mvgi8hsqzqn68vsl5ga4bz8bvbap5fn4p"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((system base compile)
,@%gnu-build-system-modules)
#:tests? #f ;No tests included
#:phases
(modify-phases %standard-phases
(delete 'configure) ;No configure script
(replace 'install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(module-dir (string-append out "/share/guile/site/2.2"))
(language-dir (string-append module-dir "/ice-9"))
(guild (string-append (assoc-ref inputs "guile")
"/bin/guild")))
;; The original 'make install' is too primitive.
;; copy the source
(install-file "ice-9/colorized.scm" language-dir)
;; compile to the destination
(compile-file "ice-9/colorized.scm"
#:output-file (string-append
language-dir "/colorized.go"))
#t))))))
(inputs
`(("guile" ,guile-2.2)))
(home-page "https://github.com/NalaGinrut/guile-colorized")
(synopsis "Colorized REPL for Guile")
(description
"Guile-colorized provides you with a colorized REPL for GNU Guile.")
(license license:gpl3+)))
;;; guile.scm ends here ;;; guile.scm ends here

61
gnu/packages/hugs.scm
View file

@ -39,36 +39,37 @@
"1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")))) "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'fix-sh-n-cp (modify-phases %standard-phases
(lambda _ (add-before 'configure 'fix-sh-n-cp
(substitute* (lambda _
'("configure" (substitute*
"libraries/configure" '("configure"
"packages/time/configure" "libraries/configure"
"packages/base/configure" "packages/time/configure"
"packages/X11/configure" "packages/base/configure"
"packages/HGL/configure" "packages/X11/configure"
"packages/OpenAL/configure" "packages/HGL/configure"
"packages/OpenGL/configure" "packages/OpenAL/configure"
"packages/network/configure" "packages/OpenGL/configure"
"packages/unix/configure" "packages/network/configure"
"packages/Cabal/tests/HSQL/configure" "packages/unix/configure"
"packages/ALUT/configure" "packages/Cabal/tests/HSQL/configure"
"packages/GLUT/configure" "packages/ALUT/configure"
"packages/base/cbits/execvpe.c" "packages/GLUT/configure"
"packages/base/System/Process/Internals.hs" "packages/base/cbits/execvpe.c"
"packages/Cabal/Distribution/attic" "packages/base/System/Process/Internals.hs"
"packages/Cabal/Distribution/Simple/Register.hs" "packages/Cabal/Distribution/attic"
"packages/Cabal/Distribution/Simple/Hugs.hs" "packages/Cabal/Distribution/Simple/Register.hs"
"tools/hugs-hc" "packages/Cabal/Distribution/Simple/Hugs.hs"
"src/machdep.c" "tools/hugs-hc"
"libraries/Makefile.in") "src/machdep.c"
(("/bin/sh") (which "sh"))) "libraries/Makefile.in")
(substitute* '("demos/Makefile.in" (("/bin/sh") (which "sh")))
"libraries/Makefile.in") (substitute* '("demos/Makefile.in"
(("/bin/cp") (which "cp")))) "libraries/Makefile.in")
%standard-phases) (("/bin/cp") (which "cp")))
#t)))
#:tests? #f)) ; no test target #:tests? #f)) ; no test target
;; FIXME: Fails to build with GCC 5. ;; FIXME: Fails to build with GCC 5.
(native-inputs `(("gcc" ,gcc-4.9))) (native-inputs `(("gcc" ,gcc-4.9)))

60
gnu/packages/hurd.scm
View file

@ -56,14 +56,13 @@
"02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")))) "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'install (modify-phases %standard-phases
(lambda _ (replace 'install
(zero? (lambda _
(system* "make" "install-data"))) (zero?
(alist-delete (system* "make" "install-data"))))
'build (delete 'build))
%standard-phases))
;; GNU Mach supports only IA32 currently, so cheat so that we can at ;; GNU Mach supports only IA32 currently, so cheat so that we can at
;; least install its headers. ;; least install its headers.
@ -125,11 +124,12 @@ communication.")
(native-inputs (native-inputs
`(("mig" ,mig))) `(("mig" ,mig)))
(arguments (arguments
`(#:phases (alist-replace `(#:phases
'install (modify-phases %standard-phases
(lambda _ (replace 'install
(zero? (system* "make" "install-headers" "no_deps=t"))) (lambda _
(alist-delete 'build %standard-phases)) (zero? (system* "make" "install-headers" "no_deps=t"))))
(delete 'build))
#:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants
;; that. ;; that.
@ -164,24 +164,22 @@ Library and other user programs.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments hurd-headers) (substitute-keyword-arguments (package-arguments hurd-headers)
((#:phases _) ((#:phases _)
'(alist-replace '(modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; We need to copy libihash.a to the output directory manually, ;; We need to copy libihash.a to the output directory manually,
;; since there is no target for that in the makefile. ;; since there is no target for that in the makefile.
(mkdir-p (string-append out "/include")) (mkdir-p (string-append out "/include"))
(copy-file "libihash/ihash.h" (copy-file "libihash/ihash.h"
(string-append out "/include/ihash.h")) (string-append out "/include/ihash.h"))
(mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/lib"))
(copy-file "libihash/libihash.a" (copy-file "libihash/libihash.a"
(string-append out "/lib/libihash.a")) (string-append out "/lib/libihash.a"))
#t)) #t)))
(alist-replace (replace 'build
'build (lambda _
(lambda _ (zero? (system* "make" "-Clibihash" "libihash.a"))))))))
(zero? (system* "make" "-Clibihash" "libihash.a")))
%standard-phases)))))
(home-page "https://www.gnu.org/software/hurd/hurd.html") (home-page "https://www.gnu.org/software/hurd/hurd.html")
(synopsis "GNU Hurd libraries") (synopsis "GNU Hurd libraries")
(description (description

17
gnu/packages/image-viewers.scm
View file

@ -54,7 +54,7 @@
(define-public feh (define-public feh
(package (package
(name "feh") (name "feh")
(version "2.20") (version "2.21")
(home-page "https://feh.finalrewind.org/") (home-page "https://feh.finalrewind.org/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -62,13 +62,13 @@
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b")))) "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ;FIXME: Requires 'perl-test-command'. #:tests? #f ;FIXME: Requires 'perl-test-command'.
#:make-flags #:make-flags
(list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(inputs `(("imlib2" ,imlib2) (inputs `(("imlib2" ,imlib2)
("curl" ,curl) ("curl" ,curl)
("libpng" ,libpng) ("libpng" ,libpng)
@ -178,9 +178,8 @@ It is the default image viewer on LXDE desktop environment.")
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
#:make-flags (list (string-append "PREFIX=" %output) #:make-flags (list (string-append "PREFIX=" %output)
"CC=gcc") "CC=gcc")
#:phases (alist-delete ;; no configure phase
'configure ; no configure phase #:phases (modify-phases %standard-phases (delete 'configure))))
%standard-phases)))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("imlib2" ,imlib2) ("imlib2" ,imlib2)

25
gnu/packages/image.scm
View file

@ -167,7 +167,7 @@ APNG patch provides APNG support to libpng.")
(define-public libpng-1.2 (define-public libpng-1.2
(package (package
(inherit libpng) (inherit libpng)
(version "1.2.57") (version "1.2.59")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -180,7 +180,8 @@ APNG patch provides APNG support to libpng.")
"ftp://ftp.simplesystems.org/pub/libpng/png/src/history" "ftp://ftp.simplesystems.org/pub/libpng/png/src/history"
"/libpng12/libpng-" version ".tar.xz"))) "/libpng12/libpng-" version ".tar.xz")))
(sha256 (sha256
(base32 "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg")))))) (base32
"1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl"))))))
(define-public r-png (define-public r-png
(package (package
@ -509,7 +510,7 @@ work.")
(define-public openjpeg (define-public openjpeg
(package (package
(name "openjpeg") (name "openjpeg")
(version "2.2.0") (version "2.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -519,13 +520,7 @@ work.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg")) "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx"))))
(patches (search-patches "openjpeg-CVE-2017-12982.patch"
"openjpeg-CVE-2017-14040.patch"
"openjpeg-CVE-2017-14041.patch"
"openjpeg-CVE-2017-14151.patch"
"openjpeg-CVE-2017-14152.patch"
"openjpeg-CVE-2017-14164.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Trying to run `$ make check' results in a no rule fault. ;; Trying to run `$ make check' results in a no rule fault.
@ -743,15 +738,15 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.")
(define-public vigra (define-public vigra
(package (package
(name "vigra") (name "vigra")
(version "1.11.0") (version "1.11.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ukoethe/vigra/releases/download/" (uri (string-append "https://github.com/ukoethe/vigra/releases/download/"
"Version-1-11-0/vigra-" "Version-" (string-join (string-split version #\.) "-")
version "-src.tar.gz")) "/vigra-" version "-src.tar.gz"))
(sha256 (base32 (sha256 (base32
"1jzm79kqiiilvys3b8mlzy9cvmiirrcwsrlg19qd9rza8zipsqb8")))) "1bqs8vx5i1bzamvv563i24gx2xxdidqyxh9iaj46mbznhc84wmm5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
@ -797,7 +792,7 @@ processing and analysis library that puts its main emphasis on customizable
algorithms and data structures. It is particularly strong for algorithms and data structures. It is particularly strong for
multi-dimensional image processing.") multi-dimensional image processing.")
(license license:expat) (license license:expat)
(home-page "https://hci.iwr.uni-heidelberg.de/vigra"))) (home-page "https://ukoethe.github.io/vigra/")))
(define-public libwebp (define-public libwebp
(package (package

7
gnu/packages/imagemagick.scm
View file

@ -46,14 +46,14 @@
;; The 7 release series has an incompatible API, while the 6 series is still ;; 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 ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API. ;; users are ready for the 7-series API.
(version "6.9.9-15") (version "6.9.9-18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-" (uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c")))) "1d70dvrgcasa3cla4c1dag4mw7vq4jk1nzbd604fk20l0l6xa78j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
@ -185,7 +185,8 @@ script.")
"graphicsmagick-CVE-2017-13775.patch" "graphicsmagick-CVE-2017-13775.patch"
"graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch" "graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch"
"graphicsmagick-CVE-2017-14042.patch" "graphicsmagick-CVE-2017-14042.patch"
"graphicsmagick-CVE-2017-14165.patch")))) "graphicsmagick-CVE-2017-14165.patch"
"graphicsmagick-CVE-2017-14649.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

11
gnu/packages/inkscape.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,6 +51,16 @@
(uri (string-append "https://media.inkscape.org/dl/" (uri (string-append "https://media.inkscape.org/dl/"
"resources/file/" "resources/file/"
"inkscape-" version ".tar.bz2")) "inkscape-" version ".tar.bz2"))
(patches
(list
;; Fix compatibility with poppler >= 0.58.
(origin
(method url-fetch)
(uri (string-append "https://gitlab.com/inkscape/inkscape/commit/"
"9418824967eb4c53371ef8588243fed4cab496e0.patch"))
(sha256
(base32
"0wwyhkqb1qyazz5f6wqrc223l6k8qnmadiw28q8gihlgvh38rvll")))))
(sha256 (sha256
(base32 (base32
"01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15")))) "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"))))

1304
gnu/packages/java.scm
View file

File diff suppressed because it is too large Load diff

5
gnu/packages/kde.scm
View file

@ -102,17 +102,16 @@
(qtquickcontrols (assoc-ref inputs "qtquickcontrols")) (qtquickcontrols (assoc-ref inputs "qtquickcontrols"))
(qtbase (assoc-ref inputs "qtbase")) (qtbase (assoc-ref inputs "qtbase"))
(qtdeclarative (assoc-ref inputs "qtdeclarative")) (qtdeclarative (assoc-ref inputs "qtdeclarative"))
(profile "$HOME/.guix-profile")
(qml "/qml")) (qml "/qml"))
(wrap-program (string-append out "/bin/kdevelop") (wrap-program (string-append out "/bin/kdevelop")
`("XDG_DATA_DIRS" ":" prefix `("XDG_DATA_DIRS" ":" prefix
,(map (lambda (s) (string-append s "/share")) ,(map (lambda (s) (string-append s "/share"))
(list profile out kdevplatform kcmutils))) (list out kdevplatform kcmutils)))
`("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
(,(string-append qtbase "/plugins/platforms"))) (,(string-append qtbase "/plugins/platforms")))
`("QT_PLUGIN_PATH" ":" prefix `("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (s) (string-append s "/lib/plugins")) ,(map (lambda (s) (string-append s "/lib/plugins"))
(list profile out kdevplatform kio))) (list out kdevplatform kio)))
`("QML2_IMPORT_PATH" ":" prefix `("QML2_IMPORT_PATH" ":" prefix
(,(string-append qtquickcontrols qml) (,(string-append qtquickcontrols qml)
,(string-append qtdeclarative qml)))))))))) ,(string-append qtdeclarative qml))))))))))

16
gnu/packages/kerberos.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2012, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2017 Ludovic Courtès <ludo@gnu.org>
@ -46,6 +46,7 @@
(define-public mit-krb5 (define-public mit-krb5
(package (package
(name "mit-krb5") (name "mit-krb5")
(replacement mit-krb5-1.15.2)
(version "1.15.1") (version "1.15.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -93,6 +94,19 @@ cryptography.")
(home-page "http://web.mit.edu/kerberos/") (home-page "http://web.mit.edu/kerberos/")
(properties '((cpe-name . "kerberos"))))) (properties '((cpe-name . "kerberos")))))
(define mit-krb5-1.15.2 ; CVE-2017-{11368,11462}
(package
(inherit mit-krb5)
(version "1.15.2")
(source (origin
(method url-fetch)
(uri (string-append "http://web.mit.edu/kerberos/dist/krb5/"
(version-major+minor version)
"/krb5-" version ".tar.gz"))
(sha256
(base32
"0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"))))))
(define-public shishi (define-public shishi
(package (package
(name "shishi") (name "shishi")

18
gnu/packages/libcanberra.scm
View file

@ -79,15 +79,15 @@
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'build 'patch-default-sounds-directory (add-before 'build 'patch-default-sounds-directory
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/sound-theme-spec.c" (substitute* "src/sound-theme-spec.c"
(("@SOUND_THEME_DIRECTORY@") (("@SOUND_THEME_DIRECTORY@")
(string-append (string-append
(assoc-ref inputs "sound-theme-freedesktop") (assoc-ref inputs "sound-theme-freedesktop")
"/share")))) "/share")))
%standard-phases))) #t)))))
(home-page "http://0pointer.de/lennart/projects/libcanberra/") (home-page "http://0pointer.de/lennart/projects/libcanberra/")
(synopsis (synopsis
"Implementation of the XDG Sound Theme and Name Specifications") "Implementation of the XDG Sound Theme and Name Specifications")

9
gnu/packages/libevent.scm
View file

@ -121,15 +121,14 @@ programs.")
(define-public libuv (define-public libuv
(package (package
(name "libuv") (name "libuv")
(version "1.12.0") (version "1.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libuv/libuv/archive/v" (uri (string-append "https://dist.libuv.org/dist/v" version
version ".tar.gz")) "/libuv-v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l0jrb5q3i8br10c8skc6xdwlxkmlpn3n0kngaqd68fsi1593kj1")))) "08kx4mzjsdv90n9pivqxqjxlxk5vaf9p33zzvx661dwfmp9468pk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases (alist-cons-after

94
gnu/packages/libreoffice.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -129,14 +130,14 @@ CSV, CSS and XML.")
(define-public librevenge (define-public librevenge
(package (package
(name "librevenge") (name "librevenge")
(version "0.0.2") (version "0.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-" (uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn")))) "1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
@ -161,14 +162,14 @@ spreadsheets and presentations.")
(define-public libwpd (define-public libwpd
(package (package
(name "libwpd") (name "libwpd")
(version "0.10.0") (version "0.10.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "mirror://sourceforge/" name "/" name "/"
name "-" version "/" name "-" version ".tar.xz")) name "-" version "/" name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx")))) "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -223,14 +224,14 @@ ZVR (simple compressed text format).")
(define-public libwpg (define-public libwpg
(package (package
(name "libwpg") (name "libwpg")
(version "0.3.0") (version "0.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "mirror://sourceforge/" name "/" name "/"
name "-" version "/" name "-" version ".tar.xz")) name "-" version "/" name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g")))) "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -323,17 +324,18 @@ AbiWord documents.")
(define-public libcdr (define-public libcdr
(package (package
(name "libcdr") (name "libcdr")
(version "0.1.1") (version "0.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" name "/" (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"07yzb1yr5kzv0binzj5swz3zzay2gw3xb0fbkc2zwdssgrkf19nh")))) "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("cppunit" ,cppunit)
("doxygen" ,doxygen)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs ; in Requires or Requires.private field of .pkg (propagated-inputs ; in Requires or Requires.private field of .pkg
`(("icu4c" ,icu4c) `(("icu4c" ,icu4c)
@ -362,7 +364,19 @@ CorelDRAW documents of all versions.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z")) "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z"))
(patches (search-patches "libetonyek-build-with-mdds-1.2.patch")))) (patches
(cons
(origin
(method url-fetch)
;; Drop incorrect test that fails with latest liblangtag.
(uri (string-append "https://cgit.freedesktop.org/libreoffice"
"/libetonyek/patch/?id="
"1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2"))
(file-name "libetonyek-build-with-liblangtag-0.6.patch")
(sha256
(base32
"0zdyykg3cmq226m54yjhg1fj5200c371h2qgjfna62dxa1jd6m97")))
(search-patches "libetonyek-build-with-mdds-1.2.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-mdds=1.2") `(#:configure-flags '("--with-mdds=1.2")
@ -393,7 +407,7 @@ Apple Keynote documents. It currently supports Keynote versions 2 to 5.")
(define-public liblangtag (define-public liblangtag
(package (package
(name "liblangtag") (name "liblangtag")
(version "0.5.8") (version "0.6.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -401,7 +415,7 @@ Apple Keynote documents. It currently supports Keynote versions 2 to 5.")
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1akf0d7yp29pv3j2pw2riii4n5kyjr9szc0y77khnx9zzr5zdqh8")))) "0bnm4hllr8cfrybm8rw7b8n0nlhzhnv73bkg1bxk452g6a82f96n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("libtool" ,libtool) `(("libtool" ,libtool)
@ -420,14 +434,14 @@ standard 21.0.2.")
(define-public libexttextcat (define-public libexttextcat
(package (package
(name "libexttextcat") (name "libexttextcat")
(version "3.4.4") (version "3.4.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" name "/" (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"14v2hkygnmf1zgahfm1fha47cr67iikrz2ymiqi28d2jydn0hk7j")))) "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://www.freedesktop.org/wiki/Software/libexttextcat/") (home-page "http://www.freedesktop.org/wiki/Software/libexttextcat/")
(synopsis "Text Categorization library") (synopsis "Text Categorization library")
@ -439,20 +453,24 @@ library primarily intended for language guessing.")
(define-public libfreehand (define-public libfreehand
(package (package
(name "libfreehand") (name "libfreehand")
(version "0.1.0") (version "0.1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" name "/" (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"01j7mxi4lmf72w1mv2r098p8l0csdd94w2gq0ncp93djn34al6ai")))) "1b1lvqh68rwij1yvmxy02hsmh7i74ma5767mk8mg5nx6chajshhf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("cppunit" ,cppunit)
("doxygen" ,doxygen)
("gperf" ,gperf) ("gperf" ,gperf)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs
`(("icu4c" ,icu4c)
("lcms" ,lcms)))
(propagated-inputs ; in Requires or Requires.private field of .pkg (propagated-inputs ; in Requires or Requires.private field of .pkg
`(("librevenge" ,librevenge) `(("librevenge" ,librevenge)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -492,14 +510,14 @@ Microsoft Publisher documents of all versions.")
(define-public libpagemaker (define-public libpagemaker
(package (package
(name "libpagemaker") (name "libpagemaker")
(version "0.0.2") (version "0.0.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" name "/" (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"05zgj5ngg9z4b7dnrfs59nm0macm99lzyxv4mg53jcvp0mkgigfd")))) "1minj0q14d44qfas81a8lkpgj288h5xlkjp084sfx17xv9axr5nq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -509,9 +527,6 @@ Microsoft Publisher documents of all versions.")
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments
;; avoid triggering a build failure due to warnings
`(#:configure-flags '("--disable-werror")))
(home-page "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker") (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker")
(synopsis "Library for parsing the PageMaker format") (synopsis "Library for parsing the PageMaker format")
(description "Libpagemaker is a library that parses the file format of (description "Libpagemaker is a library that parses the file format of
@ -522,15 +537,15 @@ created by PageMaker version 6.x and 7.")
(define-public libvisio (define-public libvisio
(package (package
(name "libvisio") (name "libvisio")
;; FIXME: The newer version 0.1.1 fails its tests. (version "0.1.5")
(version "0.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" name "/" (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "libvisio-fix-tests.patch"))
(sha256 (base32 (sha256 (base32
"0vvd2wyp4rw6s9xnj1dc9vgdpfvm45gnb5b9hhzif0fdnx4iskqf")))) "132szijxm95ibzq5qqaylifbf6wa81g08jxggnwv22v60dwhc2j3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
@ -544,10 +559,6 @@ created by PageMaker version 6.x and 7.")
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(inputs (inputs
`(("boost" ,boost))) `(("boost" ,boost)))
;; FIXME: Not needed any more for newer version 0.1.1.
(arguments
;; avoid triggering a build failure due to warnings
`(#:configure-flags '("--disable-werror")))
(home-page "https://wiki.documentfoundation.org/DLP/Libraries/libvisio") (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libvisio")
(synopsis "Library for parsing the Microsoft Visio format") (synopsis "Library for parsing the Microsoft Visio format")
(description "Libvisio is a library that parses the file format of (description "Libvisio is a library that parses the file format of
@ -557,14 +568,14 @@ Microsoft Visio documents of all versions.")
(define-public libodfgen (define-public libodfgen
(package (package
(name "libodfgen") (name "libodfgen")
(version "0.1.3") (version "0.1.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" (uri (string-append "http://dev-www.libreoffice.org/src/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (base32 (sha256 (base32
"074qsav86ixwi9zm1f77g9vxdf1ihm6n930vxjg8q3lwzd8g7lb6")))) "1hn91bm6dni7n3frh7lpbj3mjqmdrpn12ipq8rswd9445y4j2yrc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -588,15 +599,14 @@ text documents, vector drawings, presentations and spreadsheets.")
(define-public libmwaw (define-public libmwaw
(package (package
(name "libmwaw") (name "libmwaw")
(version "0.3.11") (version "0.3.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-"
version "/" name "-" version ".tar.xz")) version "/" name "-" version ".tar.xz"))
(patches (search-patches "libmwaw-CVE-2017-9433.patch"))
(sha256 (base32 (sha256 (base32
"16i9s9p4sjpdpbm3gq6jkc9r3nyfy47ggkdlgh7vr0mydccklj2b")))) "1ryi1v38lgy5kv84fzjqkawidrg30y4hlqrz1v262792wzkad4bn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -606,9 +616,6 @@ text documents, vector drawings, presentations and spreadsheets.")
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments
;; avoid triggering configure errors by simple inclusion of boost headers
`(#:configure-flags '("--disable-werror")))
(home-page "https://sourceforge.net/p/libmwaw/wiki/Home/") (home-page "https://sourceforge.net/p/libmwaw/wiki/Home/")
(synopsis "Import library for some old Macintosh text documents") (synopsis "Import library for some old Macintosh text documents")
(description "Libmwaw contains some import filters for old Macintosh (description "Libmwaw contains some import filters for old Macintosh
@ -642,14 +649,14 @@ from the old StarOffice (.sdc, .sdw, ...).")
(define-public libwps (define-public libwps
(package (package
(name "libwps") (name "libwps")
(version "0.4.0") (version "0.4.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" name "/" (uri (string-append "mirror://sourceforge/" name "/" name "/"
name "-" version "/" name "-" version ".tar.xz")) name "-" version "/" name "-" version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0nlrdk7di015l0sk0ivjdqs86zdcvf73p9z9s9ry5glyhrknzxjk")))) "05xjb35y5ha9grgjqs3viaglq7ydsry1hzdvkm7y5b6f1disnb1g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -659,9 +666,6 @@ from the old StarOffice (.sdc, .sdw, ...).")
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments
;; avoid triggering configure errors by simple inclusion of boost headers
`(#:configure-flags '("--disable-werror")))
(home-page "http://libwps.sourceforge.net/") (home-page "http://libwps.sourceforge.net/")
(synopsis "Import library for Microsoft Works text documents") (synopsis "Import library for Microsoft Works text documents")
(description "Libwps is a library for importing files in the Microsoft (description "Libwps is a library for importing files in the Microsoft
@ -671,14 +675,14 @@ Works word processor file format.")
(define-public libzmf (define-public libzmf
(package (package
(name "libzmf") (name "libzmf")
(version "0.0.1") (version "0.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-" (uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (base32 (sha256 (base32
"0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga")))) "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
@ -962,7 +966,7 @@ and to return information on pronunciations, meanings and synonyms.")
(list "sysui/CustomTarget_share.mk" (list "sysui/CustomTarget_share.mk"
"solenv/gbuild/gbuild.mk" "solenv/gbuild/gbuild.mk"
"solenv/gbuild/platform/unxgcc.mk") "solenv/gbuild/platform/unxgcc.mk")
(("/bin/sh") (which "bash"))) (("/bin/sh") (which "sh")))
(mkdir "external/tarballs") (mkdir "external/tarballs")
(symlink (symlink
xmlsec xmlsec

2
gnu/packages/libusb.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.

291
gnu/packages/linux.scm
View file

@ -367,8 +367,8 @@ It has been modified to remove all non-free binary blobs.")
(define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define %linux-libre-version "4.13.4") (define %linux-libre-version "4.13.5")
(define %linux-libre-hash "028dww9c6x22mvd0jd87bmibqiz5lrsyynrbzka18gh39sk0v8j7") (define %linux-libre-hash "1crw61x7qrijhpw0azxf9b3fra0cxq87ncni2419p0s23jfdpc4m")
(define-public linux-libre (define-public linux-libre
(make-linux-libre %linux-libre-version (make-linux-libre %linux-libre-version
@ -377,14 +377,14 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.9 (define-public linux-libre-4.9
(make-linux-libre "4.9.52" (make-linux-libre "4.9.53"
"0zl1z13r4gg6r2sbx8mrif2cnjkjlfrswiap7wzb22jyfnlyj5nb" "174i53cd090akbjq34dj4z00h1nyfmy3sl3fk6svcmbx6h34381h"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.4 (define-public linux-libre-4.4
(make-linux-libre "4.4.89" (make-linux-libre "4.4.90"
"1bw1cma8hxcj6wi8znc4nvw1p6dlc1lgciqak6n6ijn53xdd242h" "1sqzvz8yrcf99vhphkxp1wm2agq6q9nshxb1mkypspm8rhm11vhw"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))
@ -511,7 +511,7 @@ providing the system administrator with some help in common tasks.")
(define-public util-linux (define-public util-linux
(package (package
(name "util-linux") (name "util-linux")
(version "2.30") (version "2.30.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/" (uri (string-append "mirror://kernel.org/linux/utils/"
@ -519,7 +519,7 @@ providing the system administrator with some help in common tasks.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262")) "0hdq2fz405a89fyha4bgwg0rx8b65inxq17w8fg8qhmcj4x3dr0v"))
(patches (search-patches "util-linux-tests.patch")) (patches (search-patches "util-linux-tests.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -1434,22 +1434,22 @@ Linux-based operating systems.")
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'unpack 'bootstrap (modify-phases %standard-phases
(lambda _ (add-after 'unpack 'bootstrap
;; Fix "field ‘ip6’ has incomplete type" errors. (lambda _
(substitute* "libbridge/libbridge.h" ;; Fix "field ‘ip6’ has incomplete type" errors.
(("#include <linux/if_bridge.h>") (substitute* "libbridge/libbridge.h"
"#include <linux/in6.h>\n#include <linux/if_bridge.h>")) (("#include <linux/if_bridge.h>")
"#include <linux/in6.h>\n#include <linux/if_bridge.h>"))
;; Ensure that the entire build fails if one of the ;; Ensure that the entire build fails if one of the
;; sub-Makefiles fails. ;; sub-Makefiles fails.
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;") (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;")) "$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
(zero? (system* "autoreconf" "-vf"))) (zero? (system* "autoreconf" "-vf")))))
%standard-phases)
#:tests? #f)) ; no 'check' target #:tests? #f)) ; no 'check' target
(home-page (home-page
@ -1466,7 +1466,7 @@ transparently through a bridge.")
(define-public libnl (define-public libnl
(package (package
(name "libnl") (name "libnl")
(version "3.3.0") (version "3.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1475,7 +1475,7 @@ transparently through a bridge.")
"/libnl-" version ".tar.gz")) "/libnl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1r3lw3hjvqxi5zqyq2w1qadm3gisd9nlf71dkl4yplacmssnhm3h")))) "1gzm444rnsib64dddv0cwlpzy1q4bycjqhp1i5pxpikimqvpca5p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -1490,7 +1490,7 @@ transparently through a bridge.")
(string-join (string-split version #\.) "_") (string-join (string-split version #\.) "_")
"/libnl-doc-" version ".tar.gz")) "/libnl-doc-" version ".tar.gz"))
(sha256 (sha256
(base32 "0srab805yj8wb13l64qjyp3mdbqapxg5vk46v3zlhhzpmxqw8j7r")))))) (base32 "1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx"))))))
(inputs (inputs
`(("python-2" ,python-2) `(("python-2" ,python-2)
("python-3" ,python-3))) ("python-3" ,python-3)))
@ -1554,7 +1554,7 @@ configuration and monitoring interfaces.")
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc") "CC=gcc")
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "https://wireless.wiki.kernel.org/") (home-page "https://wireless.wiki.kernel.org/")
(synopsis "Tool for configuring wireless devices") (synopsis "Tool for configuring wireless devices")
(description (description
@ -1687,27 +1687,28 @@ processes currently causing I/O.")
(string-append "UDEV_RULES_PATH=" (string-append "UDEV_RULES_PATH="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/udev/rules.d")) "/lib/udev/rules.d"))
#:phases (alist-cons-before #:phases
'build 'set-file-names (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'build 'set-file-names
;; libfuse calls out to mount(8) and umount(8). Make sure (lambda* (#:key inputs #:allow-other-keys)
;; it refers to the right ones. ;; libfuse calls out to mount(8) and umount(8). Make sure
(substitute* '("lib/mount_util.c" "util/mount_util.c") ;; it refers to the right ones.
(("/bin/(u?)mount" _ maybe-u) (substitute* '("lib/mount_util.c" "util/mount_util.c")
(string-append (assoc-ref inputs "util-linux") (("/bin/(u?)mount" _ maybe-u)
"/bin/" maybe-u "mount"))) (string-append (assoc-ref inputs "util-linux")
(substitute* '("util/mount.fuse.c") "/bin/" maybe-u "mount")))
(("/bin/sh") (substitute* '("util/mount.fuse.c")
(which "sh"))) (("/bin/sh")
(which "sh")))
;; This hack leads libfuse to search for 'fusermount' in ;; This hack leads libfuse to search for 'fusermount' in
;; $PATH, where it may find a setuid-root binary, instead of ;; $PATH, where it may find a setuid-root binary, instead of
;; trying solely $out/sbin/fusermount and failing because ;; trying solely $out/sbin/fusermount and failing because
;; it's not setuid. ;; it's not setuid.
(substitute* "lib/Makefile" (substitute* "lib/Makefile"
(("-DFUSERMOUNT_DIR=[[:graph:]]+") (("-DFUSERMOUNT_DIR=[[:graph:]]+")
"-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))) "-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))
%standard-phases))) #t)))))
(home-page "https://github.com/libfuse/libfuse") (home-page "https://github.com/libfuse/libfuse")
(synopsis "Support file systems implemented in user space") (synopsis "Support file systems implemented in user space")
(description (description
@ -1785,20 +1786,20 @@ UnionFS-FUSE additionally supports copy-on-write.")
(arguments (arguments
'(#:tests? #f '(#:tests? #f
#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static") #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static")
#:phases (alist-cons-after #:phases
'install 'post-install (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'post-install
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key outputs #:allow-other-keys)
(exe (string-append out "/bin/unionfs"))) (let* ((out (assoc-ref outputs "out"))
;; By default, 'unionfs' keeps references to (exe (string-append out "/bin/unionfs")))
;; $glibc/share/locale and similar stuff. Remove them. ;; By default, 'unionfs' keeps references to
(remove-store-references exe) ;; $glibc/share/locale and similar stuff. Remove them.
(remove-store-references exe)
;; 'unionfsctl' has references to glibc as well. Since ;; 'unionfsctl' has references to glibc as well. Since
;; we don't need it, remove it. ;; we don't need it, remove it.
(delete-file (string-append out "/bin/unionfsctl")) (delete-file (string-append out "/bin/unionfsctl"))
#t)) #t))))))
%standard-phases)))
(inputs `(("fuse" ,fuse-static))))) (inputs `(("fuse" ,fuse-static)))))
(define-public sshfs-fuse (define-public sshfs-fuse
@ -2398,43 +2399,42 @@ country-specific regulations for the wireless spectrum.")
(string-append "MANDIR=" %output "/share/man") (string-append "MANDIR=" %output "/share/man")
(string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib")) (string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib"))
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (delete 'configure)
(alist-cons-before (add-before 'build 'patch-exec-paths
'build 'patch-exec-paths (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "prog/detect/sensors-detect"
(substitute* "prog/detect/sensors-detect" (("`uname")
(("`uname") (string-append "`" (assoc-ref inputs "coreutils")
(string-append "`" (assoc-ref inputs "coreutils") "/bin/uname"))
"/bin/uname")) (("(`|\")modprobe" all open-quote)
(("(`|\")modprobe" all open-quote) (string-append open-quote
(string-append open-quote (assoc-ref inputs "kmod")
(assoc-ref inputs "kmod") "/bin/modprobe")))
"/bin/modprobe"))) (substitute* '("prog/pwm/pwmconfig"
(substitute* '("prog/pwm/pwmconfig" "prog/pwm/fancontrol")
"prog/pwm/fancontrol") (("gnuplot")
(("gnuplot") (string-append (assoc-ref inputs "gnuplot")
(string-append (assoc-ref inputs "gnuplot") "/bin/gnuplot"))
"/bin/gnuplot")) (("cat ")
(("cat ") (string-append (assoc-ref inputs "coreutils")
(string-append (assoc-ref inputs "coreutils") "/bin/cat "))
"/bin/cat ")) (("egrep ")
(("egrep ") (string-append (assoc-ref inputs "grep")
(string-append (assoc-ref inputs "grep") "/bin/egrep "))
"/bin/egrep ")) (("sed -e")
(("sed -e") (string-append (assoc-ref inputs "sed")
(string-append (assoc-ref inputs "sed") "/bin/sed -e"))
"/bin/sed -e")) (("cut -d")
(("cut -d") (string-append (assoc-ref inputs "coreutils")
(string-append (assoc-ref inputs "coreutils") "/bin/cut -d"))
"/bin/cut -d")) (("sleep ")
(("sleep ") (string-append (assoc-ref inputs "coreutils")
(string-append (assoc-ref inputs "coreutils") "/bin/sleep "))
"/bin/sleep ")) (("readlink -f")
(("readlink -f") (string-append (assoc-ref inputs "coreutils")
(string-append (assoc-ref inputs "coreutils") "/bin/readlink -f")))
"/bin/readlink -f")))) #t)))))
%standard-phases))))
(home-page "http://jdelvare.nerim.net/devel.html#lmsensors") (home-page "http://jdelvare.nerim.net/devel.html#lmsensors")
(synopsis "Utilities to read temperature/voltage/fan sensors") (synopsis "Utilities to read temperature/voltage/fan sensors")
(description (description
@ -2461,7 +2461,7 @@ It works with most newer systems.")
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)
"CC=gcc") "CC=gcc")
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "http://jdelvare.nerim.net/devel.html#i2ctools") (home-page "http://jdelvare.nerim.net/devel.html#i2ctools")
@ -2490,18 +2490,19 @@ SMBus access.")
("gtk" ,gtk+-2))) ("gtk" ,gtk+-2)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases
'configure 'enable-deprecated (modify-phases %standard-phases
(lambda _ (add-before 'configure 'enable-deprecated
(substitute* "src/Makefile.in" (lambda _
(("-DGDK_DISABLE_DEPRECATED") "") (substitute* "src/Makefile.in"
(("-DGTK_DISABLE_DEPRECATED") ""))) (("-DGDK_DISABLE_DEPRECATED") "")
(alist-cons-before (("-DGTK_DISABLE_DEPRECATED") ""))
'configure 'remove-Werror #t))
(lambda _ (add-before 'configure 'remove-Werror
(substitute* '("configure" "src/Makefile.in") (lambda _
(("-Werror") ""))) (substitute* '("configure" "src/Makefile.in")
%standard-phases)))) (("-Werror") ""))
#t)))))
(home-page "http://www.linuxhardware.org/xsensors/") (home-page "http://www.linuxhardware.org/xsensors/")
(synopsis "Hardware health information viewer") (synopsis "Hardware health information viewer")
(description (description
@ -2517,12 +2518,13 @@ in a digital read-out.")
(source (package-source linux-libre)) (source (package-source linux-libre))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (replace 'configure
(setenv "SHELL_PATH" (which "bash")) (lambda* (#:key inputs #:allow-other-keys)
(chdir "tools/perf")) (setenv "SHELL_PATH" (which "bash"))
%standard-phases) (chdir "tools/perf")
#t)))
#:make-flags (list (string-append "DESTDIR=" #:make-flags (list (string-append "DESTDIR="
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
"WERROR=0" "WERROR=0"
@ -2861,22 +2863,23 @@ MPEG-2 and audio over Linux IEEE 1394.")
(string-append "BINDIR=" out "/sbin") (string-append "BINDIR=" out "/sbin")
(string-append "MANDIR=" out "/share/man") (string-append "MANDIR=" out "/share/man")
(string-append "UDEVDIR=" out "/lib/udev"))) (string-append "UDEVDIR=" out "/lib/udev")))
#:phases (alist-cons-before #:phases
'build 'patch-program-paths (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'build 'patch-program-paths
(let ((coreutils (assoc-ref inputs "coreutils"))) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "udev-md-raid-arrays.rules" (let ((coreutils (assoc-ref inputs "coreutils")))
(("/usr/bin/(readlink|basename)" all program) (substitute* "udev-md-raid-arrays.rules"
(string-append coreutils "/bin/" program))))) (("/usr/bin/(readlink|basename)" all program)
(alist-cons-before (string-append coreutils "/bin/" program))))
'build 'remove-W-error #t))
(lambda _ (add-before 'build 'remove-W-error
;; We cannot build with -Werror on i686 due to a (lambda _
;; 'sign-compare' warning in util.c. ;; We cannot build with -Werror on i686 due to a
(substitute* "Makefile" ;; 'sign-compare' warning in util.c.
(("-Werror") "")) (substitute* "Makefile"
#t) (("-Werror") ""))
(alist-delete 'configure %standard-phases))) #t))
(delete 'configure))
;;tests must be done as root ;;tests must be done as root
#:tests? #f)) #:tests? #f))
(home-page "http://neil.brown.name/blog/mdadm") (home-page "http://neil.brown.name/blog/mdadm")
@ -3011,7 +3014,7 @@ Linux Device Mapper multipathing driver:
(list "CC=gcc" (string-append "prefix=" %output)) (list "CC=gcc" (string-append "prefix=" %output))
#:test-target "partcheck" ; need root for a full 'check' #:test-target "partcheck" ; need root for a full 'check'
#:phases #:phases
(alist-delete 'configure %standard-phases))) ; no configure script (modify-phases %standard-phases (delete 'configure)))) ; no configure script
(home-page "http://lse.sourceforge.net/io/aio.html") (home-page "http://lse.sourceforge.net/io/aio.html")
(synopsis "Linux-native asynchronous I/O access library") (synopsis "Linux-native asynchronous I/O access library")
(description (description
@ -3046,7 +3049,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez (define-public bluez
(package (package
(name "bluez") (name "bluez")
(version "5.45") (version "5.47")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3054,8 +3057,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c")) "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg"))))
(patches (search-patches "bluez-CVE-2017-1000250.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -3182,7 +3184,7 @@ and copy/paste text in the console and in xterm.")
(define-public btrfs-progs (define-public btrfs-progs
(package (package
(name "btrfs-progs") (name "btrfs-progs")
(version "4.13.1") (version "4.13.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/" (uri (string-append "mirror://kernel.org/linux/kernel/"
@ -3190,7 +3192,7 @@ and copy/paste text in the console and in xterm.")
"btrfs-progs-v" version ".tar.xz")) "btrfs-progs-v" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0")))) "1ga8jk2hkaxpm17z3gdfrpq0i62kqpv2wm5yzbzmsj862cgk7ivm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"static")) ; static versions of the binaries in "out" "static")) ; static versions of the binaries in "out"
@ -3669,13 +3671,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
;; FIXME: The upstream tarball lacks man pages, and building them would ;; FIXME: The upstream tarball lacks man pages, and building them would
;; require DocBook & co. We used to use Gentoo's pre-built man pages, ;; require DocBook & co. We used to use Gentoo's pre-built man pages,
;; but they vanished. In the meantime, fake it. ;; but they vanished. In the meantime, fake it.
'(#:phases (alist-cons-before '(#:phases
'configure 'fake-docbook (modify-phases %standard-phases
(lambda _ (add-before 'configure 'fake-docbook
(substitute* "Makefile.in" (lambda _
(("^DOCBOOKTOMAN.*$") (substitute* "Makefile.in"
"DOCBOOKTOMAN = true\n"))) (("^DOCBOOKTOMAN.*$")
%standard-phases))) "DOCBOOKTOMAN = true\n"))
#t)))))
(home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/") (home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/")
(synopsis "Tools for loading and managing Linux kernel modules") (synopsis "Tools for loading and managing Linux kernel modules")
(description (description

93
gnu/packages/lisp.scm
View file

@ -33,6 +33,7 @@
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix hg-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system asdf) #:use-module (guix build-system asdf)
@ -42,6 +43,7 @@
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages bdw-gc) #:use-module (gnu packages bdw-gc)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages libffcall) #:use-module (gnu packages libffcall)
@ -228,21 +230,31 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
(define-public clisp (define-public clisp
(package (package
(name "clisp") (name "clisp")
(version "2.49") (version "2.49-60")
(source (source
(origin (origin
(method url-fetch) (method hg-fetch)
(uri (string-append "mirror://gnu/clisp/release/" version (uri (hg-reference
"/clisp-" version ".tar.gz")) (url "http://hg.code.sf.net/p/clisp/clisp")
(changeset "clisp_2_49_60-2017-06-25")))
(file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 "0rp82nqp5362isl9i34rwgg04cidz7izljd9d85pqcw1qr964bxx")))) (base32 "0qjv3z274rbdmb941hy03hl63f4z7bmci234f8dyz4skgfr82d3i"))
(patches (search-patches "clisp-remove-failing-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libffcall" ,libffcall) (inputs `(("libffcall" ,libffcall)
("readline" ,readline-6.2) ("ncurses" ,ncurses)
("readline" ,readline)
("libsigsegv" ,libsigsegv))) ("libsigsegv" ,libsigsegv)))
(arguments (arguments
'(;; XXX The custom configure script does not cope well when passed '(;; XXX The custom configure script does not cope well when passed
;; --build=<triplet>. ;; --build=<triplet>.
#:configure-flags '("CFLAGS=-falign-functions=4"
"--enable-portability"
"--with-dynamic-ffi"
"--with-dynamic-modules"
"--with-module=bindings/glibc"
"--with-module=rawsock")
#:build #f #:build #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -262,11 +274,9 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
(lambda _ (lambda _
(substitute* "src/constobj.d" (substitute* "src/constobj.d"
(("__DATE__ __TIME__") "\"1\"")) (("__DATE__ __TIME__") "\"1\""))
#t)) (substitute* "src/genclisph.d"
(add-before 'build 'chdir-to-source (("__DATE__") "\"1\"")
(lambda _ (("__TIME__") "\"1\""))
;; We are supposed to call make under the src sub-directory.
(chdir "src")
#t))) #t)))
;; Makefiles seem to have race conditions. ;; Makefiles seem to have race conditions.
#:parallel-build? #f)) #:parallel-build? #f))
@ -445,36 +455,33 @@ statistical profiler, a code coverage tool, and many other extensions.")
(guix build utils) (guix build utils)
(guix build gnu-build-system)) (guix build gnu-build-system))
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'unpack (replace 'unpack
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl"))) (and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl")))
(begin (chdir "ccl") #t))) (begin (chdir "ccl") #t))))
(alist-delete (delete 'configure)
'configure (add-before 'build 'pre-build
(alist-cons-before ;; Enter the source directory for the current platform's lisp
'build 'pre-build ;; kernel, and run 'make clean' to remove the precompiled one.
;; Enter the source directory for the current platform's lisp (lambda _
;; kernel, and run 'make clean' to remove the precompiled one. (chdir (string-append
(lambda _ "lisp-kernel/"
(chdir (string-append ,(match (or (%current-target-system) (%current-system))
"lisp-kernel/" ("i686-linux" "linuxx8632")
,(match (or (%current-target-system) (%current-system)) ("x86_64-linux" "linuxx8664")
("i686-linux" "linuxx8632") ("armhf-linux" "linuxarm")
("x86_64-linux" "linuxx8664") ;; Prevent errors when querying this package
("armhf-linux" "linuxarm") ;; on unsupported platforms, e.g. when running
;; Prevent errors when querying this package ;; "guix package --search="
;; on unsupported platforms, e.g. when running (_ "UNSUPPORTED"))))
;; "guix package --search=" (substitute* '("Makefile")
(_ "UNSUPPORTED")))) (("/bin/rm") "rm"))
(substitute* '("Makefile") (setenv "CC" "gcc")
(("/bin/rm") "rm")) (zero? (system* "make" "clean"))))
(setenv "CC" "gcc") ;; XXX Do we need to recompile the heap image as well for Guix?
(zero? (system* "make" "clean"))) ;; For now just use the one we already got in the tarball.
;; XXX Do we need to recompile the heap image as well for Guix? (replace 'install
;; For now just use the one we already got in the tarball.
(alist-replace
'install
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; The lisp kernel built by running 'make' in lisp-kernel/$system
;; is put back into the original directory, so go back. The heap ;; is put back into the original directory, so go back. The heap
@ -513,8 +520,8 @@ statistical profiler, a code coverage tool, and many other extensions.")
"CCL_DEFAULT_DIRECTORY=" libdir "\n" "CCL_DEFAULT_DIRECTORY=" libdir "\n"
"export CCL_DEFAULT_DIRECTORY\n" "export CCL_DEFAULT_DIRECTORY\n"
"exec " libdir kernel "\n")))) "exec " libdir kernel "\n"))))
(chmod wrapper #o755))) (chmod wrapper #o755))
%standard-phases)))))) #t)))))
(supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
(home-page "http://ccl.clozure.com/") (home-page "http://ccl.clozure.com/")
(synopsis "Common Lisp implementation") (synopsis "Common Lisp implementation")

2
gnu/packages/lua.scm
View file

@ -124,7 +124,7 @@ for configuration, scripting, and rapid prototyping.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ;luajit is distributed without tests '(#:tests? #f ;luajit is distributed without tests
#:phases (alist-delete 'configure %standard-phases) #:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
(home-page "http://www.luajit.org/") (home-page "http://www.luajit.org/")
(synopsis "Just in time compiler for Lua programming language version 5.1") (synopsis "Just in time compiler for Lua programming language version 5.1")

88
gnu/packages/machine-learning.scm
View file

@ -376,54 +376,50 @@ sample proximities between pairs of cases.")
(arguments (arguments
'(#:tests? #f ;no check target '(#:tests? #f ;no check target
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'delete-broken-symlinks (add-after 'unpack 'delete-broken-symlinks
(lambda _ (lambda _
(for-each delete-file '("applications/arts/data" (for-each delete-file '("applications/arts/data"
"applications/asp/data" "applications/asp/data"
"applications/easysvm/data" "applications/easysvm/data"
"applications/msplicer/data" "applications/msplicer/data"
"applications/ocr/data" "applications/ocr/data"
"examples/documented/data" "examples/documented/data"
"examples/documented/matlab_static" "examples/documented/matlab_static"
"examples/documented/octave_static" "examples/documented/octave_static"
"examples/undocumented/data" "examples/undocumented/data"
"examples/undocumented/matlab_static" "examples/undocumented/matlab_static"
"examples/undocumented/octave_static" "examples/undocumented/octave_static"
"tests/integration/data" "tests/integration/data"
"tests/integration/matlab_static" "tests/integration/matlab_static"
"tests/integration/octave_static" "tests/integration/octave_static"
"tests/integration/python_modular/tests")) "tests/integration/python_modular/tests"))
#t) #t))
(alist-cons-after (add-after 'unpack 'change-R-target-path
'unpack 'change-R-target-path (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (substitute* '("src/interfaces/r_modular/CMakeLists.txt"
(substitute* '("src/interfaces/r_modular/CMakeLists.txt" "src/interfaces/r_static/CMakeLists.txt"
"src/interfaces/r_static/CMakeLists.txt" "examples/undocumented/r_modular/CMakeLists.txt")
"examples/undocumented/r_modular/CMakeLists.txt") (("\\$\\{R_COMPONENT_LIB_PATH\\}")
(("\\$\\{R_COMPONENT_LIB_PATH\\}") (string-append (assoc-ref outputs "out")
(string-append (assoc-ref outputs "out") "/lib/R/library/")))
"/lib/R/library/"))) #t))
#t) (add-after 'unpack 'fix-octave-modules
(alist-cons-after (lambda* (#:key outputs #:allow-other-keys)
'unpack 'fix-octave-modules (substitute* '("src/interfaces/octave_modular/CMakeLists.txt"
(lambda* (#:key outputs #:allow-other-keys) "src/interfaces/octave_static/CMakeLists.txt")
(substitute* '("src/interfaces/octave_modular/CMakeLists.txt" (("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}")
"src/interfaces/octave_static/CMakeLists.txt") "include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave"))
(("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}")
"include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave"))
;; change target directory ;; change target directory
(substitute* "src/interfaces/octave_modular/CMakeLists.txt" (substitute* "src/interfaces/octave_modular/CMakeLists.txt"
(("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}") (("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/octave/packages"))) "/share/octave/packages")))
#t) #t))
(alist-cons-before (add-before 'build 'set-HOME
'build 'set-HOME
;; $HOME needs to be set at some point during the build phase ;; $HOME needs to be set at some point during the build phase
(lambda _ (setenv "HOME" "/tmp") #t) (lambda _ (setenv "HOME" "/tmp") #t)))
%standard-phases))))
#:configure-flags #:configure-flags
(list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" (list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
"-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT "-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT

108
gnu/packages/mail.scm
View file

@ -225,14 +225,14 @@ aliasing facilities to work just as they would on normal mail.")
(define-public mutt (define-public mutt
(package (package
(name "mutt") (name "mutt")
(version "1.8.3") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/"
"mutt-" version ".tar.gz")) "mutt-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hpd896mw630sd6ps60hpka8cg691nvr627n8kmabv7zcxnp90cv")) "1c8vv4anl555a03pbnwf8wnf0d8pcnd4p35y3q8f5ikkcflq76vl"))
(patches (search-patches "mutt-store-references.patch")))) (patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -416,7 +416,7 @@ and corrections. It is based on a Bayesian filter.")
(define-public offlineimap (define-public offlineimap
(package (package
(name "offlineimap") (name "offlineimap")
(version "7.1.2") (version "7.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/OfflineIMAP/offlineimap/" (uri (string-append "https://github.com/OfflineIMAP/offlineimap/"
@ -424,7 +424,7 @@ and corrections. It is based on a Bayesian filter.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0rnw7gpx3cp4irja5143haszgv4xhndc8wivhg8r0gpp6ig460vj")))) "0iaznh8q3fmia43r0600vrd3w8njis1x65ry9fv3zsyx0ili1z02"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("asciidoc" ,asciidoc))) `(("asciidoc" ,asciidoc)))
@ -811,7 +811,7 @@ and search library.")
(define-public getmail (define-public getmail
(package (package
(name "getmail") (name "getmail")
(version "5.1") (version "5.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -819,7 +819,7 @@ and search library.")
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zh220vx10wi6x61qi0mjayjxgvllk9f6vd4hjrgzha1xbjj0vix")))) "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -1034,51 +1034,51 @@ delivery.")
("perl" ,perl))) ("perl" ,perl)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
;; We'd use #:make-flags but the top-level Makefile calls others ;; We'd use #:make-flags but the top-level Makefile calls others
;; recursively, so just set all variables this way. ;; recursively, so just set all variables this way.
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(substitute* '("Makefile" "OS/Makefile-Default") (substitute* '("Makefile" "OS/Makefile-Default")
(("(RM_COMMAND=).*" all var) (("(RM_COMMAND=).*" all var)
(string-append var "rm\n"))) (string-append var "rm\n")))
(copy-file "src/EDITME" "Local/Makefile") (copy-file "src/EDITME" "Local/Makefile")
(copy-file "exim_monitor/EDITME" "Local/eximon.conf") (copy-file "exim_monitor/EDITME" "Local/eximon.conf")
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gzip (assoc-ref inputs "gzip")) (gzip (assoc-ref inputs "gzip"))
(bzip2 (assoc-ref inputs "bzip2")) (bzip2 (assoc-ref inputs "bzip2"))
(xz (assoc-ref inputs "xz"))) (xz (assoc-ref inputs "xz")))
(substitute* '("Local/Makefile") (substitute* '("Local/Makefile")
(("(BIN_DIRECTORY=).*" all var) (("(BIN_DIRECTORY=).*" all var)
(string-append var out "/bin\n")) (string-append var out "/bin\n"))
(("(CONFIGURE_FILE=).*" all var) (("(CONFIGURE_FILE=).*" all var)
(string-append var out "/etc/exim.conf\n")) (string-append var out "/etc/exim.conf\n"))
(("(EXIM_USER=).*" all var) (("(EXIM_USER=).*" all var)
(string-append var "nobody\n")) (string-append var "nobody\n"))
(("(FIXED_NEVER_USERS=).*" all var) (("(FIXED_NEVER_USERS=).*" all var)
(string-append var "\n")) ;XXX no root in build environment (string-append var "\n")) ;XXX no root in build environment
(("(COMPRESS_COMMAND=).*" all var) (("(COMPRESS_COMMAND=).*" all var)
(string-append var gzip "/bin/gzip\n")) (string-append var gzip "/bin/gzip\n"))
(("(ZCAT_COMMAND=).*" all var) (("(ZCAT_COMMAND=).*" all var)
(string-append var gzip "/bin/zcat\n"))) (string-append var gzip "/bin/zcat\n")))
;; This file has hardcoded names for tools despite the zcat ;; This file has hardcoded names for tools despite the zcat
;; configuration above. ;; configuration above.
(substitute* '("src/exigrep.src") (substitute* '("src/exigrep.src")
(("'zcat'") (string-append "'" gzip "/bin/zcat'")) (("'zcat'") (string-append "'" gzip "/bin/zcat'"))
(("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'"))
(("'xzcat'") (string-append "'" xz "/bin/xzcat'")) (("'xzcat'") (string-append "'" xz "/bin/xzcat'"))
(("'lzma'") (string-append "'" xz "/bin/lzma'"))))) (("'lzma'") (string-append "'" xz "/bin/lzma'"))))
(alist-cons-before #t))
'build 'fix-sh-paths (add-before 'build 'fix-sh-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("scripts/lookups-Makefile" "scripts/reversion") (substitute* '("scripts/lookups-Makefile" "scripts/reversion")
(("SHELL=/bin/sh") "SHELL=sh")) (("SHELL=/bin/sh") "SHELL=sh"))
(substitute* '("scripts/Configure-config.h") (substitute* '("scripts/Configure-config.h")
(("\\| /bin/sh") "| sh")) (("\\| /bin/sh") "| sh"))
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* '("scripts/Configure-eximon") (substitute* '("scripts/Configure-eximon")
(("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))) (("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))
%standard-phases)) #t)))
#:make-flags '("INSTALL_ARG=-no_chown") #:make-flags '("INSTALL_ARG=-no_chown")
;; No 'check' target. ;; No 'check' target.
#:tests? #f)) #:tests? #f))
@ -1244,15 +1244,17 @@ hashing schemes plugin for @code{Dovecot}.")
(define-public isync (define-public isync
(package (package
(name "isync") (name "isync")
(version "1.2.1") (version "1.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/isync/isync/" (uri (string-append "mirror://sourceforge/isync/isync/"
version "/isync-" version ".tar.gz")) version "/isync-" version ".tar.gz"))
(sha256 (base32 (sha256 (base32
"1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7")))) "173wd7x8y5sp94slzwlnb7zhgs32r57zl9xspl2rf4g3fqwmhpwd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("perl" ,perl)))
(inputs (inputs
`(("bdb" ,bdb) `(("bdb" ,bdb)
("openssl" ,openssl))) ("openssl" ,openssl)))

4
gnu/packages/man.scm
View file

@ -154,7 +154,7 @@ the traditional flat-text whatis databases.")
"1gri0rm9i3a6w5dvsmwawhwzywl5x80dwq05d2v8l92knv2hbh6m")))) "1gri0rm9i3a6w5dvsmwawhwzywl5x80dwq05d2v8l92knv2hbh6m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-delete 'configure %standard-phases) '(#:phases (modify-phases %standard-phases (delete 'configure))
;; The 'all' target depends on three targets that directly populate ;; The 'all' target depends on three targets that directly populate
;; $(MANDIR) based on its current contents. Doing that in parallel ;; $(MANDIR) based on its current contents. Doing that in parallel
@ -220,7 +220,7 @@ automatically.")
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("gawk" ,gawk))) `(("gawk" ,gawk)))
(home-page "https://github.com/mvertes/txt2man") (home-page "https://github.com/mvertes/txt2man")

240
gnu/packages/maths.scm
View file

@ -14,11 +14,12 @@
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2017 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,6 +70,7 @@
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages java)
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
@ -456,13 +458,14 @@ large scale eigenvalue problems.")
;; Build the 'LAPACKE_clatms' functions. ;; Build the 'LAPACKE_clatms' functions.
"-DLAPACKE_WITH_TMG=ON") "-DLAPACKE_WITH_TMG=ON")
#:phases (alist-cons-before #:phases
'check 'patch-python (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-before 'check 'patch-python
(let ((python (assoc-ref inputs "python"))) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "lapack_testing.py" (let ((python (assoc-ref inputs "python")))
(("/usr/bin/env python") python)))) (substitute* "lapack_testing.py"
%standard-phases))) (("/usr/bin/env python") python)))
#t)))))
(synopsis "Library for numerical linear algebra") (synopsis "Library for numerical linear algebra")
(description (description
"LAPACK is a Fortran 90 library for solving the most commonly occurring "LAPACK is a Fortran 90 library for solving the most commonly occurring
@ -742,6 +745,124 @@ extremely large and complex data collections.")
(license (license:x11-style (license (license:x11-style
"http://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING")))) "http://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING"))))
(define-public hdf-java
(package
(name "hdf-java")
(version "3.3.2")
(source
(origin
(method url-fetch)
(uri (string-append
"http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-"
version "/src/CMake-hdfjava-" version ".tar.gz"))
(sha256
(base32 "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr"))
(modules '((guix build utils)))
(snippet ; Make sure we don't use the bundled sources and binaries.
`(begin
(for-each delete-file
(list "SZip.tar.gz" "ZLib.tar.gz" "JPEG8d.tar.gz"
"HDF4.tar.gz" "HDF5.tar.gz"))
(delete-file-recursively ,(string-append "hdfjava-" version "/lib"))))))
(build-system gnu-build-system)
(native-inputs
`(("jdk" ,icedtea "jdk")
("automake" ,automake) ; For up to date 'config.guess' and 'config.sub'.
;; For tests:
("hamcrest-core" ,java-hamcrest-core)
("junit" ,java-junit)
("slf4j-simple" ,java-slf4j-simple)))
(inputs
`(("hdf4" ,hdf4)
("hdf5" ,hdf5)
("zlib" ,zlib)
("libjpeg" ,libjpeg)
("slf4j-api" ,java-slf4j-api)))
(arguments
`(#:configure-flags
(list (string-append "--target=" ,(or (%current-target-system) (%current-system)))
(string-append "--with-jdk=" (assoc-ref %build-inputs "jdk") "/include,"
(assoc-ref %build-inputs "jdk") "/lib" )
(string-append "--with-hdf4=" (assoc-ref %build-inputs "hdf4") "/lib")
(string-append "--with-hdf5=" (assoc-ref %build-inputs "hdf5") "/lib"))
#:make-flags
(list (string-append "HDFLIB=" (assoc-ref %build-inputs "hdf4") "/lib")
(string-append "HDF5LIB=" (assoc-ref %build-inputs "hdf5") "/lib")
(string-append "ZLIB=" (assoc-ref %build-inputs "zlib") "/lib/libz.so")
(string-append "JPEGLIB="
(assoc-ref %build-inputs "libjpeg") "/lib/libjpeg.so")
"LLEXT=so")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'chdir-to-source
(lambda _ (chdir ,(string-append "hdfjava-" version))))
(add-before 'configure 'patch-build
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "configure"
(("COPT=\"") "COPT=\"-O2 ") ; CFLAGS is ignored in Makefiles
(("/bin/cat") (which "cat")))
;; Set classpath for compilation
(substitute* '("hdf/hdf5lib/Makefile.in"
"hdf/hdf5lib/exceptions/Makefile.in"
"hdf/hdflib/Makefile.in")
(("\\$\\(TOP\\)/lib/slf4j-api-1\\.7\\.5\\.jar")
(string-append (assoc-ref inputs "slf4j-api")
"/share/java/slf4j-api.jar")))
;; Replace outdated config.sub and config.guess:
(with-directory-excursion "config"
(for-each (lambda (file)
(copy-file
(string-append (assoc-ref inputs "automake")
"/share/automake-1.15/" file) file))
'("config.sub" "config.guess")))
(mkdir-p (string-append (assoc-ref outputs "out")))
;; Set classpath for tests
(let* ((build-dir (getcwd))
(lib (string-append build-dir "/lib"))
(jhdf (string-append lib "/jhdf.jar"))
(jhdf5 (string-append lib "/jhdf5.jar"))
(testjars
(map (lambda (i)
(string-append (assoc-ref inputs i)
"/share/java/" i ".jar"))
'("junit" "hamcrest-core" "slf4j-api" "slf4j-simple")))
(class-path
(string-join `("." ,build-dir ,jhdf ,jhdf5 ,@testjars) ":")))
(substitute* '("test/hdf5lib/Makefile.in"
"test/hdf5lib/junit.sh.in"
"examples/runExample.sh.in")
(("/usr/bin/test")
(string-append (assoc-ref inputs "coreutils")
"/bin/test"))
(("/usr/bin/uname")
(string-append (assoc-ref inputs "coreutils")
"/bin/uname"))
(("CLASSPATH=[^\n]*")
(string-append "CLASSPATH=" class-path)))
(setenv "CLASSPATH" class-path))
#t))
(add-before 'check 'build-examples
(lambda _
(zero? (apply system* `("javac"
,@(find-files "examples" ".*\\.java")))))))
#:parallel-build? #f
#:parallel-tests? #f ))
(home-page "https://support.hdfgroup.org/products/java")
(synopsis "Java interface for the HDF4 and HDF5 libraries")
(description "Java HDF Interface (JHI) and Java HDF5 Interface (JHI5) use
the Java Native Interface to wrap the HDF4 and HDF5 libraries, which are
implemented in C.")
;; BSD-style license:
(license (license:x11-style
"https://support.hdfgroup.org/ftp/HDF5/hdf-java\
/current/src/unpacked/COPYING"))))
(define-public hdf-eos2 (define-public hdf-eos2
(package (package
(name "hdf-eos2") (name "hdf-eos2")
@ -1126,7 +1247,7 @@ can solve two kinds of problems:
(license license:bsd-3))) (license license:bsd-3)))
;; For a fully featured Octave, users are strongly recommended also to install ;; For a fully featured Octave, users are strongly recommended also to install
;; the following packages: texinfo, less, ghostscript, gnuplot. ;; the following packages: less, ghostscript, gnuplot.
(define-public octave (define-public octave
(package (package
(name "octave") (name "octave")
@ -1158,6 +1279,7 @@ can solve two kinds of problems:
("glu" ,glu) ("glu" ,glu)
("zlib" ,zlib) ("zlib" ,zlib)
("curl" ,curl) ("curl" ,curl)
("texinfo" ,texinfo)
("graphicsmagick" ,graphicsmagick))) ("graphicsmagick" ,graphicsmagick)))
(native-inputs (native-inputs
`(("lzip" ,lzip) `(("lzip" ,lzip)
@ -1172,14 +1294,23 @@ can solve two kinds of problems:
;; will still run without them, albeit without the features they ;; will still run without them, albeit without the features they
;; provide. ;; provide.
("less" ,less) ("less" ,less)
("texinfo" ,texinfo)
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("gnuplot" ,gnuplot))) ("gnuplot" ,gnuplot)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-shell=" (list (string-append "--with-shell="
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash")
"/bin/sh")))) "/bin/sh"))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'configure-makeinfo
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libinterp/corefcn/help.cc"
(("Vmakeinfo_program = \"makeinfo\"")
(string-append "Vmakeinfo_program = \""
(assoc-ref inputs "texinfo")
"/bin/makeinfo\"")))
#t)))))
(home-page "https://www.gnu.org/software/octave/") (home-page "https://www.gnu.org/software/octave/")
(synopsis "High-level language for numerical computation") (synopsis "High-level language for numerical computation")
(description "GNU Octave is a high-level interpreted language that is (description "GNU Octave is a high-level interpreted language that is
@ -1866,12 +1997,12 @@ void mc64ad_ (int *a, int *b, int *c, int *d, int *e, double *f, int *g,
(arguments (arguments
`(#:parallel-build? #f ;race conditions using ar `(#:parallel-build? #f ;race conditions using ar
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(call-with-output-file "make.inc" (call-with-output-file "make.inc"
(lambda (port) (lambda (port)
(format port " (format port "
PLAT = PLAT =
DSuperLUroot = ~a DSuperLUroot = ~a
DSUPERLULIB = ~a/lib/libsuperlu_dist.a DSUPERLULIB = ~a/lib/libsuperlu_dist.a
@ -1894,47 +2025,46 @@ FORTRAN = mpifort
FFLAGS = -O2 -g $(PIC) FFLAGS = -O2 -g $(PIC)
LOADER = $(CC) LOADER = $(CC)
CDEFS = -DAdd_" CDEFS = -DAdd_"
(getcwd) (getcwd)
(assoc-ref outputs "out") (assoc-ref outputs "out")
(assoc-ref inputs "lapack") (assoc-ref inputs "lapack")
(assoc-ref inputs "pt-scotch"))))) (assoc-ref inputs "pt-scotch"))))
(alist-cons-after #t))
'unpack 'remove-broken-symlinks (add-after 'unpack 'remove-broken-symlinks
(lambda _ (lambda _
(for-each delete-file (for-each delete-file
(find-files "MAKE_INC" "\\.#make\\..*"))) (find-files "MAKE_INC" "\\.#make\\..*"))
(alist-cons-before #t))
'build 'create-install-directories (add-before 'build 'create-install-directories
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each (for-each
(lambda (dir) (lambda (dir)
(mkdir-p (string-append (assoc-ref outputs "out") (mkdir-p (string-append (assoc-ref outputs "out")
"/" dir))) "/" dir)))
'("lib" "include"))) '("lib" "include"))
(alist-replace #t))
'check (replace 'check
(lambda _ (lambda _
(with-directory-excursion "EXAMPLE" (with-directory-excursion "EXAMPLE"
(and (and
(zero? (system* "mpirun" "-n" "2" (zero? (system* "mpirun" "-n" "2"
"./pddrive" "-r" "1" "-c" "2" "g20.rua")) "./pddrive" "-r" "1" "-c" "2" "g20.rua"))
(zero? (system* "mpirun" "-n" "2" (zero? (system* "mpirun" "-n" "2"
"./pzdrive" "-r" "1" "-c" "2" "cg20.cua"))))) "./pzdrive" "-r" "1" "-c" "2" "cg20.cua"))))))
(alist-replace (replace 'install
'install (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) ;; Library is placed in lib during the build phase. Copy over
;; Library is placed in lib during the build phase. Copy over ;; headers to include.
;; headers to include. (let* ((out (assoc-ref outputs "out"))
(let* ((out (assoc-ref outputs "out")) (incdir (string-append out "/include")))
(incdir (string-append out "/include"))) (for-each (lambda (file)
(for-each (lambda (file) (let ((base (basename file)))
(let ((base (basename file))) (format #t "installing `~a' to `~a'~%"
(format #t "installing `~a' to `~a'~%" base incdir)
base incdir) (copy-file file
(copy-file file (string-append incdir "/" base))))
(string-append incdir "/" base)))) (find-files "SRC" ".*\\.h$")))
(find-files "SRC" ".*\\.h$")))) #t)))))
%standard-phases)))))))
(home-page (package-home-page superlu)) (home-page (package-home-page superlu))
(synopsis "Parallel supernodal direct solver") (synopsis "Parallel supernodal direct solver")
(description (description
@ -2621,7 +2751,7 @@ access to BLIS implementations via traditional BLAS routine calls.")
(list (string-append "prefix=" (assoc-ref %outputs "out"))) (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases #:phases
;; no configure script ;; no configure script
(alist-delete 'configure %standard-phases) (modify-phases %standard-phases (delete 'configure))
#:tests? #f)) ;the tests are part of the default target #:tests? #f)) ;the tests are part of the default target
(home-page "http://openlibm.org/") (home-page "http://openlibm.org/")
(synopsis "Portable C mathematical library (libm)") (synopsis "Portable C mathematical library (libm)")
@ -2660,7 +2790,7 @@ environments.")
#:make-flags #:make-flags
(list (string-append "prefix=" (assoc-ref %outputs "out"))) (list (string-append "prefix=" (assoc-ref %outputs "out")))
;; no configure script ;; no configure script
#:phases (alist-delete 'configure %standard-phases))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("fortran" ,gfortran))) `(("fortran" ,gfortran)))
(home-page "https://github.com/JuliaLang/openspecfun") (home-page "https://github.com/JuliaLang/openspecfun")

36
gnu/packages/messaging.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -90,6 +90,7 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages photo)
#:use-module (gnu packages texinfo)) #:use-module (gnu packages texinfo))
(define-public libotr (define-public libotr
@ -142,20 +143,19 @@ keys, no previous conversation is compromised.")
("python" ,python-2) ("python" ,python-2)
("perl" ,perl))) ("perl" ,perl)))
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'install 'install-etc (modify-phases %standard-phases
(lambda* (#:key (make-flags '()) #:allow-other-keys) (add-after 'install 'install-etc
(zero? (apply system* "make" "install-etc" make-flags))) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(alist-replace (zero? (apply system* "make" "install-etc" make-flags))))
'configure (replace 'configure
;; bitlbee's configure script does not tolerate many of the ;; bitlbee's configure script does not tolerate many of the
;; variable settings that Guix would pass to it. ;; variable settings that Guix would pass to it.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "./configure" (zero? (system* "./configure"
(string-append "--prefix=" (string-append "--prefix="
(assoc-ref outputs "out")) (assoc-ref outputs "out"))
"--otr=1"))) "--otr=1")))))))
%standard-phases))))
(synopsis "IRC to instant messaging gateway") (synopsis "IRC to instant messaging gateway")
(description "BitlBee brings IM (instant messaging) to IRC clients, for (description "BitlBee brings IM (instant messaging) to IRC clients, for
people who have an IRC client running all the time and don't want to run an people who have an IRC client running all the time and don't want to run an
@ -801,14 +801,14 @@ instant messenger with audio and video chat capabilities.")
(define-public qtox (define-public qtox
(package (package
(name "qtox") (name "qtox")
(version "1.11.0") (version "1.12.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/qTox/qTox/archive/v" (uri (string-append "https://github.com/qTox/qTox/archive/v"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1m1ca1ybgj4yfm6a61yyj21f5jpip8dsbliwkfypswhmv5y52f5y")) "0ycgvcfn8hchc775dcn1wpdqff8chvzz1svx9g99wa5vcns9pflg"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -830,6 +830,8 @@ instant messenger with audio and video chat capabilities.")
("libvpx" ,libvpx) ("libvpx" ,libvpx)
("libxscrnsaver" ,libxscrnsaver) ("libxscrnsaver" ,libxscrnsaver)
("libx11" ,libx11) ("libx11" ,libx11)
("libexif" ,libexif)
("sqlite" ,sqlite)
("openal" ,openal) ("openal" ,openal)
("qrencode" ,qrencode) ("qrencode" ,qrencode)
("qtbase" ,qtbase) ("qtbase" ,qtbase)

87
gnu/packages/mp3.scm
View file

@ -66,12 +66,12 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'remove-unsupported-gcc-flags (add-before 'configure 'remove-unsupported-gcc-flags
(lambda _ (lambda _
;; remove option that is not supported by gcc any more ;; remove option that is not supported by gcc any more
(substitute* "configure" ((" -fforce-mem") ""))) (substitute* "configure" ((" -fforce-mem") ""))
%standard-phases))) #t)))))
(synopsis "MPEG audio decoder") (synopsis "MPEG audio decoder")
(description (description
"MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to
@ -123,20 +123,20 @@ versions of ID3v2.")
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'apply-patches (add-before 'configure 'apply-patches
;; TODO: create a patch for origin instead? ;; TODO: create a patch for origin instead?
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("iomanip.h") "")) ; drop check for unused header (("iomanip.h") "")) ; drop check for unused header
;; see http://www.linuxfromscratch.org/patches/downloads/id3lib/ ;; see http://www.linuxfromscratch.org/patches/downloads/id3lib/
(substitute* "include/id3/id3lib_strings.h" (substitute* "include/id3/id3lib_strings.h"
(("include <string>") "include <cstring>\n#include <string>")) (("include <string>") "include <cstring>\n#include <string>"))
(substitute* "include/id3/writers.h" (substitute* "include/id3/writers.h"
(("//\\#include <string.h>") "#include <cstring>")) (("//\\#include <string.h>") "#include <cstring>"))
(substitute* "examples/test_io.cpp" (substitute* "examples/test_io.cpp"
(("dami;") "dami;\nusing namespace std;"))) (("dami;") "dami;\nusing namespace std;"))
%standard-phases))) #t)))))
(synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags") (synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags")
(description (description
"Id3lib is a cross-platform software development library for reading, "Id3lib is a cross-platform software development library for reading,
@ -194,29 +194,30 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "gui")) ;GTK+ interface in "gui" (outputs '("out" "gui")) ;GTK+ interface in "gui"
(arguments (arguments
'(#:phases (alist-replace '(#:phases
'configure (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (replace 'configure
(let ((out (assoc-ref outputs "out"))) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (let ((out (assoc-ref outputs "out")))
(("prefix=.*") (substitute* "Makefile"
(string-append "prefix := " out "\n"))))) (("prefix=.*")
(alist-cons-before (string-append "prefix := " out "\n"))))
'install 'pre-install #t))
(lambda* (#:key outputs #:allow-other-keys) (add-before 'install 'pre-install
(let ((out (assoc-ref outputs "out"))) (lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append out "/bin")) (let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/share/man/man1")))) (mkdir-p (string-append out "/bin"))
(alist-cons-after (mkdir-p (string-append out "/share/man/man1")))
'install 'post-install #t))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'post-install
;; Move the GTK+ interface to "gui". (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) ;; Move the GTK+ interface to "gui".
(gui (assoc-ref outputs "gui"))) (let ((out (assoc-ref outputs "out"))
(mkdir-p (string-append gui "/bin")) (gui (assoc-ref outputs "gui")))
(rename-file (string-append out "/bin/gmp3info") (mkdir-p (string-append gui "/bin"))
(string-append gui "/bin/gmp3info")))) (rename-file (string-append out "/bin/gmp3info")
%standard-phases))) (string-append gui "/bin/gmp3info")))
#t)))
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

1
gnu/packages/mpi.scm
View file

@ -131,6 +131,7 @@ bind processes, and much more.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("perl" ,perl))) ("perl" ,perl)))
(outputs '("out" "debug"))
(arguments (arguments
`(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work
"--enable-memchecker" "--enable-memchecker"

102
gnu/packages/music.scm
View file

@ -871,60 +871,60 @@ complete studio.")
`(#:tests? #f ; xmllint attempts to download DTD `(#:tests? #f ; xmllint attempts to download DTD
#:test-target "test" #:test-target "test"
#:phases #:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'fix-configuration (add-after 'unpack 'fix-configuration
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "default.config" (substitute* "default.config"
(("csound=csound") (("csound=csound")
(string-append "csound=" (string-append "csound="
(assoc-ref inputs "csound") (assoc-ref inputs "csound")
"/bin/csound")) "/bin/csound"))
(("/usr/bin/aplay") (("/usr/bin/aplay")
(string-append (assoc-ref inputs "aplay") (string-append (assoc-ref inputs "aplay")
"/bin/aplay")) "/bin/aplay"))
(("/usr/bin/timidity") (("/usr/bin/timidity")
(string-append (assoc-ref inputs "timidity") (string-append (assoc-ref inputs "timidity")
"/bin/timidity")) "/bin/timidity"))
(("/usr/bin/mpg123") (("/usr/bin/mpg123")
(string-append (assoc-ref inputs "mpg123") (string-append (assoc-ref inputs "mpg123")
"/bin/mpg123")) "/bin/mpg123"))
(("/usr/bin/ogg123") (("/usr/bin/ogg123")
(string-append (assoc-ref inputs "ogg123") (string-append (assoc-ref inputs "ogg123")
"/bin/ogg123")))) "/bin/ogg123")))
(alist-cons-before #t))
'build 'patch-python-shebangs (add-before 'build 'patch-python-shebangs
(lambda _ (lambda _
;; Two python scripts begin with a Unicode BOM, so patch-shebang ;; Two python scripts begin with a Unicode BOM, so patch-shebang
;; has no effect. ;; has no effect.
(substitute* '("solfege/parsetree.py" (substitute* '("solfege/parsetree.py"
"solfege/presetup.py") "solfege/presetup.py")
(("#!/usr/bin/python") (string-append "#!" (which "python"))))) (("#!/usr/bin/python") (string-append "#!" (which "python"))))
(alist-cons-before #t))
'build 'add-sitedirs (add-before 'build 'add-sitedirs
;; .pth files are not automatically interpreted unless the ;; .pth files are not automatically interpreted unless the
;; directories containing them are added as "sites". The directories ;; directories containing them are added as "sites". The directories
;; are then added to those in the PYTHONPATH. This is required for ;; are then added to those in the PYTHONPATH. This is required for
;; the operation of pygtk and pygobject. ;; the operation of pygtk and pygobject.
(lambda _ (lambda _
(substitute* "run-solfege.py" (substitute* "run-solfege.py"
(("import os") (("import os")
"import os, site "import os, site
for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)"))) for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)"))
(alist-cons-before #t))
'build 'adjust-config-file-prefix (add-before 'build 'adjust-config-file-prefix
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "run-solfege.py" (substitute* "run-solfege.py"
(("prefix = os.path.*$") (("prefix = os.path.*$")
(string-append "prefix = " (assoc-ref outputs "out"))))) (string-append "prefix = " (assoc-ref outputs "out"))))
(alist-cons-after #t))
'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'solfege' runs with the correct PYTHONPATH. ;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH"))) (path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege") (wrap-program (string-append out "/bin/solfege")
`("PYTHONPATH" ":" prefix (,path))))) `("PYTHONPATH" ":" prefix (,path))))
%standard-phases))))))) #t)))))
(inputs (inputs
`(("python" ,python-2) `(("python" ,python-2)
("pygtk" ,python2-pygtk) ("pygtk" ,python2-pygtk)

35
gnu/packages/networking.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,6 +38,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
@ -56,6 +58,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
@ -922,6 +925,38 @@ information by IP Address.")
sockets in Perl.") sockets in Perl.")
(license license:perl-license))) (license license:perl-license)))
(define-public libproxy
(package
(name "libproxy")
(version "0.4.15")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libproxy/libproxy/"
"releases/download/" version "/libproxy-"
version ".tar.xz"))
(sha256
(base32
"0kvdrazlzwia876w988cmlypp253gwy6idlh8mjk958c29jb8kb5"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("dbus" ,dbus)
("zlib" ,zlib)
("network-manager" ,network-manager)))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(zero? (system* "ctest" "-E" "url-test")))))))
(synopsis "Library providing automatic proxy configuration management")
(description "Libproxy handles the details of HTTP/HTTPS proxy
configuration for applications across all scenarios. Applications using
libproxy only have to specify which proxy to use.")
(home-page "https://libproxy.github.io/libproxy")
(license license:lgpl2.1+)))
(define-public proxychains-ng (define-public proxychains-ng
(package (package
(name "proxychains-ng") (name "proxychains-ng")

79
gnu/packages/noweb.scm
View file

@ -35,47 +35,46 @@
"10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9")))) "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases
'install 'pre-install (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-before 'install 'pre-install
(let ((out (assoc-ref outputs "out"))) (lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append out "/share/texmf/tex/latex")) (let ((out (assoc-ref outputs "out")))
#t)) (mkdir-p (string-append out "/share/texmf/tex/latex"))
(alist-cons-after #t)))
'install 'post-install (add-after 'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(cu (assoc-ref inputs "coreutils")) (cu (assoc-ref inputs "coreutils"))
(du (assoc-ref inputs "diffutils"))) (du (assoc-ref inputs "diffutils")))
(with-directory-excursion out (with-directory-excursion out
(for-each (lambda (prog) (for-each (lambda (prog)
(substitute* prog (substitute* prog
(("nawk") (which "awk")))) (("nawk") (which "awk"))))
(append (map (lambda (x) (append (map (lambda (x)
(string-append "bin/" x)) (string-append "bin/" x))
'("noweb" "nountangle" '("noweb" "nountangle"
"noroots" "noroff" "noroots" "noroff"
"noindex")) "noindex"))
(map (lambda (x) (map (lambda (x)
(string-append "lib/" x)) (string-append "lib/" x))
'("btdefn" "emptydefn" "noidx" '("btdefn" "emptydefn" "noidx"
"pipedocs" "toascii" "tohtml" "pipedocs" "toascii" "tohtml"
"toroff" "totex" "unmarkup")))) "toroff" "totex" "unmarkup"))))
(substitute* "bin/cpif" (substitute* "bin/cpif"
(("^PATH=.*$") (("^PATH=.*$")
(string-append "PATH=" cu "/bin:" du "/bin\n")))) (string-append "PATH=" cu "/bin:" du "/bin\n"))))
#t)) #t)))
(alist-replace (replace 'configure
'configure (lambda _
(lambda _ ;; Jump in the source.
;; Jump in the source. (chdir "src")
(chdir "src")
;; The makefile reads "source: FAQ", but FAQ isn't ;; The makefile reads "source: FAQ", but FAQ isn't
;; available. ;; available.
(substitute* "Makefile" (substitute* "Makefile"
(("FAQ") ""))) (("FAQ") ""))
%standard-phases))) #t)))
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "BIN=" out "/bin") (list (string-append "BIN=" out "/bin")
(string-append "LIB=" out "/lib") (string-append "LIB=" out "/lib")

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

@ -79,8 +79,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "0.13.0") (let ((version "0.13.0")
(commit "a9468b422b6df2349a3f4d1451c9302c3d77011b") (commit "8b920d707ed07a3251227f77526cf875d86a4417")
(revision 6)) (revision 7))
(package (package
(name "guix") (name "guix")
@ -96,7 +96,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0bv323yp657x0a2aa2z5pp5541hjqmn908kh9jqlbdw5gpx9vg3d")) "15phwcadkw44mr4hnv1dxzzw9an6x7sbdfzwy4iciqw6y2wckncd"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

42
gnu/packages/patches/bluez-CVE-2017-1000250.patch
View file

@ -1,42 +0,0 @@
Description: CVE-2017-1000250: information disclosure vulnerability in service_search_attr_req
Origin: vendor
Bug-Debian: https://bugs.debian.org/875633
Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1489446
Bug-SuSE: https://bugzilla.suse.com/show_bug.cgi?id=1057342
Forwarded: no
Author: Armis Security <security@armis.com>
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
Last-Update: 2017-09-13
--- a/src/sdpd-request.c
+++ b/src/sdpd-request.c
@@ -918,15 +918,20 @@ static int service_search_attr_req(sdp_r
/* continuation State exists -> get from cache */
sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
if (pCache) {
- uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
- pResponse = pCache->data;
- memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
- buf->data_size += sent;
- cstate->cStateValue.maxBytesSent += sent;
- if (cstate->cStateValue.maxBytesSent == pCache->data_size)
- cstate_size = sdp_set_cstate_pdu(buf, NULL);
- else
- cstate_size = sdp_set_cstate_pdu(buf, cstate);
+ if (cstate->cStateValue.maxBytesSent >= pCache->data_size) {
+ status = SDP_INVALID_CSTATE;
+ SDPDBG("Got bad cstate with invalid size");
+ } else {
+ uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
+ pResponse = pCache->data;
+ memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
+ buf->data_size += sent;
+ cstate->cStateValue.maxBytesSent += sent;
+ if (cstate->cStateValue.maxBytesSent == pCache->data_size)
+ cstate_size = sdp_set_cstate_pdu(buf, NULL);
+ else
+ cstate_size = sdp_set_cstate_pdu(buf, cstate);
+ }
} else {
status = SDP_INVALID_CSTATE;
SDPDBG("Non-null continuation state, but null cache buffer");

43
gnu/packages/patches/clisp-remove-failing-test.patch Normal file
View file

@ -0,0 +1,43 @@
This test doesn't ever complete or timeout
---
tests/socket.tst | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/tests/socket.tst b/tests/socket.tst
index 93c6310..1d976ff 100644
--- a/tests/socket.tst
+++ b/tests/socket.tst
@@ -551,30 +551,6 @@ T
interfaces))
("0.0.0.0" "127.0.0.1" "0.0.0.0" "127.0.0.1")
-(multiple-value-bind (run args) (cmd-args)
- (let ((se (socket:socket-server)))
- (ext:run-program run :arguments (append args (list "-q" "-q" "-x" (format nil "(close (socket:socket-connect ~D))" (socket:socket-server-port se))))
- :wait nil :input nil :output nil)
- (unwind-protect
- (with-open-stream (so (socket:socket-accept se))
- (list
- (socket:socket-status so)
- (write-line "foo" so)
- (socket:socket-status so)
- #+macos (handler-case (read-char so)
- (end-of-file (c)
- (princ 'read-char) (princ-error c) t))
- #-macos (check-os-error (read-char so) (:ECONNRESET 104))
- (null (member (socket:socket-status so) '(:EOF :APPEND)))
- #+macos (string= (write-line "bar" so) "bar")
- #-macos (check-os-error (write-line "bar" so) (:EPIPE 32))
- (null (member (socket:socket-status so) '(:EOF :APPEND)))
- (handler-case (read-char so)
- (end-of-file (c)
- (princ 'read-char) (princ-error c) 'end-of-file))))
- (socket:socket-server-close se))))
-(:OUTPUT "foo" :OUTPUT T NIL T NIL END-OF-FILE)
-
;; https://sourceforge.net/p/clisp/feature-requests/46/
(check-os-error (socket:socket-connect 0)
#-(or win32 macos) (:ECONNREFUSED 111)
--

16
gnu/packages/patches/cube-nocheck.patch Normal file
View file

@ -0,0 +1,16 @@
Unconditionally disable network check for new versions (from Fedora).
diff -u /home/dlove/rpmbuild/BUILD/cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp\~ /home/dlove/rpmbuild/BUILD/cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp
--- cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp~ 2016-04-03 00:05:37.942066948 +0100
+++ cube-4.3.4/src/GUI-qt/display/VersionCheckWidget.cpp 2016-05-06 17:16:31.648143908 +0100
@@ -52,7 +52,8 @@
url = QUrl( UPDATE_CHECK_URL );
download = NULL;
update_Available = false;
- bool no_http = env_str2bool( getenv( "CUBE_DISABLE_HTTP_DOCS" ) );
+ // bool no_http = env_str2bool( getenv( "CUBE_DISABLE_HTTP_DOCS" ) );
+ bool no_http = true;
if ( !no_http )
{
updateDescription = tr( "Check for update is not performed yet." );

19
gnu/packages/patches/curl-bounds-check.patch
View file

@ -1,19 +0,0 @@
Fix test failure on some 32-bit platforms.
Patch copied from upstream source repository:
https://github.com/curl/curl/commit/45a560390c4356bcb81d933bbbb229c8ea2acb63
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index b9dedc989e..85c5e79a7e 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -218,7 +218,7 @@ static ParameterError str2double(double *val, const char *str, long max)
num = strtod(str, &endptr);
if(errno == ERANGE)
return PARAM_NUMBER_TOO_LARGE;
- if((long)num > max) {
+ if(num > max) {
/* too large */
return PARAM_NUMBER_TOO_LARGE;
}

210
gnu/packages/patches/graphicsmagick-CVE-2017-14649.patch Normal file
View file

@ -0,0 +1,210 @@
http://hg.code.sf.net/p/graphicsmagick/code/rev/358608a46f0a
http://www.openwall.com/lists/oss-security/2017/09/22/2
Some changes were made to make the patch apply.
Notably, the DestroyJNG() function in the upstream diff has been replaced by
its equivalent, a series of calls to MagickFreeMemory(), DestroyImageInfo(),
and DestroyImage(). See
http://hg.code.sf.net/p/graphicsmagick/code/rev/d445af60a8d5.
# HG changeset patch
# User Glenn Randers-Pehrson <glennrp+bmo@gmail.com>
# Date 1504014487 14400
# Node ID 358608a46f0a9c55e9bb8b37d09bf1ac9bc87f06
# Parent 38c362f0ae5e7a914c3fe822284c6953f8e6eee2
Fix Issue 439
diff -ru a/coders/png.c b/coders/png.c
--- a/coders/png.c 1969-12-31 19:00:00.000000000 -0500
+++ b/coders/png.c 2017-09-30 08:20:16.218944991 -0400
@@ -1176,15 +1176,15 @@
/* allocate space */
if (length == 0)
{
- (void) ThrowException2(&image->exception,CoderWarning,
- "invalid profile length",(char *) NULL);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ "invalid profile length");
return (MagickFail);
}
info=MagickAllocateMemory(unsigned char *,length);
if (info == (unsigned char *) NULL)
{
- (void) ThrowException2(&image->exception,CoderWarning,
- "unable to copy profile",(char *) NULL);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ "Unable to copy profile");
return (MagickFail);
}
/* copy profile, skipping white space and column 1 "=" signs */
@@ -1197,8 +1197,8 @@
if (*sp == '\0')
{
MagickFreeMemory(info);
- (void) ThrowException2(&image->exception,CoderWarning,
- "ran out of profile data",(char *) NULL);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ "ran out of profile data");
return (MagickFail);
}
sp++;
@@ -1234,8 +1234,9 @@
if(SetImageProfile(image,profile_name,info,length) == MagickFail)
{
MagickFreeMemory(info);
- (void) ThrowException(&image->exception,ResourceLimitError,
- MemoryAllocationFailed,"unable to copy profile");
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ "unable to copy profile");
+ return MagickFail;
}
MagickFreeMemory(info);
return MagickTrue;
@@ -3285,7 +3286,6 @@
if (status == MagickFalse)
{
DestroyJNGInfo(color_image_info,alpha_image_info);
- DestroyImage(alpha_image);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" could not allocate alpha_image blob");
return ((Image *)NULL);
@@ -3534,7 +3534,7 @@
CloseBlob(color_image);
if (logging)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading jng_image from color_blob.");
+ " Reading jng_image from color_blob.");
FormatString(color_image_info->filename,"%.1024s",color_image->filename);
@@ -3558,13 +3558,18 @@
if (logging)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Copying jng_image pixels to main image.");
+ " Copying jng_image pixels to main image.");
image->rows=jng_height;
image->columns=jng_width;
length=image->columns*sizeof(PixelPacket);
+ if ((jng_height == 0 || jng_width == 0) && logging)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " jng_width=%lu jng_height=%lu",
+ (unsigned long)jng_width,(unsigned long)jng_height);
for (y=0; y < (long) image->rows; y++)
{
- s=AcquireImagePixels(jng_image,0,y,image->columns,1,&image->exception);
+ s=AcquireImagePixels(jng_image,0,y,image->columns,1,
+ &image->exception);
q=SetImagePixels(image,0,y,image->columns,1);
(void) memcpy(q,s,length);
if (!SyncImagePixels(image))
@@ -3589,45 +3594,79 @@
CloseBlob(alpha_image);
if (logging)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading opacity from alpha_blob.");
+ " Reading opacity from alpha_blob.");
FormatString(alpha_image_info->filename,"%.1024s",
alpha_image->filename);
jng_image=ReadImage(alpha_image_info,exception);
- for (y=0; y < (long) image->rows; y++)
+ if (jng_image == (Image *)NULL)
{
- s=AcquireImagePixels(jng_image,0,y,image->columns,1,
- &image->exception);
- if (image->matte)
- {
- q=SetImagePixels(image,0,y,image->columns,1);
- for (x=(long) image->columns; x > 0; x--,q++,s++)
- q->opacity=(Quantum) MaxRGB-s->red;
- }
- else
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " jng_image is NULL.");
+ if (color_image_info)
+ DestroyImageInfo(color_image_info);
+ if (alpha_image_info)
+ DestroyImageInfo(alpha_image_info);
+ if (color_image)
+ DestroyImage(color_image);
+ if (alpha_image)
+ DestroyImage(alpha_image);
+ }
+ else
+ {
+
+ if (logging)
{
- q=SetImagePixels(image,0,y,image->columns,1);
- for (x=(long) image->columns; x > 0; x--,q++,s++)
- {
- q->opacity=(Quantum) MaxRGB-s->red;
- if (q->opacity != OpaqueOpacity)
- image->matte=MagickTrue;
- }
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Read jng_image.");
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " jng_image->width=%lu, jng_image->height=%lu",
+ (unsigned long)jng_width,(unsigned long)jng_height);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " image->rows=%lu, image->columns=%lu",
+ (unsigned long)image->rows,
+ (unsigned long)image->columns);
}
- if (!SyncImagePixels(image))
- break;
- }
- (void) LiberateUniqueFileResource(alpha_image->filename);
- DestroyImage(alpha_image);
- alpha_image = (Image *)NULL;
- DestroyImageInfo(alpha_image_info);
- alpha_image_info = (ImageInfo *)NULL;
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Destroy the JNG image");
- DestroyImage(jng_image);
- jng_image = (Image *)NULL;
+
+ for (y=0; y < (long) image->rows; y++)
+ {
+ s=AcquireImagePixels(jng_image,0,y,image->columns,1,
+ &image->exception);
+ if (image->matte)
+ {
+ q=SetImagePixels(image,0,y,image->columns,1);
+ for (x=(long) image->columns; x > 0; x--,q++,s++)
+ q->opacity=(Quantum) MaxRGB-s->red;
+ }
+ else
+ {
+ q=SetImagePixels(image,0,y,image->columns,1);
+ for (x=(long) image->columns; x > 0; x--,q++,s++)
+ {
+ q->opacity=(Quantum) MaxRGB-s->red;
+ if (q->opacity != OpaqueOpacity)
+ image->matte=MagickTrue;
+ }
+ }
+ if (!SyncImagePixels(image))
+ break;
+ }
+ (void) LiberateUniqueFileResource(alpha_image->filename);
+ if (color_image_info)
+ DestroyImageInfo(color_image_info);
+ if (alpha_image_info)
+ DestroyImageInfo(alpha_image_info);
+ if (color_image)
+ DestroyImage(color_image);
+ if (alpha_image)
+ DestroyImage(alpha_image);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Destroy the JNG image");
+ DestroyImage(jng_image);
+ jng_image = (Image *)NULL;
+ }
}
}

33
gnu/packages/patches/libmwaw-CVE-2017-9433.patch
View file

@ -1,33 +0,0 @@
Fix CVE-2017-9433:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9433
Patch copied from upstream source repository:
https://sourceforge.net/p/libmwaw/libmwaw/ci/68b3b74569881248bfb6cbb4266177cc253b292f
From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 8 Apr 2017 14:03:29 +0200
Subject: [PATCH] ofz#1037 resize vector correctly
---
src/lib/MsWrd1Parser.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
index 63547e6..3626064 100644
--- a/src/lib/MsWrd1Parser.cxx
+++ b/src/lib/MsWrd1Parser.cxx
@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
int id = fIt++->second;
fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
if (id >= int(m_state->m_footnotesList.size()))
- m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
+ m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
m_state->m_footnotesList[size_t(id)]=fPos;
}
ascii().addDelimiter(input->tell(),'|');
--
2.13.1

35
gnu/packages/patches/libvisio-fix-tests.patch Normal file
View file

@ -0,0 +1,35 @@
Tests assume a CET timezone, but do not respect the "TZ" variable.
This patch is a "squashed" version of these upstream commits:
<https://cgit.freedesktop.org/libreoffice/libvisio/commit/?id=a97d30ad693374deab404ec31fe00665882cc949>
<https://cgit.freedesktop.org/libreoffice/libvisio/commit/?id=c933df45a873e566c6ce4e5de5f829e64eb892f5>
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 59d3419..23049b5 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -29,4 +29,7 @@ EXTRA_DIST = \
data/dwg.vsdx \
$(test_SOURCES)
+# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
+AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ;
+
TESTS = test
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index e05b3c1..32fb185 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8()
// Test the case when the string is UTF-8 encoded already in the file.
assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1");
// Test <dcterms:created> and <dcterms:modified>.
- assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z");
- assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z");
+ assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z");
+ assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z");
}
void ImportTest::testVsdUserDefinedMetadata()
--
2.1.4

36
gnu/packages/patches/libxfont-CVE-2017-13720.patch Normal file
View file

@ -0,0 +1,36 @@
Fix CVE-2017-13720.
Copied from upstream source repository:
<https://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=d1e670a4a8704b8708e493ab6155589bcd570608>
From d1e670a4a8704b8708e493ab6155589bcd570608 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Thu, 20 Jul 2017 13:38:53 +0200
Subject: Check for end of string in PatternMatch (CVE-2017-13720)
If a pattern contains '?' character, any character in the string is skipped,
even if it is '\0'. The rest of the matching then reads invalid memory.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 4ce2473..996b7d1 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -400,8 +400,10 @@ PatternMatch(char *pat, int patdashes, char *string, int stringdashes)
}
}
case '?':
- if (*string++ == XK_minus)
+ if ((t = *string++) == XK_minus)
stringdashes--;
+ if (!t)
+ return 0;
break;
case '\0':
return (*string == '\0');
--
cgit v0.10.2

53
gnu/packages/patches/libxfont-CVE-2017-13722.patch Normal file
View file

@ -0,0 +1,53 @@
Fix CVE-2017-13722.
Copied from upstream source repository:
<https://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=672bb944311392e2415b39c0d63b1e1902905bcd>
From 672bb944311392e2415b39c0d63b1e1902905bcd Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@suse.com>
Date: Thu, 20 Jul 2017 17:05:23 +0200
Subject: pcfGetProperties: Check string boundaries (CVE-2017-13722)
Without the checks a malformed PCF file can cause the library to make
atom from random heap memory that was behind the `strings` buffer.
This may crash the process or leak information.
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index dab1c44..ae34c28 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -45,6 +45,7 @@ from The Open Group.
#include <stdarg.h>
#include <stdint.h>
+#include <string.h>
void
pcfError(const char* message, ...)
@@ -311,11 +312,19 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file,
if (IS_EOF(file)) goto Bail;
position += string_size;
for (i = 0; i < nprops; i++) {
+ if (props[i].name >= string_size) {
+ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].name, string_size);
+ goto Bail;
+ }
props[i].name = MakeAtom(strings + props[i].name,
- strlen(strings + props[i].name), TRUE);
+ strnlen(strings + props[i].name, string_size - props[i].name), TRUE);
if (isStringProp[i]) {
+ if (props[i].value >= string_size) {
+ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].value, string_size);
+ goto Bail;
+ }
props[i].value = MakeAtom(strings + props[i].value,
- strlen(strings + props[i].value), TRUE);
+ strnlen(strings + props[i].value, string_size - props[i].value), TRUE);
}
}
free(strings);
--
cgit v0.10.2

6
gnu/packages/patches/mesa-skip-disk-cache-test.patch
View file

@ -8,12 +8,12 @@ for now.
@@ -170,11 +170,6 @@ @@ -170,11 +170,6 @@
unsetenv("MESA_GLSL_CACHE_DIR"); unsetenv("MESA_GLSL_CACHE_DIR");
unsetenv("XDG_CACHE_HOME"); unsetenv("XDG_CACHE_HOME");
- cache = disk_cache_create("test", "make_check"); - cache = disk_cache_create("test", "make_check", 0);
- expect_non_null(cache, "disk_cache_create with no environment variables"); - expect_non_null(cache, "disk_cache_create with no environment variables");
- -
- disk_cache_destroy(cache); - disk_cache_destroy(cache);
- -
/* Test with XDG_CACHE_HOME set */ /* Test with XDG_CACHE_HOME set */
setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
cache = disk_cache_create("test", "make_check"); cache = disk_cache_create("test", "make_check", 0);

55
gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch Normal file
View file

@ -0,0 +1,55 @@
From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Wed, 20 Sep 2017 11:50:02 -0400
Subject: [PATCH] SERVER-30857 Support unknown Linux distributions
---
src/mongo/rpc/metadata/client_metadata.cpp | 6 ------
src/mongo/util/processinfo_linux.cpp | 9 ++++++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp
index 845a315dd74..a959a4e31e9 100644
--- a/src/mongo/rpc/metadata/client_metadata.cpp
+++ b/src/mongo/rpc/metadata/client_metadata.cpp
@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData driverName,
StringData osArchitecture,
StringData osVersion,
BSONObjBuilder* builder) {
- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() &&
- !osArchitecture.empty() && !osVersion.empty());
-
BSONObjBuilder metaObjBuilder(builder->subobjStart(kMetadataDocumentName));
{
@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData driverName,
StringData osVersion,
StringData appName,
BSONObjBuilder* builder) {
- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() &&
- !osArchitecture.empty() && !osVersion.empty());
-
if (appName.size() > kMaxApplicationNameByteLength) {
return Status(ErrorCodes::ClientMetadataAppNameTooLarge,
str::stream() << "The '" << kApplication << "." << kName
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index c3debf377bd..c2813b026b0 100644
--- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp
@@ -376,10 +376,13 @@ class LinuxSysHelper {
if ((nl = name.find('\n', nl)) != string::npos)
// stop at first newline
name.erase(nl);
- // no standard format for name and version. use kernel version
- version = "Kernel ";
- version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
+ } else {
+ name = "unknown";
}
+
+ // There is no standard format for name and version so use the kernel version.
+ version = "Kernel ";
+ version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
}
/**

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