Archived
1
0
Fork 0

Merge branch 'staging'

This commit is contained in:
Marius Bakke 2019-06-13 15:27:30 +02:00
commit f388f4a568
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
27 changed files with 171 additions and 228 deletions

View file

@ -674,7 +674,6 @@ dist_patch_DATA = \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/at-spi2-core-meson-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
@ -886,7 +885,6 @@ dist_patch_DATA = \
%D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gsl-test-i686.patch \
%D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/gst-plugins-good-libvpx-compat.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-default-utf8.patch \

View file

@ -35,6 +35,7 @@
#:use-module (gnu packages dav) #:use-module (gnu packages dav)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -49,7 +50,7 @@
(define-public libical (define-public libical
(package (package
(name "libical") (name "libical")
(version "3.0.4") (version "3.0.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -57,7 +58,7 @@
version "/libical-" version ".tar.gz")) version "/libical-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0ifisnh42cw5z53hp9p52l3ggc7k877zlqk0n06gdhrk0bhidckj")))) "1rkq9qkvbv76n6k6kc8pxhwj9vhyigkb6flfcn1rk6wwqk451mbs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; test suite appears broken '(#:tests? #f ; test suite appears broken
@ -77,7 +78,8 @@
(("\\\"/usr/share/lib/zoneinfo\\\"") ""))) (("\\\"/usr/share/lib/zoneinfo\\\"") "")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("gtk-doc" ,gtk-doc)
("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)

View file

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

View file

@ -57,7 +57,7 @@
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
(version "1.22.3") (version "1.23.0")
(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
"11vilv80l3q7hz8vyhclvjcnlgk93r7p9dvg634186iddjzls0j3")) "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2"))
(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

View file

@ -612,7 +612,7 @@ Language.")
(define-public mariadb (define-public mariadb
(package (package
(name "mariadb") (name "mariadb")
(version "10.1.38") (version "10.1.40")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.mariadb.org/f/" (uri (string-append "https://downloads.mariadb.org/f/"
@ -620,7 +620,7 @@ Language.")
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zq77w3ff9q781fn8cv46vy1v4ggb8vjarjvk51k653x4gyg9wfa")) "19375bnq0yg52kqh6cy00s5rglcxdrs5bb2hy7dqv2xqa9z7lxci"))
(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
@ -802,15 +802,14 @@ as a drop-in replacement of MySQL.")
(define-public postgresql (define-public postgresql
(package (package
(name "postgresql") (name "postgresql")
(version "10.7") (version "10.8")
(replacement postgresql-10.8)
(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
"1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz")) "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"))
(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
@ -846,22 +845,6 @@ TIMESTAMP. It also supports storage of binary large objects, including
pictures, sounds, or video.") pictures, sounds, or video.")
(license (license:x11-style "file://COPYRIGHT")))) (license (license:x11-style "file://COPYRIGHT"))))
;; This release fixes CVE-2019-10129 and CVE-2019-10130. See
;; <https://www.postgresql.org/about/news/1939/> for details.
;; TODO: Remove this in the next rebuild cycle.
(define-public postgresql-10.8
(package
(inherit postgresql)
(version "10.8")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))))
(define-public postgresql-9.6 (define-public postgresql-9.6
(package (package
(inherit postgresql) (inherit postgresql)

View file

@ -152,14 +152,14 @@ freedesktop.org project.")
(define-public libinput (define-public libinput
(package (package
(name "libinput") (name "libinput")
(version "1.13.0") (version "1.13.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/" (uri (string-append "https://freedesktop.org/software/libinput/"
"libinput-" version ".tar.xz")) "libinput-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vb11fzd06xbagrnha2bbzmlfg04bbgb5w5rjrxrrz686mfwj9zb")))) "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-Ddocumentation=false"))) `(#:configure-flags '("-Ddocumentation=false")))

View file

@ -6,7 +6,7 @@
;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
@ -223,7 +223,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "18.3.5") (version "19.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"0lvrfjaic7dhay9v52f9k3q5aac8xagfq3pnzjrl0cn65jlaw9s0")) "0iyffj3xd7f0vsayirswh6aia37ba26hkihpz273hxwd8hpz7y9r"))
(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)
@ -278,7 +278,7 @@ also known as DXTn or DXTC) for Mesa.")
'(,@(match (%current-system) '(,@(match (%current-system)
((or "armhf-linux" "aarch64-linux") ((or "armhf-linux" "aarch64-linux")
;; TODO: Fix svga driver for aarch64 and armhf. ;; TODO: Fix svga driver for aarch64 and armhf.
'("-Dgallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,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=nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
@ -328,6 +328,15 @@ also known as DXTn or DXTC) for Mesa.")
(substitute* "src/intel/genxml/gen_pack_header.py" (substitute* "src/intel/genxml/gen_pack_header.py"
(("/usr/bin/env python2") (which "python"))) (("/usr/bin/env python2") (which "python")))
#t)) #t))
,@(if (string-prefix? "i686" (%current-system))
;; Disable new test from Mesa 19 that fails on i686. Upstream
;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>.
`((add-after 'unpack 'disable-failing-test
(lambda _
(substitute* "src/gallium/tests/unit/meson.build"
(("'u_format_test',") ""))
#t)))
'())
(add-before (add-before
'configure 'fix-dlopen-libnames 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)

View file

@ -1287,7 +1287,7 @@ XML/CSS rendering engine.")
(define-public libgsf (define-public libgsf
(package (package
(name "libgsf") (name "libgsf")
(version "1.14.45") (version "1.14.46")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1295,7 +1295,7 @@ XML/CSS rendering engine.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w")))) "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)

View file

@ -7,6 +7,7 @@
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -67,14 +68,14 @@
(define-public orc (define-public orc
(package (package
(name "orc") (name "orc")
(version "0.4.28") (version "0.4.29")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/data/src/" (uri (string-append "https://gstreamer.freedesktop.org/data/src/"
"orc/orc-" version ".tar.xz")) "orc/orc-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1kl3rlmzr27bdpn78nvpnjs142ja1m6grvafdhw74mmhcdjprkdz")))) "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -102,7 +103,7 @@ arrays of data.")
(define-public gstreamer (define-public gstreamer
(package (package
(name "gstreamer") (name "gstreamer")
(version "1.14.4") (version "1.16.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -111,14 +112,26 @@ arrays of data.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr")))) "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-html-dir=" (list (string-append "--with-html-dir="
(assoc-ref %outputs "doc") (assoc-ref %outputs "doc")
"/share/gtk-doc/html")))) "/share/gtk-doc/html"))
,@(if (not (target-64bit?))
;; Skip test that fails on 32-bit systems:
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/316>.
`(#:phases (modify-phases %standard-phases
(add-before 'check 'disable-gstbufferpool-test
(lambda _
(substitute* "tests/check/Makefile"
(("^[[:blank:]]+gst/gstbufferpool.*$")
""))
#t))))
'())))
(propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc.
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -150,7 +163,7 @@ This package provides the core library and elements.")
(define-public gst-plugins-base (define-public gst-plugins-base
(package (package
(name "gst-plugins-base") (name "gst-plugins-base")
(version "1.14.4") (version "1.16.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -158,7 +171,7 @@ This package provides the core library and elements.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa")))) "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(propagated-inputs (propagated-inputs
@ -209,17 +222,16 @@ for the GStreamer multimedia library.")
(define-public gst-plugins-good (define-public gst-plugins-good
(package (package
(name "gst-plugins-good") (name "gst-plugins-good")
(version "1.14.4") (version "1.16.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://gstreamer.freedesktop.org/src/" name "/" "https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "gst-plugins-good-libvpx-compat.patch"))
(sha256 (sha256
(base32 (base32
"0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz")))) "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("aalib" ,aalib) `(("aalib" ,aalib)
@ -251,8 +263,7 @@ for the GStreamer multimedia library.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper))) ("python-wrapper" ,python-wrapper)))
(arguments (arguments
`(#:make-flags '("CFLAGS=-DHAVE_VPX_1_8") ;XXX: Remove for >1.14. `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after
'unpack 'disable-failing-tests 'unpack 'disable-failing-tests
@ -274,14 +285,14 @@ developers consider to have good quality code and correct functionality.")
(define-public gst-plugins-bad (define-public gst-plugins-bad
(package (package
(name "gst-plugins-bad") (name "gst-plugins-bad")
(version "1.14.4") (version "1.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/" (uri (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi")))) "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -349,7 +360,7 @@ par compared to the rest.")
(define-public gst-plugins-ugly (define-public gst-plugins-ugly
(package (package
(name "gst-plugins-ugly") (name "gst-plugins-ugly")
(version "1.14.4") (version "1.16.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -357,7 +368,7 @@ par compared to the rest.")
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc")))) "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gst-plugins-base" ,gst-plugins-base) `(("gst-plugins-base" ,gst-plugins-base)
@ -384,7 +395,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
(define-public gst-libav (define-public gst-libav
(package (package
(name "gst-libav") (name "gst-libav")
(version "1.14.4") (version "1.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -392,7 +403,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz")) "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -407,7 +418,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
("python" ,python))) ("python" ,python)))
(inputs (inputs
`(("gst-plugins-base" ,gst-plugins-base) `(("gst-plugins-base" ,gst-plugins-base)
("ffmpeg" ,ffmpeg-3.4) ("ffmpeg" ,ffmpeg)
("orc" ,orc) ("orc" ,orc)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://gstreamer.freedesktop.org/") (home-page "https://gstreamer.freedesktop.org/")
@ -420,7 +431,7 @@ compression formats through the use of the libav library.")
(define-public python-gst (define-public python-gst
(package (package
(name "python-gst") (name "python-gst")
(version "1.14.4") (version "1.16.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -428,7 +439,7 @@ compression formats through the use of the libav library.")
"gst-python-" version ".tar.xz")) "gst-python-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh")))) "0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; XXX: Factorize python-sitedir with python-build-system. ;; XXX: Factorize python-sitedir with python-build-system.

View file

@ -559,16 +559,15 @@ in the GNOME project.")
(define-public at-spi2-core (define-public at-spi2-core
(package (package
(name "at-spi2-core") (name "at-spi2-core")
(version "2.32.0") (version "2.32.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 "/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "at-spi2-core-meson-compat.patch"))
(sha256 (sha256
(base32 (base32
"083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923")))) "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -732,7 +731,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.24.7") (version "3.24.8")
(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,18 +739,9 @@ application suites.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj")) "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6"))
(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"))))
(modules '((guix build utils)))
(snippet
'(begin
;; Version 3.24.2 was released with a typo that broke the build.
;; See upstream commit 2905fc861acda3d134a198e56ef2f6c962ad3061
;; at <https://gitlab.gnome.org/GNOME/gtk/tree/gtk-3-24>
(substitute* "docs/tools/shooter.c"
(("gdk_screen_get_dfeault") "gdk_screen_get_default"))
#t))))
(outputs '("out" "bin" "doc")) (outputs '("out" "bin" "doc"))
(propagated-inputs (propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk) `(("at-spi2-atk" ,at-spi2-atk)

View file

@ -48,14 +48,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.10-35") (version "6.9.10-46")
(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
"1mc7f1i29w27nqsc8gmlqxyid16ik4ys0razggwajzs7mhxy3g8g")))) "1qx3x48q1dy39g1bb8mnyaq9jwy1smf0x6zfly4r0mj3m01i2dyb"))))
(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")

View file

@ -1179,7 +1179,7 @@ intercept and print the system calls executed by the program.")
(define-public alsa-lib (define-public alsa-lib
(package (package
(name "alsa-lib") (name "alsa-lib")
(version "1.1.8") (version "1.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1187,7 +1187,7 @@ intercept and print the system calls executed by the program.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w")))) "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.alsa-project.org/") (home-page "https://www.alsa-project.org/")
(synopsis "The Advanced Linux Sound Architecture libraries") (synopsis "The Advanced Linux Sound Architecture libraries")
@ -1199,14 +1199,14 @@ MIDI functionality to the Linux-based operating system.")
(define-public alsa-utils (define-public alsa-utils
(package (package
(name "alsa-utils") (name "alsa-utils")
(version "1.1.8") (version "1.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx")))) "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; XXX: Disable man page creation until we have DocBook. ;; XXX: Disable man page creation until we have DocBook.
@ -1253,14 +1253,14 @@ MIDI functionality to the Linux-based operating system.")
(define-public alsa-plugins (define-public alsa-plugins
(package (package
(name "alsa-plugins") (name "alsa-plugins")
(version "1.1.8") (version "1.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz")))) "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; TODO: Split libavcodec and speex if possible. It looks like they can not
;; be split, there are references to both in files. ;; be split, there are references to both in files.
@ -2267,7 +2267,7 @@ from the module-init-tools project.")
;; The post-systemd fork, maintained by Gentoo. ;; The post-systemd fork, maintained by Gentoo.
(package (package
(name "eudev") (name "eudev")
(version "3.2.7") (version "3.2.8")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url "https://github.com/gentoo/eudev") (uri (git-reference (url "https://github.com/gentoo/eudev")
@ -2275,7 +2275,7 @@ from the module-init-tools project.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1la7x7v7yqb84wnc7w0kj53sa0an0m9xp6wn01ypi8drh02wjjy2")) "1g95yzzx4qxm5qhhylbi930lrq4gsbz207n72018nkvswj6gmpjw"))
(patches (search-patches "eudev-rules-directory.patch")))) (patches (search-patches "eudev-rules-directory.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -3358,14 +3358,14 @@ applications.")
(define-public sbc (define-public sbc
(package (package
(name "sbc") (name "sbc")
(version "1.3") (version "1.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/bluetooth/sbc-" (uri (string-append "mirror://kernel.org/linux/bluetooth/sbc-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476")))) "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libsndfile" ,libsndfile))) `(("libsndfile" ,libsndfile)))

View file

@ -10,6 +10,7 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -49,7 +50,7 @@
(define-public llvm (define-public llvm
(package (package
(name "llvm") (name "llvm")
(version "7.0.1") (version "8.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -57,7 +58,7 @@
version "/llvm-" version ".src.tar.xz")) version "/llvm-" version ".src.tar.xz"))
(sha256 (sha256
(base32 (base32
"16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))) "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2
@ -324,11 +325,11 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-runtime (define-public clang-runtime
(clang-runtime-from-llvm (clang-runtime-from-llvm
llvm llvm
"065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq")) "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl"))
(define-public clang (define-public clang
(clang-from-llvm llvm clang-runtime (clang-from-llvm llvm clang-runtime
"067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"
#:patches '("clang-7.0-libc-search-path.patch"))) #:patches '("clang-7.0-libc-search-path.patch")))
(define-public llvm-6 (define-public llvm-6

View file

@ -70,7 +70,7 @@ in the Mozilla clients.")
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.43") (version "3.44")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -81,7 +81,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk")) "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5"))
;; 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-increase-test-timeout.patch")))) "nss-increase-test-timeout.patch"))))
@ -129,7 +129,7 @@ in the Mozilla clients.")
;; leading to test failures: ;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date. ;; work around that, set the time to roughly the release date.
(invoke "faketime" "2019-02-01" "./nss/tests/all.sh"))) (invoke "faketime" "2019-05-01" "./nss/tests/all.sh")))
(replace '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"))

View file

@ -1,18 +0,0 @@
Fix build with Meson 0.50.0 and above.
Taken from upstream repository:
https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a
diff --git a/atspi/meson.build b/atspi/meson.build
index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644
--- a/atspi/meson.build
+++ b/atspi/meson.build
@@ -57,7 +57,7 @@ atspi_headers = [
atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
-install_headers(atspi_headers, subdir: atspi_includedir)
+install_headers(atspi_headers, install_dir: atspi_includedir)
atspi_enums = gnome.mkenums('atspi-enum-types',
sources: [ 'atspi-constants.h', 'atspi-types.h' ],

View file

@ -1,58 +0,0 @@
Fix build with libvpx 1.8.
Taken from this upstream commit:
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/b6e6f1ae73375ef66a5748069843aaed1a83e6a6
Note: Remove the HAVE_VPX_1_8 build flag with this patch. It was added
to avoid re-creating the configure script.
diff --git a/configure.ac b/configure.ac
index 5e4cff126..8c20e5081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [
AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger])
], [true])
+ PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [
+ AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger])
+ ], [true])
+
LIBS="$OLD_LIBS"
CFLAGS="$OLD_CFLAGS"
fi
diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
index c3f0f625f..da4322513 100644
--- a/ext/vpx/gstvpxdec.c
+++ b/ext/vpx/gstvpxdec.c
@@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
{C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
{C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
{C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
+#ifndef HAVE_VPX_1_8
{C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
"Print frame information",
"visualize-frame-info"},
@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
{C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
"Print video rate info",
"visualize-rate-info"},
+#endif
{C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
{0, NULL, NULL}
};
diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
index 6ed440728..0d2340b32 100644
--- a/ext/vpx/meson.build
+++ b/ext/vpx/meson.build
@@ -48,6 +48,10 @@ if vpx_dep.found()
vpx_args += '-DHAVE_VPX_1_4'
endif
+ if dependency('vpx', version : '>=1.8.0', required : false).found()
+ vpx_args += '-DHAVE_VPX_1_8'
+ endif
+
gstvpx = library('gstvpx',
vpx_sources,
c_args : gst_plugins_good_args + vpx_args,

View file

@ -89,7 +89,7 @@ POSIX regular expression API.")
(define-public pcre2 (define-public pcre2
(package (package
(name "pcre2") (name "pcre2")
(version "10.31") (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/"
@ -97,7 +97,7 @@ POSIX regular expression API.")
(sha256 (sha256
(base32 (base32
"1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0")))) "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("bzip2" ,bzip2) (inputs `(("bzip2" ,bzip2)
("readline" ,readline) ("readline" ,readline)

View file

@ -154,6 +154,11 @@ rates.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/udev/rules.d")) "/lib/udev/rules.d"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'fix-alsa-include
(lambda _
(substitute* '("configure" "src/modules/alsa/alsa-ucm.h")
(("use-case\\.h") "alsa/use-case.h"))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; 'tests/lock-autospawn-test.c' wants to create a file ;; 'tests/lock-autospawn-test.c' wants to create a file

View file

@ -1328,13 +1328,13 @@ WebSocket usage in Python programs.")
(define-public python-requests (define-public python-requests
(package (package
(name "python-requests") (name "python-requests")
(version "2.21.0") (version "2.22.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "requests" version)) (uri (pypi-uri "requests" version))
(sha256 (sha256
(base32 (base32
"13jr0wkj9c2j8c0c8iaal9iivi0bpxghnsdn6lxcpnmc657q4ajh")))) "1d5ybh11jr5sm7xp6mz8fyc7vrp4syifds91m7sj60xalal0gq0i"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-certifi" ,python-certifi) `(("python-certifi" ,python-certifi)
@ -1501,14 +1501,14 @@ authenticated session objects providing things like keep-alive.")
(define-public python-urllib3 (define-public python-urllib3
(package (package
(name "python-urllib3") (name "python-urllib3")
(version "1.24.1") (version "1.25.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "urllib3" version)) (uri (pypi-uri "urllib3" version))
(sha256 (sha256
(base32 (base32
"08lwd9f3hqznyf32vnzwvp87pchx062nkbgyrf67rwlkgj0jk5fy")))) "0cij8qcvvpj62g1q8n785qjkdymfh4b7vf45si4sw64l41rr3rfv"))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:tests? #f)) (arguments `(#:tests? #f))
(propagated-inputs (propagated-inputs

View file

@ -2320,14 +2320,14 @@ for Python.")
(define-public python-jinja2 (define-public python-jinja2
(package (package
(name "python-jinja2") (name "python-jinja2")
(version "2.10") (version "2.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Jinja2" version)) (uri (pypi-uri "Jinja2" version))
(sha256 (sha256
(base32 (base32
"190l36hfw3wb2n3n68yacjabxyb1pnxwn7vjx96cmjj002xy2jzq")))) "04shqrs56aj04ipyqykj512rw2l0zfammvj9krawzxz7xc14yp06"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-markupsafe" ,python-markupsafe))) `(("python-markupsafe" ,python-markupsafe)))
@ -2484,14 +2484,14 @@ reStructuredText.")
(define-public python-pygments (define-public python-pygments
(package (package
(name "python-pygments") (name "python-pygments")
(version "2.2.0") (version "2.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Pygments" version)) (uri (pypi-uri "Pygments" version))
(sha256 (sha256
(base32 (base32
"1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv")))) "1xb5n3hvhk63kxypc03k7kfry20pny6gygi4bsl9kw1rnzzsdjri"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; FIXME: Tests require sphinx, which depends on this. ;; FIXME: Tests require sphinx, which depends on this.
@ -3123,14 +3123,14 @@ provides additional functionality on the produced Mallard documents.")
(define-public python-cython (define-public python-cython
(package (package
(name "python-cython") (name "python-cython")
(version "0.29.6") (version "0.29.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Cython" version)) (uri (pypi-uri "Cython" version))
(sha256 (sha256
(base32 (base32
"1bp7cn0pp5qy63k9hbp4ka34fm01kvysh478phpkhr68npqk6pbc")))) "1s61hq2ikawxp6qvmkbfvvaxy9rqj67cddzwgcfc3dwi44b83l2m"))))
(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
@ -8345,14 +8345,14 @@ python-xdo for newer bindings.)")
(define-public python-mako (define-public python-mako
(package (package
(name "python-mako") (name "python-mako")
(version "1.0.7") (version "1.0.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Mako" version)) (uri (pypi-uri "Mako" version))
(sha256 (sha256
(base32 (base32
"1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) "0r9rysn19fmrxnzfcn7sg20kjhcrx9qri0my9n5vdzp1g2g92rbi"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-markupsafe" ,python-markupsafe))) `(("python-markupsafe" ,python-markupsafe)))
@ -12198,14 +12198,14 @@ several utilities, as well as an API for building localization tools.")
(define-public python-packaging (define-public python-packaging
(package (package
(name "python-packaging") (name "python-packaging")
(version "18.0") (version "19.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "packaging" version)) (uri (pypi-uri "packaging" version))
(sha256 (sha256
(base32 (base32
"01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8")))) "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -12961,14 +12961,14 @@ requirements is not met.")
(define-public python-pysocks (define-public python-pysocks
(package (package
(name "python-pysocks") (name "python-pysocks")
(version "1.6.8") (version "1.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "PySocks" version)) (uri (pypi-uri "PySocks" version))
(sha256 (sha256
(base32 (base32
"0wn6xafwy9c1gamwljw3fyvih5w19qy9xp39zmv8c90ai5ajrr9z")))) "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr"))))
(build-system python-build-system) (build-system python-build-system)
(arguments `(#:tests? #f)) (arguments `(#:tests? #f))
(home-page "https://github.com/Anorov/PySocks") (home-page "https://github.com/Anorov/PySocks")

View file

@ -30,6 +30,7 @@
(define-module (gnu packages sphinx) (define-module (gnu packages sphinx)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -44,14 +45,14 @@
(define-public python-sphinx (define-public python-sphinx
(package (package
(name "python-sphinx") (name "python-sphinx")
(version "1.7.7") (version "2.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Sphinx" version)) (uri (pypi-uri "Sphinx" version))
(sha256 (sha256
(base32 (base32
"0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) "0js0rnbzm0nsb4gm2v4z79wlbmr05awqzic57kfl8ydkdxj80cj2"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -63,11 +64,6 @@
(substitute* "tests/test_build_latex.py" (substitute* "tests/test_build_latex.py"
(("@pytest.mark.sphinx\\('latex', testroot='images'\\)") (("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
"@pytest.mark.skip()")) "@pytest.mark.skip()"))
(when (which "python")
;; XXX: These tests are broken when using Python2:
;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
(delete-file "tests/test_api_translator.py")
(delete-file "tests/test_setup_command.py"))
(invoke "make" "test")))))) (invoke "make" "test"))))))
(propagated-inputs (propagated-inputs
`(("python-imagesize" ,python-imagesize) `(("python-imagesize" ,python-imagesize)
@ -80,8 +76,13 @@
("python-packaging" ,python-packaging) ("python-packaging" ,python-packaging)
("python-pygments" ,python-pygments) ("python-pygments" ,python-pygments)
("python-requests" ,python-requests) ("python-requests" ,python-requests)
("python-six" ,python-six) ("python-sphinxcontrib-applehelp" ,python-sphinxcontrib-applehelp)
("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) ("python-sphinxcontrib-devhelp" ,python-sphinxcontrib-devhelp)
("python-sphinxcontrib-htmlhelp" ,python-sphinxcontrib-htmlhelp)
("python-sphinxcontrib-jsmath" ,python-sphinxcontrib-jsmath)
("python-sphinxcontrib-qthelp" ,python-sphinxcontrib-qthelp)
("python-sphinxcontrib-serializinghtml"
,python-sphinxcontrib-serializinghtml)))
(native-inputs (native-inputs
`(("graphviz" ,graphviz) `(("graphviz" ,graphviz)
("imagemagick" ,imagemagick) ;for "convert" ("imagemagick" ,imagemagick) ;for "convert"
@ -97,16 +98,50 @@ sources.")
(license license:bsd-3) (license license:bsd-3)
(properties `((python2-variant . ,(delay python2-sphinx)))))) (properties `((python2-variant . ,(delay python2-sphinx))))))
;; Sphinx 2 does not support Python 2, so we stick with this older version here.
;; Remove this package once python2-pbcore no longer requires it.
(define-public python2-sphinx (define-public python2-sphinx
(let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
(package (package
(inherit base) (inherit base)
(version "1.7.7")
(source (origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
"0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
(add-before 'check 'disable-broken-tests
(lambda _
;; These tests are broken when using Python2:
;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
(for-each delete-file '("tests/test_api_translator.py"
"tests/test_setup_command.py"))
#t))))))
(native-inputs `(("python2-mock" ,python2-mock) (native-inputs `(("python2-mock" ,python2-mock)
("python2-enum34" ,python2-enum34) ("python2-enum34" ,python2-enum34)
,@(package-native-inputs base))) ,@(package-native-inputs base)))
;; Sphinx 2 has some dependencies that do not support Python 2, so
;; we keep our own propagated-inputs here instead of inheriting.
(propagated-inputs `(("python2-pytz" ,python2-pytz) (propagated-inputs `(("python2-pytz" ,python2-pytz)
("python2-typing" ,python2-typing) ("python2-typing" ,python2-typing)
,@(package-propagated-inputs base)))))) ("python2-imagesize" ,python2-imagesize)
("python2-sphinx-alabaster-theme"
,python2-sphinx-alabaster-theme)
("python2-babel" ,python2-babel)
("python2-snowballstemmer" ,python2-snowballstemmer)
("python2-docutils" ,python2-docutils)
("python2-jinja2" ,python2-jinja2)
("python2-packaging" ,python2-packaging)
("python2-pygments" ,python2-pygments)
("python2-requests" ,python2-requests)
("python2-six" ,python2-six)
("python2-sphinxcontrib-websupport"
,python2-sphinxcontrib-websupport))))))
(define-public python-sphinxcontrib-applehelp (define-public python-sphinxcontrib-applehelp
(package (package

View file

@ -32,7 +32,7 @@
(define-public valgrind (define-public valgrind
(package (package
(name "valgrind") (name "valgrind")
(version "3.14.0") (version "3.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "http://www.valgrind.org/downloads" (uri (list (string-append "http://www.valgrind.org/downloads"
@ -41,7 +41,7 @@
"/valgrind-" version ".tar.bz2"))) "/valgrind-" version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03")) "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"))
(patches (search-patches "valgrind-enable-arm.patch")))) (patches (search-patches "valgrind-enable-arm.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("doc" ;16 MB (outputs '("doc" ;16 MB
@ -79,18 +79,3 @@ tools. There are Valgrind tools that can automatically detect many memory
management and threading bugs, and profile your programs in detail. You can management and threading bugs, and profile your programs in detail. You can
also use Valgrind to build new tools.") also use Valgrind to build new tools.")
(license gpl2+))) (license gpl2+)))
(define-public valgrind-3.15
(package
(inherit valgrind)
(version "3.15.0")
(source (origin
(method url-fetch)
(uri (list (string-append "http://www.valgrind.org/downloads"
"/valgrind-" version ".tar.bz2")
(string-append "ftp://sourceware.org/pub/valgrind"
"/valgrind-" version ".tar.bz2")))
(sha256
(base32
"1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"))
(patches (search-patches "valgrind-enable-arm.patch"))))))

View file

@ -700,7 +700,7 @@ libebml is a C++ library to read and write EBML files.")
(define-public libva (define-public libva
(package (package
(name "libva") (name "libva")
(version "2.4.0") (version "2.4.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -712,7 +712,7 @@ libebml is a C++ library to read and write EBML files.")
(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 "14ckq67z3pcd7jrnrm3ckss440g6dzp2m0ff5rps54qmq9b309lr")))) (base32 "0w7fkkrnfizzglviybxiyhxcvd3mfsiqlpda7rwj3ccihn857q79"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View file

@ -159,7 +159,7 @@ interpretation of the specifications for these languages.")
(define-public vulkan-headers (define-public vulkan-headers
(package (package
(name "vulkan-headers") (name "vulkan-headers")
(version "1.1.106") (version "1.1.107")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -169,7 +169,7 @@ interpretation of the specifications for these languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd")))) "0kyf83n6fghqmjj5jbwhy08yq5sl598qnmw3kbavrnw9avqqm0c4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; No tests. `(#:tests? #f)) ; No tests.
@ -193,7 +193,7 @@ interpretation of the specifications for these languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1ypjd2gfxdwldnqrrqy6bnjln5mml62a9k5pfi451srcxznijjai")))) "1p64k9x5r7nsrs0cn6d61687xbajqvsm78xk6j85w9wfin5dxs30"))))
(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".
@ -244,7 +244,7 @@ and the ICD.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8")))) "1mak96jdg3wv043b4jxyv1fm2cz4nnallg0yb90my3yp5q64grrw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("glslang" ,glslang) `(("glslang" ,glslang)

View file

@ -855,7 +855,7 @@ for efficient socket-like bidirectional reliable communication channels.")
(define-public libpsl (define-public libpsl
(package (package
(name "libpsl") (name "libpsl")
(version "0.20.2") (version "0.21.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/rockdaboot/libpsl/" (uri (string-append "https://github.com/rockdaboot/libpsl/"
@ -863,7 +863,7 @@ for efficient socket-like bidirectional reliable communication channels.")
"/libpsl-" version ".tar.gz")) "/libpsl-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03sn3fbcrmgl9x2f1gc6rbrdlbrnwbhrnkgi733gqb95cvmhmzgq")))) "04pfagb7ppq3yibx4lhazd1v9nwkxdfkyy2rgcrmrf3mldsirga1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -3083,14 +3083,14 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.")
(define-public perl-io-socket-ssl (define-public perl-io-socket-ssl
(package (package
(name "perl-io-socket-ssl") (name "perl-io-socket-ssl")
(version "2.038") (version "2.066")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/" (uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/"
"IO-Socket-SSL-" version ".tar.gz")) "IO-Socket-SSL-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"11fiifxyvn7njc9p52wgygyw24jz7rh7gnz2ikjphr4l4x9f03rx")) "1kgbws7dwp2hh16qid7169dfkhmcwg7dz9ffbm6k0id5h53hciqd"))
(patches (search-patches (patches (search-patches
"perl-io-socket-ssl-openssl-1.0.2f-fix.patch")))) "perl-io-socket-ssl-openssl-1.0.2f-fix.patch"))))
(build-system perl-build-system) (build-system perl-build-system)

View file

@ -379,7 +379,7 @@ rasterisation.")
(define-public libdrm (define-public libdrm
(package (package
(name "libdrm") (name "libdrm")
(version "2.4.97") (version "2.4.98")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -389,7 +389,7 @@ rasterisation.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) "150qdzsm2nx6dfacc75rx53anzsc6m31nhxidf5xxax3mk6fvq4b"))
(patches (search-patches "libdrm-symbol-check.patch")))) (patches (search-patches "libdrm-symbol-check.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments

View file

@ -334,14 +334,14 @@ ogginfo, to obtain information (tags, bitrate, length, etc.) about
(define opus (define opus
(package (package
(name "opus") (name "opus")
(version "1.3") (version "1.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/opus/opus-" (uri (string-append "https://archive.mozilla.org/pub/opus/opus-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag")))) "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Versatile audio codec") (synopsis "Versatile audio codec")
(description (description