diff options
Diffstat (limited to 'gnu')
28 files changed, 174 insertions, 219 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 16d7cd9529..3730b0d516 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1212,7 +1212,6 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 24831db5e6..2328012083 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.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")))) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d5a9a9b92a..15ab54dd8a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -78,7 +78,7 @@ (define-public check (package (name "check") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ version "/check-" version ".tar.gz")) (sha256 (base32 - "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4")))) + "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx")))) (build-system gnu-build-system) (home-page "https://libcheck.github.io/check/") (synopsis "Unit test framework for C") diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 33f9380236..2e1fe04dde 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net> -;;; Copyright © 2016, 2018, 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> @@ -766,7 +766,12 @@ decompression of some loosely related file formats used by Microsoft.") (substitute* "tests/Makefile" (("^test: (.*) test-install" _ targets) (string-append "test: " targets))) - #t))))) + #t)) + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/lib/liblz4.a")) + #t)))))) (home-page "https://www.lz4.org") (synopsis "Compression algorithm focused on speed") (description "LZ4 is a lossless compression algorithm, providing diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 953b9a9577..0d675c2ef7 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.26.2") + (version "1.27.1") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1a8x6zgw3m4717gw3842gsrgjl05q92xygy4rp5vwr1d1xjmyxp1")) + "0dpn4rkmrdprkhlnpih5dzrn4fxzj20k42d516kx4qx0g5l74lrm")) (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 c8d12f43b5..59f9c2b173 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -690,7 +690,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.43") + (version "10.1.44") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -698,7 +698,7 @@ Language.") version ".tar.gz")) (sha256 (base32 - "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) + "0fah6d50hldq0farxwr8mj3jnniwdz0d1wsha07nx37fc79h7wi1")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -790,6 +790,7 @@ Language.") ;; See <https://jira.mariadb.org/browse/MDEV-7761>. "main.join_cache" "main.explain_non_select" + "main.stat_tables" "main.stat_tables_innodb" "roles.acl_statistics" @@ -825,6 +826,10 @@ Language.") (("latin1_swedish_ci") "utf8_general_ci") (("\tlatin1") "\tutf8")) + (substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test" + (("/bin/bash") + (which "bash"))) + (substitute* "mysql-test/mysql-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh"))) @@ -951,14 +956,14 @@ developed in C/C++ to MariaDB and MySQL databases.") (define-public postgresql (package (name "postgresql") - (version "10.11") + (version "10.12") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d")) + "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 404527f882..f3469b1815 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2321,7 +2321,7 @@ full programmatic control over your models.") ("python-pyside-2-tools" ,python-pyside-2-tools) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase-patched) + ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 90956968b2..5e6482c53e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -181,14 +181,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.15.0") + (version "1.15.2") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz")))) + "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 310bb6c320..01f93f6def 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -37,25 +37,24 @@ #:use-module (guix build-system gnu) #:use-module (srfi srfi-1)) -(define-public gdb-8.3 +(define-public gdb-9.1 (package (name "gdb") - (version "8.3.1") + (version "9.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y")))) - - ;; Hide this package so that end users get 'gdb/next' below. - (properties '((hidden? . #t))) + "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. + #:out-of-source? #t + #:modules ((srfi srfi-1) ,@%gnu-build-system-modules) @@ -96,6 +95,7 @@ ("python" ,python) ("python-wrapper" ,python-wrapper) ("dejagnu" ,dejagnu) + ("source-highlight" ,source-highlight) ;; Allow use of XML-formatted syscall information. This enables 'catch ;; syscall' and similar commands. @@ -117,7 +117,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; <https://bugs.gnu.org/37810>. (define-public gdb-8.2 (package/inherit - gdb-8.3 + gdb-9.1 (version "8.2.1") (source (origin (method url-fetch) @@ -127,26 +127,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.") (base32 "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) -;; The "next" version of GDB, to be merged with 'gdb' in the next rebuild cycle. -(define-public gdb/next - (package/inherit - gdb-8.3 - (version "9.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) - (sha256 - (base32 - "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) - (arguments - `(#:out-of-source? #t - ,@(package-arguments gdb-8.3))) - (inputs - `(("source-highlight" ,source-highlight) - ,@(package-inputs gdb-8.3))) - (properties (alist-delete 'hidden? (package-properties gdb-8.3))))) - (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. - gdb-8.3) + gdb-9.1) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b0e0a43761..b863283606 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -232,7 +232,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.3.2") + (version "19.3.4") (source (origin (method url-fetch) @@ -244,7 +244,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf")) + "1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -268,7 +268,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm-8))) + `(("llvm" ,llvm-9))) (_ `())) ("makedepend" ,makedepend) @@ -423,24 +423,6 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) -;; Mesa 19.3.2 causes a test failure in some packages, so add this newer -;; version separately until the next rebuild cycle. -(define-public mesa-19.3.3 - (package/inherit - mesa - (version "19.3.3") - (source (origin - (inherit (package-source mesa)) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz"))) - (sha256 - (base32 - "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1")))))) - (define-public mesa-opencl (package (inherit mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c30f23d921..985ebefa53 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -971,10 +971,7 @@ requirements.") (native-inputs `(("xorg-server" ,xorg-server-for-tests))) (inputs - `(;; The test suite fails when using Mesa 19.3.2, so we provide this newer - ;; version. Remove this input when the 'mesa' package is updated. - ("mesa" ,mesa-19.3.3) - ("glew" ,glew) + `(("glew" ,glew) ("libxrandr" ,libxrandr) ("libxcursor" ,libxcursor) ("libxinerama" ,libxinerama) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f28a3b04ba..05b4a52d39 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -723,7 +723,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.13") + (version "3.24.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -731,7 +731,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) + "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w")) (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/imagemagick.scm b/gnu/packages/imagemagick.scm index 1ea4b5bd6a..064d1b6c40 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-87") + (version "6.9.10-95") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "09m0nx7y6j5cq13r583kp3lbsc357cc3q0kcvzbya54r5lx20a5p")))) + "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") diff --git a/gnu/packages/libffcall.scm b/gnu/packages/libffcall.scm index 3a231f30a0..0b27f88cfc 100644 --- a/gnu/packages/libffcall.scm +++ b/gnu/packages/libffcall.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,7 @@ (define-public libffcall (package (name "libffcall") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) @@ -35,9 +36,11 @@ "mirror://gnu/libffcall/libffcall-" version ".tar.gz")) (sha256 (base32 - "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0")))) + "0ixp7kbr7y8s34nsrsdfh77ig5c2zkwr6cfg9v1gm53cggwkgypb")))) (build-system gnu-build-system) - (arguments `(#:parallel-build? #f)) + (arguments + '(#:parallel-build? #f + #:configure-flags '("--disable-static"))) (synopsis "Foreign function calls from interpreters") (description "GNU Libffcall is a collection of libraries that can be used to build diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 489cd55e6e..dff404cd31 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> -;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2019, 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> @@ -1665,7 +1665,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.2.1.2") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append @@ -1673,7 +1673,7 @@ intercept and print the system calls executed by the program.") version ".tar.bz2")) (sha256 (base32 - "0hvrx0ipzqbcx4y1cmr9bgm9niifzkrhsb1ddgzzdwbk6q72d3lm")))) + "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" @@ -1689,14 +1689,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b")))) + "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -1743,14 +1743,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d")))) + "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. @@ -2835,6 +2835,21 @@ to the in-kernel OOM killer.") (string-append (assoc-ref inputs "xsltproc") "/bin/xsltproc"))) #t)) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libudev.a")) + (target (string-append static "/lib/libudev.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + ;; Remove reference to the static library from the .la file + ;; such that Libtool looks for it in the usual places. + (substitute* (string-append out "/lib/libudev.la") + (("old_library=.*") + "old_library=''\n")) + #t))) (add-after 'install 'build-hwdb (lambda* (#:key outputs #:allow-other-keys) ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and @@ -2863,6 +2878,7 @@ to the in-kernel OOM killer.") ;; which contains the rules to do that. `(("util-linux" ,util-linux) ;for blkid ("kmod" ,kmod))) + (outputs '("out" "static")) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes @@ -2975,8 +2991,7 @@ mapper. Kernel components are part of Linux-libre.") (name "lvm2-static") ;; Propagate udev because libdevmapper.a depends on libudev. - (inputs (alist-delete "udev" (package-inputs lvm2))) - (propagated-inputs `(("udev" ,eudev))) + (propagated-inputs `(("udev:static" ,eudev "static"))) (arguments (substitute-keyword-arguments (package-arguments lvm2) @@ -3926,7 +3941,7 @@ Linux Device Mapper multipathing driver: (define-public libaio (package (name "libaio") - (version "0.3.111") + (version "0.3.112") (source (origin (method url-fetch) (uri (list @@ -3934,7 +3949,7 @@ Linux Device Mapper multipathing driver: name "-" version ".tar.gz"))) (sha256 (base32 - "0ajhzbqjwsmz51gwccfyw6w9k4j4gmxcl2ph30sfn2gxv0d8gkv2")))) + "14mlqdapjqq1dhpkdgy5z83mvsaz36fcxca7a4z6hinmr7r6415b")))) (build-system gnu-build-system) (arguments '(#:make-flags @@ -3976,7 +3991,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.52") + (version "5.53") (source (origin (method url-fetch) (uri (string-append @@ -3984,7 +3999,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p")))) + "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 294891734d..9112206c81 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,7 @@ (define-public nspr (package (name "nspr") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append @@ -42,13 +43,14 @@ version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch")))) + "0mjjk2b7ika3v4y99cnaqz3z1iq1a50r1psn9i3s87gr46z0khqb")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--enable-64bit" + #:configure-flags (list "--disable-static" + "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) @@ -70,7 +72,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,11 +83,17 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" - "nss-freebl-stubs.patch" - "nss-increase-test-timeout.patch")))) + "nss-increase-test-timeout.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of these libraries. + (delete-file-recursively "nss/lib/zlib") + (delete-file-recursively "nss/lib/sqlite") + #t)))) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments @@ -130,7 +138,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2020-01-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2020-02-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 7e424dd185..5849b8deb4 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -35,7 +35,7 @@ (define-public libtirpc (package (name "libtirpc") - (version "1.1.4") + (version "1.2.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/" @@ -43,7 +43,7 @@ version ".tar.bz2")) (sha256 (base32 - "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c")))) + "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static") diff --git a/gnu/packages/patches/nss-freebl-stubs.patch b/gnu/packages/patches/nss-freebl-stubs.patch deleted file mode 100644 index 3f7b47b029..0000000000 --- a/gnu/packages/patches/nss-freebl-stubs.patch +++ /dev/null @@ -1,20 +0,0 @@ -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, - diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index f8b79cf907..dbec76715d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -31,7 +31,7 @@ (define-public pciutils (package (name "pciutils") - (version "3.6.2") + (version "3.6.4") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv")))) + "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index b40940ecab..5a536141f5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -677,26 +677,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "9.1.0") + (version "9.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs")) - (modules '((guix build utils))) - (snippet - ;; Replace shebang with the bi-lingual shell/Perl trick to remove - ;; dependency on Perl. - '(begin - (substitute* "qpdf/fix-qdf" - (("#!/usr/bin/env perl") - "\ -eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' - & eval 'exec perl -wS \"$0\" $argv:q' - if 0;\n")) - #t)))) + "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,perl) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 9944c31305..75e858609f 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -243,7 +243,6 @@ using @code{Test::Class}.") ("perl-test-requires" ,perl-test-requires) ("perl-test-deep" ,perl-test-deep) ("perl-test-warnings" ,perl-test-warnings) - ("perl-test-tester" ,perl-test-tester) ("perl-test-needs" ,perl-test-needs))) (propagated-inputs `(("perl-namespace-clean" ,perl-namespace-clean) @@ -349,8 +348,7 @@ specification.") (base32 "1kdy06r0yg7zwarqglc9163vbfb0sfc4s6ld4pw5q7i9f7mghzi0")))) (build-system perl-build-system) - (inputs `(("perl-test-tester" ,perl-test-tester) - ("perl-test-nowarnings" ,perl-test-nowarnings))) + (inputs `(("perl-test-nowarnings" ,perl-test-nowarnings))) (synopsis "Flexible deep comparison for the Test::Builder framework") (description "Test::Deep compares two structures by going through each level, ensuring @@ -997,7 +995,6 @@ code.") (base32 "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3")))) (build-system perl-build-system) - (inputs `(("perl-test-tester" ,perl-test-tester))) (synopsis "Ensure no warnings are produced while testing") (description "This modules causes any warnings during testing to be captured and @@ -1045,7 +1042,6 @@ usually called epsilon. This module provides such a function for use with (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) - ("perl-test-tester" ,perl-test-tester) ("perl-sub-exporter" ,perl-sub-exporter))) (synopsis "Utilities to test STDOUT and STDERR messages") (description @@ -1239,14 +1235,14 @@ makes fork(2) safe to use in test cases.") (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302169") + (version "1.302171") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "08y7b817045w9bc1k9y01l5shl162q9fdc2g5qf7ny0gdxvh85s1")))) + "12in730hr51h42dwd3c5k7ysyp0xyk17583mfvx6zg56nb990zz2")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description @@ -1341,8 +1337,7 @@ cause a test fail unless it is exactly as @code{perltidy} would like it to be.") `(("perl-module-build" ,perl-module-build) ("perl-test-simple" ,perl-test-simple))) (propagated-inputs - `(("perl-test-tester" ,perl-test-tester) - ("perl-data-dump" ,perl-data-dump))) + `(("perl-data-dump" ,perl-data-dump))) (home-page "https://metacpan.org/release/Test-Trap") (synopsis "Trap exit codes, exceptions, output, and so on") (description "This module is primarily (but not exclusively) for use in diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 26989330d4..f1d00065f8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4683,15 +4683,15 @@ allowing data to be efficiently communicated between processes.") (define-public perl-ipc-system-simple (package (name "perl-ipc-system-simple") - (version "1.25") + (version "1.26") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-" + "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-" version ".tar.gz")) (sha256 (base32 - "0fsdb81shjj4hifyyzvj7vpkhq5jrfhlcpw2xbjfi1mqz8fsmdpi")))) + "1zb5ni8ikaq6s60amwdsq69nz8gxl484yiga6ax5nqp8v0hpy5sp")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IPC-System-Simple") (synopsis "Run commands simply, with detailed diagnostics") @@ -8587,7 +8587,7 @@ done, how much is left to do, and estimate how long it will take.") (define-public perl-term-readkey (package (name "perl-term-readkey") - (version "2.37") + (version "2.38") (source (origin (method url-fetch) @@ -8595,7 +8595,7 @@ done, how much is left to do, and estimate how long it will take.") "TermReadKey-" version ".tar.gz")) (sha256 (base32 - "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa")))) + "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/TermReadKey") (synopsis "Simple terminal control") diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index c525cf82ab..9eee75cbfb 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name> -;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com> @@ -488,7 +488,10 @@ message digests and key derivation functions.") (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (invoke "py.test" "-v" "-k" + ;; PyOpenSSL runs tests against a certificate with a fixed + ;; expiry time. To ensure successful builds in the future, + ;; set the time to roughly the release date. + (invoke "faketime" "2019-01-01" "py.test" "-v" "-k" (string-append ;; This test tries to look up certificates from ;; the compiled-in default path in OpenSSL, which @@ -503,7 +506,8 @@ message digests and key derivation functions.") (inputs `(("openssl" ,openssl))) (native-inputs - `(("python-flaky" ,python-flaky) + `(("libfaketime" ,libfaketime) + ("python-flaky" ,python-flaky) ("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/pyopenssl") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4db272ecc7..2428608a30 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -326,14 +326,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (define-public python-babel (package (name "python-babel") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "Babel" version)) (sha256 (base32 - "0a7wawx8vsg7igvz6p3x909fskhg4b2y1910xk4f4c8y22p3aqg8")))) + "0f0f2vvs1mpdpz2c0mg1mnc3sih8bizmc1h9m67kdsnqs3i2mb0s")))) (build-system python-build-system) (native-inputs `(("python-freezegun" ,python-freezegun) @@ -2474,15 +2474,29 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.10.1") + (version "2.11.1") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "04shqrs56aj04ipyqykj512rw2l0zfammvj9krawzxz7xc14yp06")))) + "0l72c11n959yzb8d3ankckb6yhjhm6x729zm7rkpk040qzxpy64k")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "PYTHONPATH" + (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")) + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (home-page "http://jinja.pocoo.org/") @@ -2659,17 +2673,23 @@ structure for Python.") (define-public python-docutils (package (name "python-docutils") - (version "0.14") + (version "0.16") (source (origin (method url-fetch) (uri (pypi-uri "docutils" version)) (sha256 (base32 - "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji")))) + "1z3qliszqca9m719q3qhdkh0ghh90g500avzdgi7pl77x5h3mpn2")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; no setup.py test command + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python" "test/alltests.py") + (format #t "test suite not run~%")) + #t))))) (home-page "http://docutils.sourceforge.net/") (synopsis "Python Documentation Utilities") (description @@ -3346,14 +3366,14 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.13") + (version "0.29.15") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "13k37lrcgagwwnzr5bzririsscb793vndj234d475x1h9ad0d7f2")))) + "0c5cjyxfvba6c0vih1fvhywp8bpz30vwvbjqdm1q1k55xzhmkn30")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -3365,24 +3385,6 @@ provides additional functionality on the produced Mallard documents.") (add-before 'check 'set-HOME ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) - - ;; FIXME: These tests started failing on armhf after the 0.28 update - ;; (commit c69d11c5930), both with an error such as this: - ;; compiling (cpp) and running dictcomp ... - ;; === C/C++ compiler error output: === - ;; ‘ - ;; dictcomp.cpp:5221: confused by earlier errors, bailing out - ;; See <https://hydra.gnu.org/build/2948724> for logs. - ,@(if (target-arm32?) - `((add-before 'check 'disable-failing-tests - (lambda _ - (let ((disabled-tests (open-file "tests/bugs.txt" "a"))) - (for-each (lambda (test) - (format disabled-tests "~a\n" test)) - '("memslice" "dictcomp")) - (close-port disabled-tests))))) - '()) - (replace 'check (lambda _ ;; Disable compiler optimizations to greatly reduce the running @@ -9153,14 +9155,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "0jqa3qfpykyn4fmkn0kh6043sfls7br8i2bsdbccazcvk9cijsd3")))) + "193mds7lv91pphnvn6c1n55rhjkgq94asdzgrsb2fiqx7rrsd119")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -11783,13 +11785,13 @@ focus on building massively scalable web applications.") (define-public python-snowballstemmer (package (name "python-snowballstemmer") - (version "1.2.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "snowballstemmer" version)) (sha256 (base32 - "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi")))) + "0ligk61idlz8kkgd5hpip5whm172riwglb6xydii7h62yhysqfyz")))) (build-system python-build-system) (arguments `(;; No tests exist @@ -11974,14 +11976,14 @@ Record Format (DWARF).") (define-public python-imagesize (package (name "python-imagesize") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "imagesize" version)) (sha256 (base32 - "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk")))) + "1cd24x0vqbd6c8ym1n21qc0aj54mfb7rzdqglmwk9xxixajbbxmi")))) (build-system python-build-system) (home-page "https://github.com/shibukawa/imagesize_py") (synopsis "Gets image size of files in various formats in Python") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7aa9d0f0f9..6642ed6e77 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -351,7 +351,8 @@ developers using C++ or QML, a CSS & JavaScript like language.") (base32 "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-QTBUG-81715.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -598,24 +599,9 @@ developers using C++ or QML, a CSS & JavaScript like language.") developers using C++ or QML, a CSS & JavaScript like language.") (license (list license:lgpl2.1 license:lgpl3)))) -;; This variant fixes a problem with the CMake macros shipped by qtbase. See -;; discussion at <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00308.html>. -(define-public qtbase-patched - (let ((src (package-source qtbase))) - (hidden-package - (package - (inherit qtbase) - (source - (origin - (inherit src) - (patches - (append (search-patches "qtbase-QTBUG-81715.patch") - (origin-patches src))))))))) - ;; qt used to refer to the monolithic Qt 5.x package (define-deprecated qt qtbase) - (define-public qtsvg (package (inherit qtbase) (name "qtsvg") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5a470f59b7..e2e314aac9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2623,7 +2623,7 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.44") + (version "4.46") (source (origin (method url-fetch) @@ -2631,7 +2631,7 @@ development server with Starman.") "CGI-" version ".tar.gz")) (sha256 (base32 - "020jrygslqixrxd2nzc2l8ac39ynqzsy83nnnr3mqn6kxfvmyhqj")))) + "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) @@ -3246,15 +3246,15 @@ IO::Socket::INET, so you can perform socket operations directly on it too.") (define-public perl-http-date (package (name "perl-http-date") - (version "6.02") + (version "6.05") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-" + "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-" version ".tar.gz")) (sha256 (base32 - "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8")))) + "0awjdbz7x0jd5pna55dwxhs3k6xp3sw6b2zg3p2yndxxvya64p9n")))) (build-system perl-build-system) (license license:perl-license) (synopsis "Perl date conversion routines") @@ -3613,16 +3613,18 @@ not have DNS. We might not have a network card at all!") (define-public perl-lwp-mediatypes (package (name "perl-lwp-mediatypes") - (version "6.02") + (version "6.04") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-" + "mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-" version ".tar.gz")) (sha256 (base32 - "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q")))) + "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg")))) (build-system perl-build-system) + (native-inputs + `(("perl-test-fatal" ,perl-test-fatal))) (license license:perl-license) (synopsis "Perl module to guess the media type for a file or a URL") (description diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index dd05caa5f0..b86882e762 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -524,7 +524,7 @@ and Matrox.") (define-public mtdev (package (name "mtdev") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) @@ -533,8 +533,9 @@ and Matrox.") version ".tar.bz2")) (sha256 (base32 - "0zxs7shzgbalkvlaiibi25bd902rbmkv9n1lww6q8j3ri9qdaxv6")))) + "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) (home-page "http://bitmath.org/code/mtdev/") (synopsis "Multitouch protocol translation library") (description "Mtdev is a stand-alone library which transforms all diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f951e565ff..443165fea1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2375,7 +2375,7 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.5.9") + (version "1.8.0") (source (origin (method url-fetch) @@ -2383,10 +2383,11 @@ XC-APPGROUP, XTEST.") name "-" version ".tar.xz")) (sha256 (base32 - "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) + "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'configure 'pedantry (lambda _ ;; XXX: libevdev includes kernel headers, which causes this @@ -3837,7 +3838,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.28") + (version "2.29") (source (origin (method url-fetch) @@ -3847,15 +3848,16 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "1kmxc8hdw4qpvdlzp4ag8ygl34lqhs6sn3pcz1sl0kn61xdv5bb9")))) + "00hqc8nykvy8c09b8vab64dcd0ij3n5klxjn6rl00q7hickpah8x")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gettext-minimal) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("xkbcomp-intermediate" ,xkbcomp-intermediate))) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB configuration files") (description |