diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-07-11 20:33:44 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-11 20:33:44 +0200 |
commit | 878a6baa4c705f4d551b60c5aa254246e0abc922 (patch) | |
tree | 828394061b011f0500753f85db5e2625b569cf0a /gnu | |
parent | 1c65b0e9d5731c5bcda77482ed06576f2fbfeac4 (diff) | |
parent | 7a05fdd0e1d5e5e26e94014d87bf85575bbec780 (diff) | |
download | patches-878a6baa4c705f4d551b60c5aa254246e0abc922.tar patches-878a6baa4c705f4d551b60c5aa254246e0abc922.tar.gz |
Merge branch 'staging'
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/base.scm | 14 | ||||
-rw-r--r-- | gnu/packages/certs.scm | 4 | ||||
-rw-r--r-- | gnu/packages/check.scm | 9 | ||||
-rw-r--r-- | gnu/packages/cups.scm | 4 | ||||
-rw-r--r-- | gnu/packages/databases.scm | 4 | ||||
-rw-r--r-- | gnu/packages/freedesktop.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gl.scm | 19 | ||||
-rw-r--r-- | gnu/packages/glib.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gtk.scm | 4 | ||||
-rw-r--r-- | gnu/packages/haskell.scm | 4 | ||||
-rw-r--r-- | gnu/packages/imagemagick.scm | 4 | ||||
-rw-r--r-- | gnu/packages/nss.scm | 4 | ||||
-rw-r--r-- | gnu/packages/onc-rpc.scm | 16 | ||||
-rw-r--r-- | gnu/packages/perl.scm | 4 | ||||
-rw-r--r-- | gnu/packages/python-xyz.scm | 57 | ||||
-rw-r--r-- | gnu/packages/sphinx.scm | 6 | ||||
-rw-r--r-- | gnu/packages/textutils.scm | 32 | ||||
-rw-r--r-- | gnu/packages/time.scm | 4 | ||||
-rw-r--r-- | gnu/packages/tls.scm | 6 | ||||
-rw-r--r-- | gnu/packages/vulkan.scm | 30 | ||||
-rw-r--r-- | gnu/packages/xdisorg.scm | 4 | ||||
-rw-r--r-- | gnu/packages/xiph.scm | 4 | ||||
-rw-r--r-- | gnu/packages/xorg.scm | 15 |
23 files changed, 160 insertions, 96 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 15f35009a9..90dd69cfa3 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1215,15 +1215,15 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019a") + (version "2019b") (source (origin (method url-fetch) (uri (string-append - "https://www.iana.org/time-zones/repository/releases/tzdata" + "https://data.iana.org/time-zones/releases/tzdata" version ".tar.gz")) (sha256 (base32 - "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh")))) + "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1269,11 +1269,11 @@ command.") (inputs `(("tzcode" ,(origin (method url-fetch) (uri (string-append - "http://www.iana.org/time-zones/repository/releases/tzcode" + "https://data.iana.org/time-zones/releases/tzcode" version ".tar.gz")) (sha256 (base32 - "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7")))))) + "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) @@ -1296,7 +1296,7 @@ and daylight-saving rules.") (source (origin (method url-fetch) (uri (string-append - "https://www.iana.org/time-zones/repository/releases/tzdata" + "https://data.iana.org/time-zones/releases/tzdata" version ".tar.gz")) (sha256 (base32 @@ -1305,7 +1305,7 @@ and daylight-saving rules.") `(("tzcode" ,(origin (method url-fetch) (uri (string-append - "http://www.iana.org/time-zones/repository/releases/tzcode" + "http://data.iana.org/time-zones/releases/tzcode" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index ee8815d522..c41870332c 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.44") + (version "3.44.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5")))) + "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index dae2b0e1d9..085538b2de 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2062,18 +2062,17 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.11") + (version "0.3.12") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 "1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8")))) + (base32 "1rx57v8ryjncjimg8hys9kx1r3rknvwcl4y340g20jn0sf69qk9a")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("python-coverage" ,python-coverage))) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-six" ,python-six) ("python-dateutil" ,python-dateutil))) @@ -2084,7 +2083,7 @@ create data based on random numbers and yet remain repeatable.") ;; package does not include the Makefile. (replace 'check (lambda _ - (invoke "nosetests" "./tests/")))))) + (invoke "pytest" "-vv")))))) (home-page "https://github.com/spulec/freezegun") (synopsis "Test utility for mocking the datetime module") (description diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b48da35e8e..b87203cab6 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -57,7 +57,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.23.0") + (version "1.25.0") (source(origin (method url-fetch) (uri @@ -65,7 +65,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2")) + "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8e4a3ff814..4e2db8ed44 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -806,14 +806,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.8") + (version "10.9") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i")) + "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4b37ffdf3c..d77d6c58c4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -152,14 +152,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.13.2") + (version "1.13.4") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx")))) + "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 99d2ec6cdb..9ed043c7ae 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -223,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.0.4") + (version "19.1.1") (source (origin (method url-fetch) @@ -235,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0iyffj3xd7f0vsayirswh6aia37ba26hkihpz273hxwd8hpz7y9r")) + "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -269,6 +270,13 @@ also known as DXTn or DXTC) for Mesa.") `(("bison" ,bison) ("flex" ,flex) ("gettext" ,gettext-minimal) + ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + `(("glslang" ,glslang) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader))) + (_ + `())) ("pkg-config" ,pkg-config) ("python" ,python) ("python-mako" ,python-mako) @@ -305,6 +313,13 @@ also known as DXTn or DXTC) for Mesa.") (_ '("-Dvulkan-drivers=auto"))) + ;; Enable the Vulkan overlay layer on i686-linux and x86-64-linux. + ,@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + '("-Dvulkan-overlay-layer=true")) + (_ + '())) + ;; Also enable the tests. "-Dbuild-tests=true" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d75b963794..ab9ed0b1bf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -491,7 +491,7 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.1") + (version "2.10.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsigc++/" @@ -499,7 +499,7 @@ by GDBus included in Glib.") name "-" version ".tar.xz")) (sha256 (base32 - "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9")))) + "163s14d1rqp82gc1vsm3q0wzsbdicb9q6307kz0zk5lm6x9h5jmi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("m4" ,m4))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3f835f51e5..6f37e5e8ca 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -732,7 +732,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.24.8") + (version "3.24.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -740,7 +740,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6")) + "0dg6jf2763sp740ls6b5y86b5b9zhz3zj0sbmar2xpws1lkv0zjp")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d3ff27412f..17fddc1965 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2686,7 +2686,7 @@ library, including the ability to split random number generators.") (define-public ghc-primitive (package (name "ghc-primitive") - (version "0.6.3.0") + (version "0.6.4.0") (outputs '("out" "doc")) (source (origin @@ -2697,7 +2697,7 @@ library, including the ability to split random number generators.") ".tar.gz")) (sha256 (base32 - "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd")))) + "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc")))) (build-system haskell-build-system) (home-page "https://github.com/haskell/primitive") diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 7c09594b88..39fcf61a12 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-46") + (version "6.9.10-51") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1qx3x48q1dy39g1bb8mnyaq9jwy1smf0x6zfly4r0mj3m01i2dyb")))) + "03c5r14ycp7mmlk6pryfcnpvjjnghk3z7dbjd1b7m1bgzmw21jhj")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 83f4431c2b..40a8002954 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.44") + (version "3.44.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5")) + "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 64887212d3..8f66b07527 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -23,6 +23,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages gettext) @@ -33,7 +34,7 @@ (define-public libtirpc (package (name "libtirpc") - (version "1.0.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/" @@ -41,7 +42,7 @@ version ".tar.bz2")) (sha256 (base32 - "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6")))) + "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c")))) (build-system gnu-build-system) (arguments `(#:phases @@ -105,13 +106,14 @@ universal addresses.") (name "libnsl") (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/thkukuk/libnsl/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/thkukuk/libnsl.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1y6kmxmv1difzvdhx7grqzw0j2v2b74mg4kjb803m8jcgkqqx8m5")))) + "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d0df091494..9ab7c37a24 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9588,7 +9588,7 @@ MYMETA.yml.") (define-public perl-module-build (package (name "perl-module-build") - (version "0.4220") + (version "0.4229") (source (origin (method url-fetch) @@ -9596,7 +9596,7 @@ MYMETA.yml.") "Module-Build-" version ".tar.gz")) (sha256 (base32 - "18mm6k7d7cmj9l6na1c50vbc8hc1pwsz38yxi9x6ydlrwz3hf4pv")))) + "064c03wxia7jz0i578awj4srykj0nnigm4p5r0dv0559rnk93r0z")))) (build-system perl-build-system) (propagated-inputs `(("perl-cpan-meta" ,perl-cpan-meta))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 49d5126e02..29aebdf8aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -316,14 +316,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (define-public python-babel (package (name "python-babel") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Babel" version)) (sha256 (base32 - "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))) + "0a7wawx8vsg7igvz6p3x909fskhg4b2y1910xk4f4c8y22p3aqg8")))) (build-system python-build-system) (native-inputs `(("python-freezegun" ,python-freezegun) @@ -348,6 +348,18 @@ etc. ") (define-public python2-babel (package-with-python2 python-babel)) +;; Sphinx < 2.0 requires this version. Remove once no longer needed. +(define-public python2-babel-2.6 + (package + (inherit python2-babel) + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "Babel" version)) + (sha256 + (base32 + "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))))) + (define-public python2-backport-ssl-match-hostname (package (name "python2-backport-ssl-match-hostname") @@ -2329,15 +2341,33 @@ e.g. filters, callbacks and errbacks can all be promises.") (define-public python-markupsafe (package (name "python-markupsafe") - (version "1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "MarkupSafe" version)) (sha256 (base32 - "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6")))) + "0sqipg4fk7xbixqd8kq6rlkxj664d157bdwbh93farcphf92x1r9")))) (build-system python-build-system) + (arguments + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((cwd (getcwd)) + (libdir (find (cut string-prefix? "lib." <>) + (scandir "build")))) + (setenv "PYTHONPATH" + (string-append cwd "/build/" libdir ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/mitsuhiko/markupsafe") (synopsis "XML/HTML/XHTML markup safe string implementation for Python") (description @@ -2515,14 +2545,14 @@ reStructuredText.") (define-public python-pygments (package (name "python-pygments") - (version "2.4.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "1xb5n3hvhk63kxypc03k7kfry20pny6gygi4bsl9kw1rnzzsdjri")))) + "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. @@ -3153,14 +3183,14 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.7") + (version "0.29.11") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "1s61hq2ikawxp6qvmkbfvvaxy9rqj67cddzwgcfc3dwi44b83l2m")))) + "1866m01ggl2h3rky4hac3m5p048gg4a0jb09ljkknryiqln54fkn")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -4384,14 +4414,14 @@ a general image processing tool.") (define-public python-pycparser (package (name "python-pycparser") - (version "2.18") + (version "2.19") (source (origin (method url-fetch) (uri (pypi-uri "pycparser" version)) (sha256 (base32 - "09mjyw82ibqzl449g7swy8bfxnfpmas0815d2rkdjlcqw81wma4r")))) + "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259")))) (outputs '("out" "doc")) (build-system python-build-system) (native-inputs @@ -4414,7 +4444,8 @@ a general image processing tool.") (copy-file (string-append "." file) (string-append doc file))) '("/README.rst" "/CHANGES" "/LICENSE")) - (copy-recursively "examples" examples))))))) + (copy-recursively "examples" examples) + #t)))))) (home-page "https://github.com/eliben/pycparser") (synopsis "C parser in Python") (description @@ -8704,14 +8735,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.10") + (version "1.0.13") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "0r9rysn19fmrxnzfcn7sg20kjhcrx9qri0my9n5vdzp1g2g92rbi")))) + "0h95n0g0k1jwxiqarr09navpfajarvbmpm8mhmw66c25qc675vlm")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 0a7fc9606a..5ec769388a 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -45,14 +45,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "2.0.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0js0rnbzm0nsb4gm2v4z79wlbmr05awqzic57kfl8ydkdxj80cj2")))) + "09y4mjmbxz94pmfr2lzf1hkx2xk0khcpb8xsqfmir4l7dds9x9zr")))) (build-system python-build-system) (arguments `(#:phases @@ -132,7 +132,7 @@ sources.") ("python2-imagesize" ,python2-imagesize) ("python2-sphinx-alabaster-theme" ,python2-sphinx-alabaster-theme) - ("python2-babel" ,python2-babel) + ("python2-babel" ,python2-babel-2.6) ("python2-snowballstemmer" ,python2-snowballstemmer) ("python2-docutils" ,python2-docutils) ("python2-jinja2" ,python2-jinja2) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 79835e8578..d1dc14e6d7 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -140,32 +140,35 @@ libenca and several charset conversion libraries and tools.") (define-public utf8proc (package (name "utf8proc") - (version "2.1.1") + (version "2.4.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/JuliaLang/utf8proc/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaStrings/utf8proc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17")))) + (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) (build-system gnu-build-system) - (inputs ; test data that is otherwise downloaded with curl + (native-inputs ;test data that is otherwise downloaded with curl `(("NormalizationTest.txt" ,(origin (method url-fetch) - (uri (string-append "http://www.unicode.org/Public/9.0.0/ucd/" + (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" "NormalizationTest.txt")) (sha256 - (base32 "1fxrz0bilsbwl685336aqi88k62i6nqhm62rvy4zhg3bcm4dhj1d")))) + (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) - (uri (string-append "http://www.unicode.org/Public/9.0.0/ucd/" + (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" "auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "0qbhyhmf0778lc2hcwlpizrvmdxwpk959v2q2wb8abv09ba7wvn7")))))) + (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + + ;; For tests. + ("perl" ,perl))) (arguments '(#:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) @@ -180,8 +183,9 @@ libenca and several charset conversion libraries and tools.") '("NormalizationTest.txt" "GraphemeBreakTest.txt")) (substitute* "data/GraphemeBreakTest.txt" (("÷") "/") - (("×") "+"))))))) - (home-page "https://julialang.org/utf8proc/") + (("×") "+")) + #t))))) + (home-page "https://juliastrings.github.io/utf8proc/") (synopsis "C library for processing UTF-8 Unicode data") (description "utf8proc is a small C library that provides Unicode normalization, case-folding, and other operations for data in the UTF-8 diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index a0c0824a92..9aad36e587 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -113,14 +113,14 @@ expressions.") (define-public python-pytz (package (name "python-pytz") - (version "2018.5") + (version "2019.1") (source (origin (method url-fetch) (uri (pypi-uri "pytz" version ".tar.gz")) (sha256 (base32 - "0xzj5gkpdn2da8m6j47chlp6zrzcypv9m0fjv4236q3jw4fyzfgz")))) + "0hg1r2c41gnmljdsdmdgy6kb1zkfmxsf49imd96g8znp4cyxsiyp")))) (build-system python-build-system) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ea6dfda931..da2bfd5cad 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -643,14 +643,14 @@ certificates for free.") (define-public perl-net-ssleay (package (name "perl-net-ssleay") - (version "1.85") + (version "1.88") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MI/MIKEM/" + (uri (string-append "mirror://cpan/authors/id/C/CH/CHRISN/" "Net-SSLeay-" version ".tar.gz")) (sha256 (base32 - "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx")))) + "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010")))) (build-system perl-build-system) (inputs `(("openssl" ,openssl))) (arguments diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..9fb780de77 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -159,7 +159,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.107") + (version "1.1.112") (source (origin (method git-fetch) @@ -169,7 +169,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0kyf83n6fghqmjj5jbwhy08yq5sl598qnmw3kbavrnw9avqqm0c4")))) + "0iia2wlq38hvxwip6r3k5946ylrlk42fw50mhf0pdjxjh02p8zn5")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -193,7 +193,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1p64k9x5r7nsrs0cn6d61687xbajqvsm78xk6j85w9wfin5dxs30")))) + "1819bgmpjlikcc25bkmwwb7mp1rlyrq2v74wybg1g40ix70v0m0d")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -203,6 +203,28 @@ interpretation of the specifications for these languages.") (lambda* (#:key inputs #:allow-other-keys) ;; Remove lines trying to build in a git commit id. (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") "")) + #t)) + ;; Make sure that the files needed for Mesa's Vulkan overlay are availabe. + (add-after 'unpack 'copy-headers1 + (lambda* (#:key outputs #:allow-other-keys) + (install-file "tests/layers/vk_layer_data.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "tests/layers/vk_layer_extension_utils.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "loader/vk_loader_platform.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + #t)) + (add-after 'build 'copy-headers2 + (lambda* (#:key outputs #:allow-other-keys) + (install-file "vk_layer_dispatch_table.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) + (install-file "vk_dispatch_table_helper.h" + (string-append (assoc-ref %outputs "out") + "/include/vulkan")) #t))) #:configure-flags (list "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. @@ -244,7 +266,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1mak96jdg3wv043b4jxyv1fm2cz4nnallg0yb90my3yp5q64grrw")))) + "0an9hqvvpfmfld2pkszzwi7ccb9g2ijjqqzlj24dqg9kqnmcr3x4")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7c52b6d017..bd30fd2fd2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -379,7 +379,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.98") + (version "2.4.99") (source (origin (method url-fetch) @@ -389,7 +389,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "150qdzsm2nx6dfacc75rx53anzsc6m31nhxidf5xxax3mk6fvq4b")) + "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system meson-build-system) (arguments diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8f900cf90d..804cfd39a7 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -160,14 +160,14 @@ stereo encoding, and voice activity detection.") (define speexdsp (package (name "speexdsp") - (version "1.2rc3") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.xiph.org/releases/speex/" "speexdsp-" version ".tar.gz")) (sha256 (base32 - "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja")))) + "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838")))) (build-system gnu-build-system) (arguments `(#:configure-flags '(,@(if (string=? "aarch64-linux" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7099745ab3..29b9010a99 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3829,7 +3829,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) @@ -3839,7 +3839,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "13h3381pfp4pv32189zkfsj2x0alr91xj6dqii76rl0c8v3ihdrr")))) + "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) @@ -5195,16 +5195,7 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server) - (version "1.20.4") - (source (origin - (inherit (package-source xorg-server)) - (uri (string-append - "mirror://xorg/individual/xserver/" - "xorg-server-" version ".tar.bz2")) - (sha256 - (base32 - "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"))))))) + (inherit xorg-server)))) (define-public xorg-server-xwayland (package |