ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
Marius Bakke 2019-08-13 18:51:12 +02:00
commit 1b1b006afd
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
24 changed files with 116 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/local.mk
View file

@ -809,7 +809,6 @@ dist_patch_DATA = \
%D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/findutils-makedev.patch \ %D%/packages/patches/findutils-makedev.patch \
%D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/findutils-test-xargs.patch \
%D%/packages/patches/flac-CVE-2017-6888.patch \
%D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flann-cmake-3.11.patch \
%D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
@ -1124,6 +1123,7 @@ dist_patch_DATA = \
%D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nm-plugin-path.patch \
%D%/packages/patches/nss-freebl-stubs.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \

4
gnu/packages/certs.scm
View file

@ -76,7 +76,7 @@ (define certdata2pem
(define-public nss-certs (define-public nss-certs
(package (package
(name "nss-certs") (name "nss-certs")
(version "3.44.1") (version "3.45")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -87,7 +87,7 @@ (define-public nss-certs
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w")))) "12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs

4
gnu/packages/cups.scm
View file

@ -57,7 +57,7 @@ (define-module (gnu packages cups)
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.25.0") (version "1.25.1")
(source(origin (source(origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -65,7 +65,7 @@ (define-public cups-filters
"cups-filters-" version ".tar.xz")) "cups-filters-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1")) "0nlq44jnjcnrbdv0dv5myg5kaycmk6a4klynpvj65xvn3l9cq28s"))
(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

22
gnu/packages/databases.scm
View file

@ -611,15 +611,15 @@ (define-public mysql
(define-public mariadb (define-public mariadb
(package (package
(name "mariadb") (name "mariadb")
(version "10.1.40") (version "10.1.41")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.mariadb.org/f/" (uri (string-append "https://downloads.mariadb.com/MariaDB"
name "-" version "/source/" "/mariadb-" version "/source/mariadb-"
name "-" version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"19375bnq0yg52kqh6cy00s5rglcxdrs5bb2hy7dqv2xqa9z7lxci")) "1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb"))
(patches (search-patches "mariadb-client-test-32bit.patch")) (patches (search-patches "mariadb-client-test-32bit.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -654,6 +654,10 @@ (define-public mariadb
;; For now, disable the features that that use libarchive (xtrabackup). ;; For now, disable the features that that use libarchive (xtrabackup).
"-DWITH_LIBARCHIVE=OFF" "-DWITH_LIBARCHIVE=OFF"
;; Disable the TokuDB engine, because its test suite frequently fails,
;; and loading it crashes the server: <https://bugs.gnu.org/35521>.
"-DTOKUDB_OK=OFF"
;; Ensure the system libraries are used. ;; Ensure the system libraries are used.
"-DWITH_JEMALLOC=yes" "-DWITH_JEMALLOC=yes"
"-DWITH_PCRE=system" "-DWITH_PCRE=system"
@ -701,9 +705,6 @@ (define-public mariadb
;; 2030-12-31. See <https://bugs.gnu.org/34351> for details. ;; 2030-12-31. See <https://bugs.gnu.org/34351> for details.
"main.mysqldump" "main.mysqldump"
;; XXX: Fails sporadically.
"innodb_fts.crash_recovery"
;; FIXME: This test fails on i686: ;; FIXME: This test fails on i686:
;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists")
;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists)
@ -781,7 +782,6 @@ (define-public mariadb
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("pcre" ,pcre) ("pcre" ,pcre)
("snappy" ,snappy)
("xz" ,xz) ("xz" ,xz)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
@ -801,14 +801,14 @@ (define-public mariadb
(define-public postgresql (define-public postgresql
(package (package
(name "postgresql") (name "postgresql")
(version "10.9") (version "10.10")
(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
"0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm")) "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

15
gnu/packages/gl.scm
View file

@ -64,14 +64,14 @@ (define-module (gnu packages gl)
(define-public glu (define-public glu
(package (package
(name "glu") (name "glu")
(version "9.0.0") (version "9.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-" (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3")))) "1xqhk9bn10nbvffw3r4p4rjslwz1l7gaycc0x2pqkr2irp7q9x7n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("mesa" ,mesa))) ; according to glu.pc `(("mesa" ,mesa))) ; according to glu.pc
@ -224,7 +224,7 @@ (define libva-without-mesa
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "19.1.1") (version "19.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -236,7 +236,7 @@ (define-public mesa
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj")) "1yvb7ja09i36zjifpyrf8jmbm9z0wqs2w3x8dlmxkkzdv6knilm6"))
(patches (patches
(search-patches "mesa-skip-disk-cache-test.patch")))) (search-patches "mesa-skip-disk-cache-test.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
@ -288,7 +288,7 @@ (define-public mesa
;; TODO: Fix svga driver for aarch64 and armhf. ;; TODO: Fix svga driver for aarch64 and armhf.
'("-Dgallium-drivers=etnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3d,vc4,virgl")) '("-Dgallium-drivers=etnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3d,vc4,virgl"))
(_ (_
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,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
"-Dplatforms=x11,drm,surfaceless,wayland" "-Dplatforms=x11,drm,surfaceless,wayland"
@ -305,11 +305,8 @@ (define-public mesa
;; Enable Vulkan on i686-linux and x86-64-linux. ;; Enable Vulkan on i686-linux and x86-64-linux.
,@(match (%current-system) ,@(match (%current-system)
("x86_64-linux" ((or "i686-linux" "x86_64-linux")
'("-Dvulkan-drivers=intel,amd")) '("-Dvulkan-drivers=intel,amd"))
;; TODO: Fix intel driver on i686-linux.
("i686-linux"
'("-Dvulkan-drivers=amd"))
(_ (_
'("-Dvulkan-drivers=auto"))) '("-Dvulkan-drivers=auto")))

6
gnu/packages/gtk.scm
View file

@ -730,9 +730,7 @@ (define-public gtk+-2
(define-public gtk+ (define-public gtk+
(package (inherit gtk+-2) (package (inherit gtk+-2)
(name "gtk+") (name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in (version "3.24.10")
;; mate.scm will also need to be updated.
(version "3.24.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -740,7 +738,7 @@ (define-public gtk+
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0dg6jf2763sp740ls6b5y86b5b9zhz3zj0sbmar2xpws1lkv0zjp")) "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m"))
(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"))

4
gnu/packages/image.scm
View file

@ -1035,7 +1035,7 @@ (define-public vigra-c
(define-public libwebp (define-public libwebp
(package (package
(name "libwebp") (name "libwebp")
(version "1.0.2") (version "1.0.3")
(source (source
(origin (origin
;; No tarballs are provided for >0.6.1. ;; No tarballs are provided for >0.6.1.
@ -1046,7 +1046,7 @@ (define-public libwebp
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ay0sai7f74dyk2gi975qfllmq534vnsx456npf16583mqb6ib2q")))) "1l8h9d3z3kla567ilmymrgg8vc2n763g8qss1hah8dg832hbqkxf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("freeglut" ,freeglut) `(("freeglut" ,freeglut)

4
gnu/packages/imagemagick.scm
View file

@ -48,14 +48,14 @@ (define-public imagemagick
;; 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.10-51") (version "6.9.10-58")
(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
"03c5r14ycp7mmlk6pryfcnpvjjnghk3z7dbjd1b7m1bgzmw21jhj")))) "1hrd408lqgwg70aaif8g60lipwsplsg61722kpmx7a08pygs46hf"))))
(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")

4
gnu/packages/maths.scm
View file

@ -325,7 +325,7 @@ (define-public units
(define-public double-conversion (define-public double-conversion
(package (package
(name "double-conversion") (name "double-conversion")
(version "3.1.4") (version "3.1.5")
(home-page "https://github.com/google/double-conversion") (home-page "https://github.com/google/double-conversion")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -334,7 +334,7 @@ (define-public double-conversion
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13xwcqk2c0q8c1siw566clxcpvp0xrxvb72mra42wa3nvq9wlsv6")))) "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:test-target "test" '(#:test-target "test"

5
gnu/packages/nss.scm
View file

@ -70,7 +70,7 @@ (define-public nspr
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.44.1") (version "3.45")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -81,9 +81,10 @@ (define-public nss
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w")) "12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch" (patches (search-patches "nss-pkgconfig.patch"
"nss-freebl-stubs.patch"
"nss-increase-test-timeout.patch")))) "nss-increase-test-timeout.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "bin")) (outputs '("out" "bin"))

29
gnu/packages/patches/flac-CVE-2017-6888.patch
View file

@ -1,29 +0,0 @@
https://git.xiph.org/?p=flac.git;a=patch;h=4f47b63e9c971e6391590caf00a0f2a5ed612e67
From 4f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sat, 8 Apr 2017 18:34:49 +1000
Subject: [PATCH] stream_decoder.c: Fix a memory leak
Leak reported by Secunia Research.
---
src/libFLAC/stream_decoder.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index 14d5fe7f..a5527511 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -1753,6 +1753,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
}
memset (obj->comments[i].entry, 0, obj->comments[i].length) ;
if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) {
+ /* Current i-th entry is bad, so we delete it. */
+ free (obj->comments[i].entry) ;
+ obj->comments[i].entry = NULL ;
obj->num_comments = i;
goto skip;
}
--
2.11.0

20
gnu/packages/patches/nss-freebl-stubs.patch Normal file
View file

@ -0,0 +1,20 @@
This patch is required for Makefile-based builds of NSS 3.45 on armhf-linux.
Taken from upstream bug tracker:
https://bugzilla.mozilla.org/show_bug.cgi?id=1571316
diff --git a/nss/lib/freebl/ecl/curve25519_32.c b/nss/lib/freebl/ecl/curve25519_32.c
--- a/nss/lib/freebl/ecl/curve25519_32.c
+++ b/nss/lib/freebl/ecl/curve25519_32.c
@@ -29,6 +29,10 @@
* 1. Convert custom integer types to stdint.h types
*/
+#ifdef FREEBL_NO_DEPEND
+#include "../stubs.h"
+#endif
+
#include "ecl-priv.h"
/* fe means field element. Here the field is \Z/(2^255-19). An element t,

14
gnu/packages/pcre.scm
View file

@ -89,13 +89,12 @@ (define-public pcre
(define-public pcre2 (define-public pcre2
(package (package
(name "pcre2") (name "pcre2")
(replacement pcre2/fixed)
(version "10.33") (version "10.33")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/pcre/pcre2/" (uri (string-append "mirror://sourceforge/pcre/pcre2/"
version "/pcre2-" version ".tar.bz2")) version "/pcre2-" version ".tar.bz2"))
(patches (search-patches "pcre2-fix-jit_match-crash.patch"))
(sha256 (sha256
(base32 (base32
"1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m")))) "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"))))
@ -126,14 +125,3 @@ (define-public pcre2
POSIX regular expression API.") POSIX regular expression API.")
(license license:bsd-3) (license license:bsd-3)
(home-page "https://www.pcre.org/"))) (home-page "https://www.pcre.org/")))
(define-public pcre2/fixed
;; PHP >= 7.3.8 requires a fixed version at build time, so make it public
;; and hide it in the UI.
(package
(inherit pcre2)
(source
(origin
(inherit (package-source pcre2))
(patches (search-patches "pcre2-fix-jit_match-crash.patch"))))
(properties '((hidden? . #t)))))

6
gnu/packages/perl.scm
View file

@ -9010,15 +9010,15 @@ (define-public perl-tree-simple-visitorfactory
(define-public perl-try-tiny (define-public perl-try-tiny
(package (package
(name "perl-try-tiny") (name "perl-try-tiny")
(version "0.22") (version "0.30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/D/DO/DOY/" (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"Try-Tiny-" version ".tar.gz")) "Try-Tiny-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"068vdbpacfawc3lkfs0b82xxl27h3l0gj14iada3vlwk8rps9yv0")))) "0szgvlz19yz3mq1lbzmwh8w5dh6agg5s16xv22zrnl83r7ax0nys"))))
(build-system perl-build-system) (build-system perl-build-system)
(home-page "https://metacpan.org/release/Try-Tiny") (home-page "https://metacpan.org/release/Try-Tiny")
(synopsis "Minimal try/catch with proper preservation of $@@") (synopsis "Minimal try/catch with proper preservation of $@@")

2
gnu/packages/php.scm
View file

@ -367,7 +367,7 @@ (define-public php
("oniguruma" ,oniguruma-5) ("oniguruma" ,oniguruma-5)
("openldap" ,openldap) ("openldap" ,openldap)
("openssl" ,openssl) ("openssl" ,openssl)
("pcre" ,pcre2/fixed) ; must be /fixed for tests ("pcre" ,pcre2)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("readline" ,readline) ("readline" ,readline)
("sqlite" ,sqlite) ("sqlite" ,sqlite)

21
gnu/packages/python-xyz.scm
View file

@ -3191,14 +3191,14 @@ (define-public python2-scikit-image
(define-public python-cython (define-public python-cython
(package (package
(name "python-cython") (name "python-cython")
(version "0.29.11") (version "0.29.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Cython" version)) (uri (pypi-uri "Cython" version))
(sha256 (sha256
(base32 (base32
"1866m01ggl2h3rky4hac3m5p048gg4a0jb09ljkknryiqln54fkn")))) "13k37lrcgagwwnzr5bzririsscb793vndj234d475x1h9ad0d7f2"))))
(build-system python-build-system) (build-system python-build-system)
;; we need the full python package and not just the python-wrapper ;; we need the full python package and not just the python-wrapper
;; because we need libpython3.3m.so ;; because we need libpython3.3m.so
@ -3230,7 +3230,12 @@ (define-public python-cython
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "python" "runtests.py" "-vv")))))) ;; Disable compiler optimizations to greatly reduce the running
;; time of the test suite.
(setenv "CFLAGS" "-O0")
(invoke "python" "runtests.py" "-vv"
"-j" (number->string (parallel-job-count))))))))
(home-page "https://cython.org/") (home-page "https://cython.org/")
(synopsis "C extensions for Python") (synopsis "C extensions for Python")
(description "Cython is an optimising static compiler for both the Python (description "Cython is an optimising static compiler for both the Python
@ -8782,20 +8787,24 @@ (define-public python2-xdo
(define-public python-mako (define-public python-mako
(package (package
(name "python-mako") (name "python-mako")
(version "1.0.13") (version "1.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Mako" version)) (uri (pypi-uri "Mako" version))
(sha256 (sha256
(base32 (base32
"0h95n0g0k1jwxiqarr09navpfajarvbmpm8mhmw66c25qc675vlm")))) "0jqa3qfpykyn4fmkn0kh6043sfls7br8i2bsdbccazcvk9cijsd3"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "pytest" "-vv"))))))
(propagated-inputs (propagated-inputs
`(("python-markupsafe" ,python-markupsafe))) `(("python-markupsafe" ,python-markupsafe)))
(native-inputs (native-inputs
`(("python-mock" ,python-mock) `(("python-mock" ,python-mock)
("python-nose" ,python-nose)
("python-pytest" ,python-pytest))) ("python-pytest" ,python-pytest)))
(home-page "https://www.makotemplates.org/") (home-page "https://www.makotemplates.org/")
(synopsis "Templating language for Python") (synopsis "Templating language for Python")

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

@ -1301,7 +1301,7 @@ (define-public neon
(define-public subversion (define-public subversion
(package (package
(name "subversion") (name "subversion")
(version "1.10.4") (version "1.10.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1312,7 +1312,7 @@ (define-public subversion
"subversion-" version ".tar.bz2"))) "subversion-" version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2")))) "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

4
gnu/packages/video.scm
View file

@ -702,7 +702,7 @@ (define-public libmatroska
(define-public libva (define-public libva
(package (package
(name "libva") (name "libva")
(version "2.4.1") (version "2.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -714,7 +714,7 @@ (define-public libva
(string-append "https://www.freedesktop.org/software/vaapi/releases/" (string-append "https://www.freedesktop.org/software/vaapi/releases/"
"libva/libva-" version "/libva-" version ".tar.bz2"))) "libva/libva-" version "/libva-" version ".tar.bz2")))
(sha256 (sha256
(base32 "0w7fkkrnfizzglviybxiyhxcvd3mfsiqlpda7rwj3ccihn857q79")))) (base32 "0y38mw1ggxm15zq06r4qpwhd5wx4bppw1rsxpr6sq1m5d79rra1s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

8
gnu/packages/vulkan.scm
View file

@ -159,7 +159,7 @@ (define-public glslang
(define-public vulkan-headers (define-public vulkan-headers
(package (package
(name "vulkan-headers") (name "vulkan-headers")
(version "1.1.112") (version "1.1.114")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -169,7 +169,7 @@ (define-public vulkan-headers
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0iia2wlq38hvxwip6r3k5946ylrlk42fw50mhf0pdjxjh02p8zn5")))) "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; No tests. `(#:tests? #f)) ; No tests.
@ -193,7 +193,7 @@ (define-public vulkan-loader
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1819bgmpjlikcc25bkmwwb7mp1rlyrq2v74wybg1g40ix70v0m0d")))) "1rkm6dzdzxva62shscipz3kpp66x4kgmwvp1ski2fvf4jzzcbv7h"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".
@ -266,7 +266,7 @@ (define-public vulkan-tools
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0an9hqvvpfmfld2pkszzwi7ccb9g2ijjqqzlj24dqg9kqnmcr3x4")))) "1lz06mpni8ghf1xcxi4g6ck306lfaqwfi6f1w64kp9hczmvapfhf"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("glslang" ,glslang) `(("glslang" ,glslang)

8
gnu/packages/web.scm
View file

@ -2228,7 +2228,7 @@ (define-public perl-catalystx-script-server-starman
(define-public perl-cgi (define-public perl-cgi
(package (package
(name "perl-cgi") (name "perl-cgi")
(version "4.38") (version "4.44")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2236,7 +2236,7 @@ (define-public perl-cgi
"CGI-" version ".tar.gz")) "CGI-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1m779315rzj4mpgscw209a2wk18iwg2n8zibn8aak4mv56jz8n4c")))) "020jrygslqixrxd2nzc2l8ac39ynqzsy83nnnr3mqn6kxfvmyhqj"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-test-deep" ,perl-test-deep) `(("perl-test-deep" ,perl-test-deep)
@ -2871,7 +2871,7 @@ (define-public perl-http-date
(define-public perl-http-message (define-public perl-http-message
(package (package
(name "perl-http-message") (name "perl-http-message")
(version "6.15") (version "6.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2879,7 +2879,7 @@ (define-public perl-http-message
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"11fbvisyvi6bw8z9iq9fm9mraf69qyds09fblhl9gyvg7ccll93v")))) "04lih0fn89jpyk74c4aq1rzq18h8v4zd3x0lik2r9dl8sdqd2q6h"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-try-tiny" ,perl-try-tiny))) `(("perl-try-tiny" ,perl-try-tiny)))

28
gnu/packages/wine.scm
View file

@ -164,10 +164,14 @@ (define-public wine
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json") "/share/vulkan/icd.d/radeon_icd.i686.json")
(string-append icd "/radeon_icd.i686.json")) (string-append icd "/radeon_icd.i686.json"))
(copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.i686.json")
(string-append icd "/intel_icd.i686.json"))
(wrap-program (string-append out "/bin/wine-preloader") (wrap-program (string-append out "/bin/wine-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append icd (,(string-append icd
"/radeon_icd.i686.json")))) "/radeon_icd.i686.json" ":"
icd "/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -224,7 +228,9 @@ (define-public wine64
(assoc-ref inputs "mesa") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" ":" "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
(assoc-ref inputs "wine") (assoc-ref inputs "wine")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
(assoc-ref inputs "wine")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
(wrap-program (string-append out "/bin/wine64-preloader") (wrap-program (string-append out "/bin/wine64-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append (assoc-ref inputs "mesa") (,(string-append (assoc-ref inputs "mesa")
@ -232,7 +238,9 @@ (define-public wine64
":" (assoc-ref inputs "mesa") ":" (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" "/share/vulkan/icd.d/intel_icd.x86_64.json"
":" (assoc-ref inputs "wine") ":" (assoc-ref inputs "wine")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json"
":" (assoc-ref inputs "wine")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -393,10 +401,14 @@ (define-public wine-staging
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json") "/share/vulkan/icd.d/radeon_icd.i686.json")
(string-append icd "/radeon_icd.i686.json")) (string-append icd "/radeon_icd.i686.json"))
(copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.i686.json")
(string-append icd "/intel_icd.i686.json"))
(wrap-program (string-append out "/bin/wine-preloader") (wrap-program (string-append out "/bin/wine-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append icd (,(string-append icd
"/radeon_icd.i686.json")))) "/radeon_icd.i686.json" ":"
icd "/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -464,7 +476,9 @@ (define-public wine64-staging
(assoc-ref inputs "mesa") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" ":" "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
(assoc-ref inputs "wine-staging") (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
(assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
(wrap-program (string-append out "/bin/wine64-preloader") (wrap-program (string-append out "/bin/wine64-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append (assoc-ref inputs "mesa") (,(string-append (assoc-ref inputs "mesa")
@ -472,7 +486,9 @@ (define-public wine64-staging
":" (assoc-ref inputs "mesa") ":" (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" "/share/vulkan/icd.d/intel_icd.x86_64.json"
":" (assoc-ref inputs "wine-staging") ":" (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json"
":" (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())

5
gnu/packages/xiph.scm
View file

@ -235,15 +235,14 @@ (define ao
(define flac (define flac
(package (package
(name "flac") (name "flac")
(version "1.3.2") (version "1.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.xiph.org/releases/flac/flac-" (uri (string-append "https://downloads.xiph.org/releases/flac/flac-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi")) "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1"))))
(patches (search-patches "flac-CVE-2017-6888.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:parallel-tests? #f)) `(#:parallel-tests? #f))

4
gnu/packages/xorg.scm
View file

@ -1136,7 +1136,7 @@ (define-public libfs
(define-public libpciaccess (define-public libpciaccess
(package (package
(name "libpciaccess") (name "libpciaccess")
(version "0.14") (version "0.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1146,7 +1146,7 @@ (define-public libpciaccess
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x")))) "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; Make sure libpciaccess can read compressed 'pci.ids' files as '(;; Make sure libpciaccess can read compressed 'pci.ids' files as

10
guix/build/ant-build-system.scm
View file

@ -43,7 +43,8 @@ (define* (default-build.xml jar-name prefix #:optional
(call-with-output-file "build.xml" (call-with-output-file "build.xml"
(lambda (port) (lambda (port)
(sxml->xml (sxml->xml
`(project (@ (basedir ".")) `(project (@ (basedir ".")
(name ,jar-name))
(property (@ (name "classes.dir") (property (@ (name "classes.dir")
(value "${basedir}/build/classes"))) (value "${basedir}/build/classes")))
(property (@ (name "manifest.dir") (property (@ (name "manifest.dir")
@ -118,10 +119,9 @@ (define* (default-build.xml jar-name prefix #:optional
(target (@ (name "jar") (target (@ (name "jar")
(depends "compile, manifest")) (depends "compile, manifest"))
(mkdir (@ (dir "${jar.dir}"))) (mkdir (@ (dir "${jar.dir}")))
(exec (@ (executable "jar")) (jar (@ (destfile ,(string-append "${jar.dir}/" jar-name))
(arg (@ (line ,(string-append "-cmf ${manifest.file} " (manifest "${manifest.file}")
"${jar.dir}/" jar-name (basedir "${classes.dir}"))))
" -C ${classes.dir} ."))))))
(target (@ (name "install")) (target (@ (name "install"))
(copy (@ (todir "${dist.dir}")) (copy (@ (todir "${dist.dir}"))