From 9761aca95cf01d225a673573f981ef324ef82479 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Apr 2018 02:11:04 +0200 Subject: gnu: unixodbc: Update to 2.3.6. * gnu/packages/databases.scm (unixodbc): Update to 2.3.6. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c2005144b4..b9ae9ee152 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1440,7 +1440,7 @@ valid SQL query.") (define-public unixodbc (package (name "unixodbc") - (version "2.3.4") + (version "2.3.6") (source (origin (method url-fetch) (uri @@ -1448,7 +1448,7 @@ valid SQL query.") "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz")) (sha256 - (base32 "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f")))) + (base32 "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8")))) (build-system gnu-build-system) (synopsis "Data source abstraction library") (description "Unixodbc is a library providing an API with which to access -- cgit v1.2.3 From e9a9298b9e43866f2d2421ab6699794ead040853 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Jul 2018 11:20:26 +0200 Subject: gnu: qpdf: Update to 8.1.0. * gnu/packages/pdf.scm (qpdf): Update to 8.1.0. [inputs]: Move ZLIB ... [propagated-inputs]: ... here. Add LIBJPEG-TURBO. Remove PCRE. [license]: Add ASL2.0. --- gnu/packages/pdf.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 66fbb20038..de680f4990 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -678,14 +678,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "6.0.0") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9")) + "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove @@ -717,9 +717,9 @@ eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' `(("pkg-config" ,pkg-config) ("perl" ,perl))) (propagated-inputs - `(("pcre" ,pcre))) - (inputs - `(("zlib" ,zlib))) + ;; In Requires.private of libqpdf.pc. + `(("libjpeg-turbo" ,libjpeg-turbo) + ("zlib" ,zlib))) (synopsis "Command-line tools and library for transforming PDF files") (description "QPDF is a command-line program that does structural, content-preserving @@ -727,7 +727,9 @@ transformations on PDF files. It could have been called something like pdf-to-pdf. It includes support for merging and splitting PDFs and to manipulate the list of pages in a PDF file. It is not a PDF viewer or a program capable of converting PDF into other formats.") - (license license:clarified-artistic) + ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0. + ;; Users can still choose to use the old license at their option. + (license (list license:asl2.0 license:clarified-artistic)) (home-page "http://qpdf.sourceforge.net/"))) (define-public xournal -- cgit v1.2.3 From c148559f3026157db79ddd34ddc5a08b98497850 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 00:58:51 +0200 Subject: gnu: libxinerama: Update to 1.1.4. * gnu/packages/xorg.scm (libxinerama): Update to 1.1.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8b316af211..abc733601a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4584,7 +4584,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxinerama (package (name "libxinerama") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -4594,7 +4594,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs")))) + "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 573b0733010da9fc63f37399f7ca0dcf25955af6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 01:01:11 +0200 Subject: gnu: libevdev: Update to 1.5.9. * gnu/packages/xorg.scm (libevdev): Update to 1.5.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index abc733601a..c0d22f05ae 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2387,7 +2387,7 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.5.6") + (version "1.5.9") (source (origin (method url-fetch) @@ -2395,7 +2395,7 @@ XC-APPGROUP, XTEST.") name "-" version ".tar.xz")) (sha256 (base32 - "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c")))) + "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) (native-inputs `(("python" ,python))) (home-page "https://www.freedesktop.org/wiki/Software/libevdev/") -- cgit v1.2.3 From e90f1d5fa2ca206d0c900c9079c28db270f2e8d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 01:05:56 +0200 Subject: gnu: pciutils: Update to 3.6.1. * gnu/packages/pciutils.scm (pciutils): Update to 3.6.1. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d972761586..d5369f3b6d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -31,7 +31,7 @@ (define-public pciutils (package (name "pciutils") - (version "3.5.6") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "08dvsk1b5m1r7qqzsm849h4glq67mngf8zw7bg0102ff1jwywipk")))) + "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 19bb999a50e5f9de8036bef4f3cba7144e978aaa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 12:31:49 +0200 Subject: gnu: openblas: Update to 0.3.1. * gnu/packages/patches/openblas-fix-tests-i686.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/maths.scm (openblas): Update to 0.3.1. [arguments, native-inputs]: Don't apply 'openblas-fix-tests-i686.patch'. --- gnu/local.mk | 1 - gnu/packages/maths.scm | 19 ++---------- gnu/packages/patches/openblas-fix-tests-i686.patch | 35 ---------------------- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/openblas-fix-tests-i686.patch diff --git a/gnu/local.mk b/gnu/local.mk index cde94f4cf8..229d869c8f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -980,7 +980,6 @@ dist_patch_DATA = \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openblas-fix-tests-i686.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1e0e1998db..0191c1ce1c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2798,7 +2798,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -2807,7 +2807,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14a9vyvp2k5zpd0axbnqk0d3khc1v3cck10nb5fj7d2sgn8490ky")))) + "1ly170gcdy0rgppfw1xn5yhjfzfqkka1gpggvvbls7138qbj7y9r")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -2846,16 +2846,6 @@ parts of it.") #:phases (modify-phases %standard-phases (delete 'configure) - ;; Conditionally apply a patch on i686 to avoid rebuilding - ;; all architectures. FIXME: This should be moved to the - ;; (source (patches ...)) field in the next rebuild cycle. - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - `((add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (invoke "patch" "-p1" - "--input" (assoc-ref inputs "i686-fix-tests.patch"))))) - '()) (add-before 'build 'set-extralib (lambda* (#:key inputs #:allow-other-keys) ;; Get libgfortran found when building in utest. @@ -2867,11 +2857,6 @@ parts of it.") `(("fortran-lib" ,gfortran "lib"))) (native-inputs `(("cunit" ,cunit) - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - `(("i686-fix-tests.patch" - ,(search-patch "openblas-fix-tests-i686.patch"))) - '()) ("fortran" ,gfortran) ("perl" ,perl))) (home-page "http://www.openblas.net/") diff --git a/gnu/packages/patches/openblas-fix-tests-i686.patch b/gnu/packages/patches/openblas-fix-tests-i686.patch deleted file mode 100644 index 3325546ea3..0000000000 --- a/gnu/packages/patches/openblas-fix-tests-i686.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix a test failure on some i686 systems: - -https://github.com/xianyi/OpenBLAS/issues/1575 - -This patch is a squashed version of these commits: - -https://github.com/xianyi/OpenBLAS/pull/1583 - -diff --git a/kernel/x86/KERNEL.NEHALEM b/kernel/x86/KERNEL.NEHALEM -index 835520ef..65b03ae5 100644 ---- a/kernel/x86/KERNEL.NEHALEM -+++ b/kernel/x86/KERNEL.NEHALEM -@@ -1,3 +1 @@ - include $(KERNELDIR)/KERNEL.PENRYN --SSWAPKERNEL = ../arm/swap.c --DSWAPKERNEL = ../arm/swap.c -diff --git a/kernel/x86/swap.S b/kernel/x86/swap.S -index 54b00b33..e30c2789 100644 ---- a/kernel/x86/swap.S -+++ b/kernel/x86/swap.S -@@ -138,6 +138,14 @@ - /* INCX != 1 or INCY != 1 */ - - .L14: -+ cmpl $0, %ebx -+ jne .L141 -+ cmpl $0, %ecx -+ jne .L141 -+/* INCX == 0 and INCY == 0 */ -+ jmp .L27 -+ -+.L141: - movl %edx, %eax - sarl $2, %eax - jle .L28 -- cgit v1.2.3 From bf77a2c87af3b18fc14eaa8db676e64d791c28f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 12:53:31 +0200 Subject: gnu: pulseaudio: Update to 12.0. * gnu/packages/patches/pulseaudio-glibc-2.27.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/pulseaudio.scm (pulseaudio): Update to 12.0. [source](patches): Remove 'pulseaudio-glibc-2.27.patch'. [arguments]: Remove related 'bootstrap' phase. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. Add GLIB:BIN. --- gnu/local.mk | 1 - gnu/packages/patches/pulseaudio-glibc-2.27.patch | 67 ------------------------ gnu/packages/pulseaudio.scm | 18 ++----- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 gnu/packages/patches/pulseaudio-glibc-2.27.patch diff --git a/gnu/local.mk b/gnu/local.mk index 229d869c8f..571df533fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1043,7 +1043,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ - %D%/packages/patches/pulseaudio-glibc-2.27.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pybugz-encode-error.patch \ %D%/packages/patches/pybugz-stty.patch \ diff --git a/gnu/packages/patches/pulseaudio-glibc-2.27.patch b/gnu/packages/patches/pulseaudio-glibc-2.27.patch deleted file mode 100644 index 79d86abeee..0000000000 --- a/gnu/packages/patches/pulseaudio-glibc-2.27.patch +++ /dev/null @@ -1,67 +0,0 @@ -Copied from: -https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb - - -From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen -Date: Wed, 24 Jan 2018 03:51:49 +0200 -Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already - defined - -glibc 2.27 is to be released soon, and it will provide memfd_create(). -If glibc provides the function, we must not define it ourselves, -otherwise building fails due to conflict between the two implementations -of the same function. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 ---- - configure.ac | 3 +++ - src/pulsecore/memfd-wrappers.h | 7 ++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0084c86e..0eb44b08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -610,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], - [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. - *** Use linux v3.17 or higher for such a feature.])]) - -+AS_IF([test "x$HAVE_MEMFD" = "x1"], -+ AC_CHECK_FUNCS([memfd_create])) -+ - AC_SUBST(HAVE_MEMFD) - AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) - AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) -diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h -index 3bed9b2b..c7aadfd3 100644 ---- a/src/pulsecore/memfd-wrappers.h -+++ b/src/pulsecore/memfd-wrappers.h -@@ -20,13 +20,14 @@ - License along with PulseAudio; if not, see . - ***/ - --#ifdef HAVE_MEMFD -+#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) - - #include - #include - - /* -- * No glibc wrappers exist for memfd_create(2), so provide our own. -+ * Before glibc version 2.27 there was no wrapper for memfd_create(2), -+ * so we have to provide our own. - * - * Also define memfd fcntl sealing macros. While they are already - * defined in the kernel header file , that file as -@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { - #define F_SEAL_WRITE 0x0008 /* prevent writes */ - #endif - --#endif /* HAVE_MEMFD */ -+#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ - - #endif --- -2.16.2 - diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index bac92eafa9..45bc1ee54a 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -122,7 +122,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "11.1") + (version "12.0") (source (origin (method url-fetch) (uri (string-append @@ -130,7 +130,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj")) + "0i248rmwwlfx1r22aiy1wf5lmhixlznyasgqdb5w04gxr6yjshkf")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -141,7 +141,6 @@ rates.") (string-append "#" all "\n"))) #t)) (patches (search-patches - "pulseaudio-glibc-2.27.patch" "pulseaudio-fix-mult-test.patch" "pulseaudio-longer-test-timeout.patch")))) (build-system gnu-build-system) @@ -153,13 +152,6 @@ rates.") (assoc-ref %outputs "out") "/lib/udev/rules.d")) #:phases (modify-phases %standard-phases - (replace 'bootstrap - ;; TODO: Remove this custom bootstrap phase when - ;; pulseaudio-glibc-2.27.patch is removed. - (lambda _ - (patch-shebang "git-version-gen") - (setenv "NOCONFIGURE" "1") - (invoke "bash" "bootstrap.sh"))) (add-before 'check 'pre-check (lambda _ ;; 'tests/lock-autospawn-test.c' wants to create a file @@ -188,11 +180,7 @@ rates.") ("check" ,check))) (native-inputs `(("pkg-config" ,pkg-config) - ;; TODO: Remove "autoconf", "automake", and "libtool" from - ;; native-inputs when pulseaudio-glibc-2.27.patch is removed. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + ("glib:bin" ,glib "bin"))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. `(("libcap" ,libcap) -- cgit v1.2.3 From 486cddcd8bbe07f716f304e9c5f936c67903b23b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 13:10:47 +0200 Subject: gnu: libva: Update to 2.2.0. * gnu/packages/video.scm (libva): Update to 2.2.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 737844d8fa..21b676e7b5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -556,7 +556,7 @@ libebml is a C++ library to read and write EBML files.") (define-public libva (package (name "libva") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -568,7 +568,7 @@ libebml is a C++ library to read and write EBML files.") (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "03sb1b3fxw8myf9kz6rxw5f3v1p0vfmk34779qx0q8fk24x9bypk")))) + (base32 "1wjfrs261fp9wkhgpmrlz5smnhxrmsk31way646x6i2mg16a0v3g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 90e2535883e76f1676ae1fb7fa676d986da24ec9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jul 2018 22:16:17 +0300 Subject: gnu: mesa: Update to 18.1.4. * gnu/packages/gl.scm (mesa): Update to 18.1.4. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bde6e55607..002c30e9aa 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.2") + (version "18.1.4") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7")) + "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From f579af3d3ec7454b4499c09513a6ec577e618cac Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 15 Jul 2018 09:52:46 +0200 Subject: gnu: wayland-protocols: Update to 1.15. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.15. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b42a27b8c8..7851171188 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -474,7 +474,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (string-append @@ -482,7 +482,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n")))) + "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit v1.2.3 From d5e60a2a9322d336affe1f07e483b4175ee82cd8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 24 Jun 2018 12:13:56 +0100 Subject: gnu: pulseaudio: Add jack input. Depending on jack allows building the jack-sink and jack-source modules for routing the audio through the jack server. * gnu/packages/pulseaudio.scm (pulseaudio)[inputs]: Add jack-1. Signed-off-by: Marius Bakke --- gnu/packages/pulseaudio.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 45bc1ee54a..428d0467a3 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages check) @@ -169,6 +171,7 @@ rates.") ("speex" ,speex) ("libsndfile" ,libsndfile) ("libsamplerate" ,libsamplerate) + ("jack" ,jack-1) ; For routing the output to jack. ("dbus" ,dbus) ("glib" ,glib) ("intltool" ,intltool) -- cgit v1.2.3 From 7136f3e64f3b41b4ee8b54f79402da3edbcfc1ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Jul 2018 14:38:00 +0200 Subject: gnu: pulseaudio: Adjust inputs. * gnu/packages/pulseaudio.scm (pulseaudio)[inputs]: Remove obsolete LIBSAMPLERATE. Replace SPEEX with SPEEXDSP. Move CHECK, INTLTOOL and M4 ... [native-inputs]: ... here. --- gnu/packages/pulseaudio.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 428d0467a3..f7196d624e 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -168,22 +168,21 @@ rates.") `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) - ("speex" ,speex) + ("speexdsp" ,speexdsp) ("libsndfile" ,libsndfile) - ("libsamplerate" ,libsamplerate) ("jack" ,jack-1) ; For routing the output to jack. ("dbus" ,dbus) ("glib" ,glib) - ("intltool" ,intltool) - ("m4" ,m4) ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) - ("eudev" ,eudev) ;for the detection of hardware audio devices - ("check" ,check))) + ("eudev" ,eudev))) ;for the detection of hardware audio devices (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin"))) + `(("check" ,check) + ("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("m4" ,m4) + ("pkg-config" ,pkg-config))) (propagated-inputs ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. `(("libcap" ,libcap) -- cgit v1.2.3 From eeda24e199cb211c8d727c57b62f434c17381a2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Jul 2018 14:41:06 +0200 Subject: gnu: pulseaudio: Update to 12.2. * gnu/packages/pulseaudio.scm (pulseaudio): Update to 12.2. --- gnu/packages/pulseaudio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index f7196d624e..35d499522b 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -124,7 +124,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "12.0") + (version "12.2") (source (origin (method url-fetch) (uri (string-append @@ -132,7 +132,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "0i248rmwwlfx1r22aiy1wf5lmhixlznyasgqdb5w04gxr6yjshkf")) + "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated -- cgit v1.2.3 From 8e2c0ce4ee72466dc498ebbcf129684dfb11fdd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Jul 2018 15:00:11 +0200 Subject: gnu: jack: Don't install to "lib64" on 64-bit platforms. * gnu/packages/audio.scm (jack-1)[arguments]: New field. --- gnu/packages/audio.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 98f66aae88..e859ba0b99 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1393,6 +1393,14 @@ especially for creating reverb effects. It supports impulse responses with 1, (base32 "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-configure + (lambda _ + (substitute* "configure" + ;; Install to regardless of platform. + (("libnn=lib64") "libnn=lib")) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("readline" ,readline))) -- cgit v1.2.3 From 79d4d47b99591e4edd8cefee907fbb0d930f78aa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 19 Jul 2018 19:11:46 +0200 Subject: guix: ant-build-system: Reorder before generating INDEX.LIST. * guix/build/ant-build-system.scm (%standard-phases): Add reorder-jar-content phase. --- guix/build/ant-build-system.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79b4d503b..d79a2d55ed 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -173,7 +173,7 @@ to the default GNU unpack strategy." (define* (generate-jar-indices #:key outputs #:allow-other-keys) "Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps -and is preferred over \"META-INF/MAINFEST.MF\", which does use word wraps, +and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps, by Java when resolving dependencies. So we make sure to create it so that grafting works - and so that the garbage collector doesn't collect dependencies of this jar file." @@ -245,7 +245,9 @@ repack them. This is necessary to ensure that archives are reproducible." (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'install 'generate-jar-indices generate-jar-indices) + (add-after 'install 'reorder-jar-content + strip-jar-timestamps) + (add-after 'reorder-jar-content 'generate-jar-indices generate-jar-indices) (add-after 'generate-jar-indices 'strip-jar-timestamps strip-jar-timestamps))) -- cgit v1.2.3 From c69d11c593036b4c188824f6b595bfe88bc46aca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jun 2018 16:03:43 -0400 Subject: gnu: Cython: Update to 0.28.4. * gnu/packages/python.scm (python-cython, python2-cython): Update to 0.28.4. [arguments]: Use invoke. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 642d7529b6..a984670f6e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2850,14 +2850,14 @@ and is very extensible.") (define-public python-cython (package (name "python-cython") - (version "0.27") + (version "0.28.4") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "02y0pp1nx77b8s1mpxc6da2dccl6wd31pp4ksi9via479qcvacmr")))) + "0imw9s2rbrh32clbl10csnwmig9p3nzkrd2baxxxfmnrsc42pb3n")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -2870,7 +2870,7 @@ and is very extensible.") ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check - (lambda _ (zero? (system* "python" "runtests.py" "-vv"))))))) + (lambda _ (invoke "python" "runtests.py" "-vv")))))) (home-page "http://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From 5a3bf25526170496f7affb925adaff9ed3972e40 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 19 Jul 2018 14:08:58 -0400 Subject: gnu: borg: Update the list of Cython-generated files to delete. Reported by: Efraim Flashner * gnu/packages/backup.scm (borg)[source]: Update the snippet. --- gnu/packages/backup.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 9884f58fc3..74ee67c70c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -485,8 +485,21 @@ detection, and lossless compression.") (modules '((guix build utils))) (snippet '(begin + ;; Delete files generated by Cython. We used to have a regex + ;; that created the list of generated files but Borg has + ;; added new non-generated C files that cause the regex to + ;; generate the wrong list. (for-each delete-file - (find-files "borg" "^(c|h|p).*\\.c$")) + '("src/borg/algorithms/checksums.c" + "src/borg/chunker.c" + "src/borg/compress.c" + "src/borg/crypto/low_level.c" + "src/borg/hashindex.c" + "src/borg/item.c" + "src/borg/platform/darwin.c" + "src/borg/platform/freebsd.c" + "src/borg/platform/linux.c" + "src/borg/platform/posix.c")) ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively -- cgit v1.2.3 From b74348077b53209be617090b216bffe38236b0e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 14:32:53 +0200 Subject: gnu: libpsl: Update to 0.20.2. * gnu/packages/web.scm (libpsl): Update to 0.20.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3d83a2185e..1b08863908 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -798,7 +798,7 @@ for efficient socket-like bidirectional reliable communication channels.") (define-public libpsl (package (name "libpsl") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/rockdaboot/libpsl/" @@ -806,7 +806,7 @@ for efficient socket-like bidirectional reliable communication channels.") "/libpsl-" version ".tar.gz")) (sha256 (base32 - "17r18y25ka2ck2ykfidbg4a7jpyzmkqwrzplgqjp7mwd2l9rc6cm")))) + "03sn3fbcrmgl9x2f1gc6rbrdlbrnwbhrnkgi733gqb95cvmhmzgq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 19c269d3d4602b8f41cfae153cd1a219c40f7f55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 14:38:10 +0200 Subject: gnu: libgsf: Update to 1.14.43. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 04259e8f89..55edb3fb69 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1175,7 +1175,7 @@ XML/CSS rendering engine.") (define-public libgsf (package (name "libgsf") - (version "1.14.42") + (version "1.14.43") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1183,7 +1183,7 @@ XML/CSS rendering engine.") name "-" version ".tar.xz")) (sha256 (base32 - "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9")))) + "05pf3h0dha3s20ddsrljbx7m94qyiqs5igwxx1ql0vlsdlylx50j")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From b343850ea3071295b6848db48133406c7d49c48c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 15:14:12 +0200 Subject: gnu: double-conversion: Update home page. * gnu/packages/maths.scm (double-conversion)[home-page]: Update to redirected. --- gnu/packages/maths.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0191c1ce1c..24ac23f79b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -246,11 +246,10 @@ enough to be used effectively as a scientific calculator.") (package (name "double-conversion") (version "1.1.5") + (home-page "https://github.com/google/double-conversion") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/floitsch/double-conversion/archive/v" - version ".tar.gz")) + (uri (string-append home-page "/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 @@ -260,7 +259,6 @@ enough to be used effectively as a scientific calculator.") '(#:test-target "test" #:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DBUILD_TESTING=ON"))) - (home-page "https://github.com/floitsch/double-conversion") (synopsis "Conversion routines for IEEE doubles") (description "The double-conversion library provides binary-decimal and decimal-binary -- cgit v1.2.3 From 57ba8d0673e8c79a6dbf7b24ca4579e6f2be59f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 15:37:49 +0200 Subject: gnu: double-conversion: Update to 3.0.0. * gnu/packages/maths.scm (double-conversion): Update to 3.0.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 24ac23f79b..0ffd82c377 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -245,7 +245,7 @@ enough to be used effectively as a scientific calculator.") (define-public double-conversion (package (name "double-conversion") - (version "1.1.5") + (version "3.0.0") (home-page "https://github.com/google/double-conversion") (source (origin (method url-fetch) @@ -253,7 +253,7 @@ enough to be used effectively as a scientific calculator.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cnr8xhyjfxijay8ymkqcph3672wp2lj23qhdmr3m4kia5kpdf83")))) + "059r1czs28ljjd388pn6l3njg1ghbf1cv3q9nkxv3dj2a8siabqm")))) (build-system cmake-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 81cd8bf87096b48f50e5ab0b86396bd0ea96bce2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 17:31:35 +0200 Subject: gnu: gstreamer: Update to 1.14.2. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.14.2. --- gnu/packages/gstreamer.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 951ca93fbf..085d2df7b9 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -102,7 +102,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0v0qqfj6klkirhbcxwgw1sq6x67456ckjadlhnzsji0m4q6jpn18")))) + "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -150,7 +150,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -158,7 +158,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "1d8d1gfd4jnymyhb0f1pxdhapsx4v1nilk03bndmv0id131wf9hh")))) + "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -205,7 +205,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -214,7 +214,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0wlim4kapb2vc11fcjdlx31zn5ja3xw3kq1jflvk4sknvcnhdv1l")))) + "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -264,14 +264,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "06nn43f65mr872apljfiq8jnmwa8r7z26n1frprgvaijh28ccxra")))) + "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -340,7 +340,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) @@ -348,7 +348,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1lz1kx9h5mlp9ahmgavv99nkg6j0rrjks2ws820yym1zn45l7wng")))) + "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -378,7 +378,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append @@ -386,7 +386,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1782crqgl1bqlkr67s0qmb3ihcjdjpljd6kynqs9zyzjs810my7g")))) + "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") @@ -416,7 +416,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append @@ -424,7 +424,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "1ls7j5iy7irinf7d7nm6r4qw3d1ddpr8fm4k5n6zfhz3am4p1ihv")))) + "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. -- cgit v1.2.3 From 4b7e861b59f2088b15e5fa8ed520ecbc933f590d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 18:22:14 +0200 Subject: gnu: gst-libav: Delete bundled ffmpeg. * gnu/packages/gstreamer.scm (gst-libav)[source](modules, snippet): New fields. [arguments]: Remove #:phases. --- gnu/packages/gstreamer.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 085d2df7b9..63d18fce5c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -386,18 +386,16 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")))) + "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled ffmpeg. + (delete-file-recursively "gst-libs/ext/libav") + #t)))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--with-system-libav") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/sh - (lambda _ - (substitute* "gst-libs/ext/libav/configure" - (("#! /bin/sh") - (string-append "#! "(which "sh")))) - #t))))) + '(#:configure-flags '("--with-system-libav"))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 33aa65e0eee0e42b0610aab1f6a1086e51eb9fe1 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sun, 15 Jul 2018 22:07:26 +0200 Subject: gnu: icedtea: Make icedtea-8 the default jdk. * gnu/packages/java.scm (icedtea): Point to icedtea-8. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8d4a29267a..8e0a0bfbf8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1672,7 +1672,7 @@ new Date();")) '("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop" "jdk-drop" "langtools-drop" "hotspot-drop"))))))) -(define-public icedtea icedtea-7) +(define-public icedtea icedtea-8) (define-public ant/java8 -- cgit v1.2.3 From 9d2160171c32f9f2c5a95618d58e0d7627b6d0a2 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Wed, 18 Jul 2018 07:53:20 +0200 Subject: gnu: java-asm: Add missing propagated-input. * gnu/packages/java.scm (java-asm)[propagated-inputs]: Add java-aqute-libg. --- gnu/packages/java.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8e0a0bfbf8..f73eaeacb6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3643,7 +3643,8 @@ on the XPP3 API (XML Pull Parser)."))) "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00")))) (build-system ant-build-system) (propagated-inputs - `(("java-aqute-bndlib" ,java-aqute-bndlib))) + `(("java-aqute-bndlib" ,java-aqute-bndlib) + ("java-aqute-libg" ,java-aqute-libg))) (arguments `(#:build-target "compile" ;; The tests require an old version of Janino, which no longer compiles -- cgit v1.2.3 From 4c27ea06d4f294613b267bdbec7c2896608c4189 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jul 2018 14:34:27 +0200 Subject: gnu: mariadb: Install pkg-config file to a standard location. * gnu/packages/databases.scm (mariadb)[#:configure-flags]: Set INSTALL_SHAREDIR to "share". --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b9ae9ee152..0e30815d40 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -662,7 +662,7 @@ Language.") "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" "-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql") + "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases (add-before -- cgit v1.2.3 From 5b4d2e40f1b2097c1f1ea6d1a0e701a1908011d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Jul 2018 00:50:20 +0200 Subject: gnu: mariadb: Disable plugin that fails on armhf. * gnu/packages/databases.scm (mariadb)[arguments]: Add 'disable-plugins' phase. --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0e30815d40..61b4268e9d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,19 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-before 'configure 'disable-plugins + (lambda _ + (let ((disable-plugin (lambda (name) + (call-with-output-file + (string-append "plugin/" name + "/CMakeLists.txt") + (lambda (port) + (format port "\n"))))) + (disabled-plugins '(;; FIXME: On armhf-linux, this plugin + ;; triggers a GCC ICE. Disable for now. + "semisync"))) + (for-each disable-plugin disabled-plugins) + #t))) (add-before 'configure 'pre-configure (lambda _ -- cgit v1.2.3 From 3869f39e6d36cc66907ac0f6f2cf9463c5adff6f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 00:49:08 +0200 Subject: gnu: mariadb: Run the full test suite. * gnu/packages/databases.scm (mariadb)[arguments]: Override 'check' phase. Add phase 'adjust-tests'. Disable one more plugin. [properties]: New field. --- gnu/packages/databases.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 61b4268e9d..115ebe37f8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,29 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-tests + (lambda _ + (let ((disabled-tests + '(;; These fail because root@hostname == root@localhost in + ;; the build environment, causing a user count mismatch. + ;; See . + "main.join_cache" + "main.explain_non_select" + "roles.acl_statistics")) + + ;; This file contains a list of known-flaky tests for this + ;; release. Append our own items. + (unstable-tests (open-file "mysql-test/unstable-tests" "a"))) + (for-each (lambda (test) + (format unstable-tests "~a : ~a\n" + test "Disabled in Guix")) + disabled-tests) + (close-port unstable-tests) + + (substitute* "mysql-test/mysql-test-run.pl" + (("/bin/ls") (which "ls")) + (("/bin/sh") (which "sh"))) + #t))) (add-before 'configure 'disable-plugins (lambda _ (let ((disable-plugin (lambda (name) @@ -675,7 +698,9 @@ Language.") (format port "\n"))))) (disabled-plugins '(;; FIXME: On armhf-linux, this plugin ;; triggers a GCC ICE. Disable for now. - "semisync"))) + "semisync" + ;; XXX: Causes a test failure. + "disks"))) (for-each disable-plugin disabled-plugins) #t))) (add-before @@ -683,6 +708,15 @@ Language.") (lambda _ (setenv "CONFIG_SHELL" (which "sh")) #t)) + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (with-directory-excursion "mysql-test" + (invoke "./mtr" "--verbose" + "--parallel" (number->string (parallel-job-count)) + "--skip-test-list=unstable-tests")) + (format #t "test suite not run~%")) + #t)) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) @@ -708,6 +742,9 @@ Language.") ("openssl" ,openssl) ("pcre" ,pcre) ("zlib" ,zlib))) + ;; The test suite is very resource intensive and can take more than three + ;; hours on a x86_64 system. Give slow and busy machines some leeway. + (properties '((timeout . 64800))) ;18 hours (home-page "https://mariadb.org/") (synopsis "SQL database server") (description -- cgit v1.2.3 From 03aed90b86549e7f9197ea11c360c5efd08327bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:12:22 +0200 Subject: gnu: mariadb: Update to 10.1.34. * gnu/packages/databases.scm (mariadb): Update to 10.1.34. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 115ebe37f8..78e514ae7f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.33") + (version "10.1.34") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0bax748j4srsyhw5cs5jvwigndh0zwmf4r2cjvhja31ckx8jqccl")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 2001d2dac45f658acc7abf367dafda49012e2b79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:31:42 +0200 Subject: gnu: mariadb: Remove some bundled libraries. * gnu/packages/databases.scm (mariadb)[source](snippet, modules): New fields. [arguments]: Add explicit #:configure-flags for system libraries. Add 'unbundle' phase. Remove 'pre-configure' phase. [inputs]: Add SNAPPY and XZ. --- gnu/packages/databases.scm | 48 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 78e514ae7f..752b400866 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -635,7 +635,20 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled snappy and xz. + (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + + ;; Preserve CMakeLists.txt for these. + (for-each (lambda (file) + (unless (string-suffix? "CMakeLists.txt" file) + (delete-file file))) + (append (find-files "extra/yassl") + (find-files "pcre") (find-files "zlib"))) + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -649,6 +662,12 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Ensure the system libraries are used. + "-DWITH_JEMALLOC=yes" + "-DWITH_PCRE=system" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DDEFAULT_CHARSET=utf8" "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -665,6 +684,26 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle + (lambda _ + ;; The bundled PCRE in MariaDB has a patch that was upstreamed + ;; in version 8.34. Unfortunately the upstream patch behaves + ;; slightly differently and the build system fails to detect it. + ;; See . + ;; XXX: Consider patching PCRE instead. + (substitute* "cmake/pcre.cmake" + ((" OR NOT PCRE_STACK_SIZE_OK") "")) + + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Remove dependency on these CMake targets. + ((" build_lzma build_snappy") "")) + + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. We don't need that. + (("^include\\(TokuThirdParty\\)") "")) + + #t)) (add-after 'unpack 'adjust-tests (lambda _ (let ((disabled-tests @@ -703,11 +742,6 @@ Language.") "disks"))) (for-each disable-plugin disabled-plugins) #t))) - (add-before - 'configure 'pre-configure - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) (if tests? @@ -741,6 +775,8 @@ Language.") ("ncurses" ,ncurses) ("openssl" ,openssl) ("pcre" ,pcre) + ("snappy" ,snappy) + ("xz" ,xz) ("zlib" ,zlib))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. -- cgit v1.2.3 From 963157f1cc421dba0623964dcdfd124e1cc64540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Jul 2018 02:50:58 +0200 Subject: gnu: mariadb: Delete test files and static libraries. * gnu/packages/databases.scm (mariadb)[arguments]: Adapt 'post-install' phase to purge static archives and test executables. --- gnu/packages/databases.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 752b400866..c285d2f53b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -763,7 +763,11 @@ Language.") (with-directory-excursion out (for-each delete-file-recursively '("data" "mysql-test" "sql-bench" - "share/man/man1/mysql-test-run.pl.1"))) + "share/man/man1/mysql-test-run.pl.1")) + ;; Delete huge mysqltest executables. + (for-each delete-file (find-files "bin" "test")) + ;; And static libraries. + (for-each delete-file (find-files "lib" "\\.a$"))) #t)))))) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 94eb59fb4ac3dfa501e9cac42454c030506ab7f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jul 2018 23:44:26 +0200 Subject: build-system/meson: Remove RUNPATH workarounds. * guix/build-system/meson.scm (default-patchelf): Remove. (lower)[build-inputs]: Remove PATCHELF. (meson-build): Don't delete 'fix-runpath' phase on armhf. * guix/build/meson-build-system.scm (configure): Add "--c_link_args" and "-cpp_link_args" instead of setting LDFLAGS. (meson-build): Don't apply 'fix-runpath' phase. --- guix/build-system/meson.scm | 20 +------------------- guix/build/meson-build-system.scm | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index e894e1472d..fddf899092 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -58,12 +58,6 @@ (let ((module (resolve-interface '(gnu packages build-tools)))) (module-ref module 'meson-for-build))) -(define (default-patchelf) - "Return the default patchelf package." - ;; Lazily resolve the binding to avoid a circular dependency. - (let ((module (resolve-interface '(gnu packages elf)))) - (module-ref module 'patchelf))) - (define* (lower name #:key source inputs native-inputs outputs system target (meson (default-meson)) @@ -81,15 +75,6 @@ (system system) (build-inputs `(("meson" ,meson) ("ninja" ,ninja) - ;; XXX PatchELF fails to build on armhf, so we skip - ;; the 'fix-runpath' phase there for now. It is used - ;; to avoid superfluous entries in RUNPATH as described - ;; in , so armhf may now - ;; have different runtime dependencies from other arches. - ,@(if (not (string-prefix? "arm" (or (%current-target-system) - (%current-system)))) - `(("patchelf" ,(default-patchelf))) - '()) ,@native-inputs)) (host-inputs `(,@(if source `(("source" ,source)) @@ -147,10 +132,7 @@ has a 'meson.build' file." #:inputs %build-inputs #:search-paths ',(map search-path-specification->sexp search-paths) - #:phases - (if (string-prefix? "arm" ,system) - (modify-phases build-phases (delete 'fix-runpath)) - build-phases) + #:phases build-phases #:configure-flags ,configure-flags #:build-type ,build-type #:tests? ,tests? diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e4aae8212f..80e54723c5 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,18 +45,13 @@ (prefix (assoc-ref outputs "out")) (args `(,(string-append "--prefix=" prefix) ,(string-append "--buildtype=" build-type) + ,(string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref outputs "out") "/lib") + ,(string-append "-Dcpp_link_args=-Wl,-rpath=" + (assoc-ref outputs "out") "/lib") ,@configure-flags ,source-dir))) - ;; Meson lacks good facilities for dealing with RUNPATH, so we - ;; add the output "lib" directory here to avoid doing that in - ;; many users. Related issues: - ;; * - ;; * - ;; * - (unless (getenv "LDFLAGS") - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))) - (mkdir build-dir) (chdir build-dir) (apply invoke "meson" args))) @@ -148,8 +144,13 @@ for example libraries only needed for the tests." (replace 'configure configure) (replace 'build build) (replace 'check check) - (replace 'install install) - (add-after 'strip 'fix-runpath fix-runpath))) + ;; XXX: We used to have 'fix-runpath' here, but it appears no longer + ;; necessary with newer Meson. However on 'core-updates' there is a + ;; useful 'strip-runpath' procedure to ensure no bogus directories in + ;; RUNPATH (remember that we tell Meson to not touch RUNPATH in + ;; (@ (gnu packages build-tools) meson-for-build)), so it should be + ;; re-added there sans the augment-rpath calls (which are not needed). + (replace 'install install))) (define* (meson-build #:key inputs phases #:allow-other-keys #:rest args) -- cgit v1.2.3 From cb8f7d6d2f87282bb0169c3136ccf3f44bc33105 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 00:17:47 +0200 Subject: gnu: meson: Update to 0.47.1. * gnu/packages/build-tools.scm (meson): Update to 0.47.1. * gnu/packages/patches/meson-for-build-rpath.patch: Adjust to file rename and indendation change. --- gnu/packages/build-tools.scm | 4 +-- gnu/packages/patches/meson-for-build-rpath.patch | 33 ++++++++++++------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index e693aec4ac..24870c82d6 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -100,7 +100,7 @@ generate such a compilation database.") (define-public meson (package (name "meson") - (version "0.46.1") + (version "0.47.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -108,7 +108,7 @@ generate such a compilation database.") version ".tar.gz")) (sha256 (base32 - "0y7f5hhy16q99l7x06x8sid9p9dbg6d7i60zs7c07cz5ww1plj8r")))) + "19mdap2ncvczajx220bd73xmwhd8x906382y18cn9c5syxwxwwyn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch index 2151d53565..59249e294d 100644 --- a/gnu/packages/patches/meson-for-build-rpath.patch +++ b/gnu/packages/patches/meson-for-build-rpath.patch @@ -4,20 +4,21 @@ meson-build-system. Patch by Peter Mikkelsen ---- meson-0.42.0/mesonbuild/scripts/meson_install.py.orig 2017-09-09 01:49:39.147374148 +0200 -+++ meson-0.42.0/mesonbuild/scripts/meson_install.py 2017-09-09 01:51:01.209134717 +0200 -@@ -391,14 +391,6 @@ - print("Symlink creation does not work on this platform. " - "Skipping all symlinking.") - printed_symlink_error = True -- if os.path.isfile(outname): -- try: -- depfixer.fix_rpath(outname, install_rpath, False) -- except SystemExit as e: -- if isinstance(e.code, int) and e.code == 0: -- pass -- else: -- raise - +--- meson-0.42.0/mesonbuild/minstall.py.orig 2017-09-09 01:49:39.147374148 +0200 ++++ meson-0.42.0/mesonbuild/minstall.py 2017-09-09 01:51:01.209134717 +0200 +@@ -436,15 +436,6 @@ + print("Symlink creation does not work on this platform. " + "Skipping all symlinking.") + printed_symlink_error = True +- if os.path.isfile(outname): +- try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) +- except SystemExit as e: +- if isinstance(e.code, int) and e.code == 0: +- pass +- else: +- raise + def run(args): - global install_log_file + parser = buildparser() -- cgit v1.2.3 From 3b6f8a45d725dd7592634a34e8ffbc14a3bd31cc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 00:28:24 +0200 Subject: gnu: libinput: Update to 1.11.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.11.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7851171188..b9cab59357 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -147,14 +147,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.11.1") + (version "1.11.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1z7i8vk0i61npkdqwsk85wp9v4yjlvylqnyydikjqnbsrjp9abk4")))) + "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From 0333582477bfd1160a640bd35d08f59feaada607 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 18:37:37 +0200 Subject: gnu: mariadb: Move GCC ICE patch to the usual location. * gnu/packages/databases.scm (mariadb)[source](patches): New field. [arguments]: Don't disable semisync plugin. [inputs]: Remove 'mariadb-gcc-ice.patch'. --- gnu/packages/databases.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cbc5ffc2c6..bd5102e027 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,6 +636,7 @@ Language.") (sha256 (base32 "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + (patches (search-patches "mariadb-gcc-ice.patch")) (modules '((guix build utils))) (snippet '(begin @@ -684,17 +685,6 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases - ;; Apply this patch that's only needed on ARM. - ,@(if (and (not (%current-target-system)) - (string=? "armhf-linux" (%current-system))) - `((add-after 'unpack 'apply-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch) - #t)))) - '()) - (add-after 'unpack 'unbundle (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed @@ -746,10 +736,7 @@ Language.") "/CMakeLists.txt") (lambda (port) (format port "\n"))))) - (disabled-plugins '(;; FIXME: On armhf-linux, this plugin - ;; triggers a GCC ICE. Disable for now. - "semisync" - ;; XXX: Causes a test failure. + (disabled-plugins '(;; XXX: Causes a test failure. "disks"))) (for-each disable-plugin disabled-plugins) #t))) @@ -782,10 +769,7 @@ Language.") #t)))))) (native-inputs `(("bison" ,bison) - ("perl" ,perl) - ,@(if (string=? "armhf-linux" (%current-system)) - `(("gcc-ice-patch" ,(search-patch "mariadb-gcc-ice.patch"))) - '()))) + ("perl" ,perl))) (inputs `(("jemalloc" ,jemalloc) ("libaio" ,libaio) -- cgit v1.2.3 From 148df6052c983598a26620b660b90de93fd6039a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 21:23:11 +0200 Subject: Revert "Revert "gnu: llvm: Update to 6.0.1."" This reverts commit bb8221d41cc7b2dc928d1c9501946d3dc6063c4b. --- gnu/packages/llvm.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 98592ad090..add7f1b40c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,7 @@ (define-public llvm (package (name "llvm") - (version "6.0.0") + (version "6.0.1") (source (origin (method url-fetch) @@ -49,7 +50,7 @@ version "/llvm-" version ".src.tar.xz")) (sha256 (base32 - "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z")))) + "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 @@ -243,11 +244,11 @@ code analysis tools.") (define-public clang-runtime (clang-runtime-from-llvm llvm - "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h")) + "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) (define-public clang (clang-from-llvm llvm clang-runtime - "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0" + "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) (define-public llvm-3.9.1 -- cgit v1.2.3 From d0ab3c33b7a5a4f8dce8ac2a528e21bfc7d85daa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 21:35:07 +0200 Subject: gnu: mesa: Update to 18.1.5. * gnu/packages/gl.scm (mesa): Update to 18.1.5. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 002c30e9aa..28e283640d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.4") + (version "18.1.5") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h")) + "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From f419abea22fe5dd3aa96c19990316e502157350b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 15:32:10 +0200 Subject: gnu: openblas: Update to 0.3.2. * gnu/packages/maths.scm (openblas): Update to 0.3.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8a4f6fb21e..68b07cad38 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2828,7 +2828,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) @@ -2837,7 +2837,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ly170gcdy0rgppfw1xn5yhjfzfqkka1gpggvvbls7138qbj7y9r")))) + "0b20km2jv7m6qiylrlvhq2vnmkmilb633mr8rhqmgbn1wqrp58jq")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 3418e43bf55033c15b997a46a56c9efd69c0624e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Aug 2018 00:51:48 +0200 Subject: gnu: mariadb: Adjust to test failures on Hydra. * gnu/packages/patches/mariadb-client-test-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/databases.scm (mariadb)[source](patches): Add it. [arguments]: Increase retry count and test timeout. Disable test main.myisampack. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 19 +++++++++-- .../patches/mariadb-client-test-32bit.patch | 37 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/mariadb-client-test-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4ed341df8f..adae0f3d23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -930,6 +930,7 @@ dist_patch_DATA = \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-gcc-ice.patch \ + %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4c9382ce6d..48c75bbba8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,7 +636,8 @@ Language.") (sha256 (base32 "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) - (patches (search-patches "mariadb-gcc-ice.patch")) + (patches (search-patches "mariadb-gcc-ice.patch" + "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet '(begin @@ -713,7 +714,18 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" - "roles.acl_statistics")) + "roles.acl_statistics" + + ;; FIXME: This test fails on i686: + ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") + ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) + ;; When running "myisampack --join=foo/t3 foo/t1 foo/t2" + ;; (all three tables must exist and be identical) + ;; in a loop it produces the same error around 1/240 times. + ;; montywi on #maria suggested removing the real_end check in + ;; "strings/my_vsnprintf.c" on line 503, yet it still does not + ;; reach the ending quote occasionally. Disable it for now. + "main.myisampack")) ;; This file contains a list of known-flaky tests for this ;; release. Append our own items. @@ -745,6 +757,9 @@ Language.") (if tests? (with-directory-excursion "mysql-test" (invoke "./mtr" "--verbose" + "--retry=3" + "--testcase-timeout=30" + "--suite-timeout=540" "--parallel" (number->string (parallel-job-count)) "--skip-test-list=unstable-tests")) (format #t "test suite not run~%")) diff --git a/gnu/packages/patches/mariadb-client-test-32bit.patch b/gnu/packages/patches/mariadb-client-test-32bit.patch new file mode 100644 index 0000000000..02017e324d --- /dev/null +++ b/gnu/packages/patches/mariadb-client-test-32bit.patch @@ -0,0 +1,37 @@ +From 93efa48a7b972fc463406603574a4d508eefe792 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Sun, 13 May 2018 18:50:21 +0200 +Subject: [PATCH] fix failing main.mysql_client_test test on 32bit + +in `ulonglong=ulong*uint` multiplication +is done in ulong, wrapping around on 32bit. + +This became visible after C/C changed the +default charset to utf8, thus changing +mbmaxlem from 1 to 3. +--- + tests/mysql_client_fw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c +index f69eb28a2871..4d036887629a 100644 +--- a/tests/mysql_client_fw.c ++++ b/tests/mysql_client_fw.c +@@ -768,7 +768,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + { + MYSQL_FIELD *field; + CHARSET_INFO *cs; +- ulonglong expected_field_length; ++ ulonglong expected_field_length= length; + + if (!(field= mysql_fetch_field_direct(result, no))) + { +@@ -777,7 +777,7 @@ static void do_verify_prepare_field(MYSQL_RES *result, + } + cs= get_charset(field->charsetnr, 0); + DIE_UNLESS(cs); +- if ((expected_field_length= length * cs->mbmaxlen) > UINT_MAX32) ++ if ((expected_field_length*= cs->mbmaxlen) > UINT_MAX32) + expected_field_length= UINT_MAX32; + if (!opt_silent) + { -- cgit v1.2.3 From 71179b35b820e71b51fd503c5ee0c58369c2705e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Aug 2018 13:41:08 +0200 Subject: gnu: mariadb: Further increase test timeouts. * gnu/packages/databases.scm (mariadb)[arguments]: Allow 40 minutes for single tests, and 600 in total. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 48c75bbba8..2c27c5fcd1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -758,8 +758,8 @@ Language.") (with-directory-excursion "mysql-test" (invoke "./mtr" "--verbose" "--retry=3" - "--testcase-timeout=30" - "--suite-timeout=540" + "--testcase-timeout=40" + "--suite-timeout=600" "--parallel" (number->string (parallel-job-count)) "--skip-test-list=unstable-tests")) (format #t "test suite not run~%")) -- cgit v1.2.3 From 62694caa440579d48e5bb4ba13016c0d4a88051f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Aug 2018 19:55:19 +0300 Subject: gnu: mariadb: Remove test which fails on armhf-linux. * gnu/packages/databases.scm (mariadb)[arguments]: Disable test 'mroonga/storage.index_read_multiple_double'. --- gnu/packages/databases.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2c27c5fcd1..dffc2c1553 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -725,7 +725,9 @@ Language.") ;; montywi on #maria suggested removing the real_end check in ;; "strings/my_vsnprintf.c" on line 503, yet it still does not ;; reach the ending quote occasionally. Disable it for now. - "main.myisampack")) + "main.myisampack" + ;; FIXME: This test fails on armhf-linux: + "mroonga/storage.index_read_multiple_double")) ;; This file contains a list of known-flaky tests for this ;; release. Append our own items. -- cgit v1.2.3 From e19f9c24aa74d76428a4a4cf97aef0f626fd9466 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 8 Aug 2018 16:24:41 -0400 Subject: gnu: epiphany: Correctly set the library RUNPATH. * gnu/packages/gnome.scm (epiphany): Set the runpath in #:configure-flags. --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 586cfc9686..6fcd3ceb9c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 David Craven @@ -4190,7 +4190,11 @@ a secret password store, an adblocker, and a modern UI.") ;; subsystem ;; FAIL '(#:tests? #f - #:glib-or-gtk? #t)) + #:glib-or-gtk? #t + #:configure-flags + ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component. + (list (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/epiphany")))) (propagated-inputs `(("dconf" ,dconf))) (native-inputs -- cgit v1.2.3 From 516fe8deb5a645bf86e9db66fccd4403a64206d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 15:12:53 +0200 Subject: gnu: postgresql: Update to 10.5 [fixes CVE-2018-10915, CVE-2018-10925]. * gnu/packages/databases.scm (postgresql): Update to 10.5. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dffc2c1553..eca10556f8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -811,14 +811,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.4") + (version "10.5") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v")))) + "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") -- cgit v1.2.3 From 369d15674c8bb251c45a45466031a2da1640df9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 15:16:11 +0200 Subject: gnu: mariadb: Update to 10.1.35 [security fixes]. This release fixes CVE-2018-3058, CVE-2018-3063, CVE-2018-3064 and CVE-2018-3066. See for details. * gnu/packages/databases.scm (mariadb): Update to 10.1.35. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index eca10556f8..ceeb4052f3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.34") + (version "10.1.35") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) (patches (search-patches "mariadb-gcc-ice.patch" "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) -- cgit v1.2.3 From 80b32d9620517c98fea358fdbd99b2e0a3d098f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 15:59:07 +0200 Subject: gnu: sratom: Update to 0.6.2. * gnu/packages/audio.scm (sratom): Update to 0.6.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 89f2275ebe..17a94af905 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2292,14 +2292,14 @@ input/output.") (define-public sratom (package (name "sratom") - (version "0.6.0") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/sratom-" version ".tar.bz2")) (sha256 (base32 - "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4")))) + "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target (inputs -- cgit v1.2.3 From eb2438dd52e21c8b1ff8eede69c4a8a630807af9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 16:02:20 +0200 Subject: gnu: serd: Update to 0.30.0. * gnu/packages/rdf.scm (serd): Update to 0.30.0. --- gnu/packages/rdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index ff79b90fcd..48dc3cddb9 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -230,14 +230,14 @@ and triple stores.") (define-public serd (package (name "serd") - (version "0.28.0") + (version "0.30.0") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/serd-" version ".tar.bz2")) (sha256 (base32 - "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx")))) + "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From f69b6d1f488a1da333af427df91f13b1d22102f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 16:05:20 +0200 Subject: gnu: lilv: Update to 0.24.4. * gnu/packages/audio.scm (lilv): Update to 0.24.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 17a94af905..488d8faf89 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1716,14 +1716,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public lilv (package (name "lilv") - (version "0.24.2") + (version "0.24.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p")))) + "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 0a1f520d4028fcc806cca789e0406eba229bfe16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 17:39:10 +0200 Subject: gnu: r-rmysql: Add missing dependency on OpenSSL. * gnu/packages/databases.scm (r-rmysql)[inputs]: Add OPENSSL. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ceeb4052f3..59dc5e58cc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2181,6 +2181,9 @@ and web services platform functionality.") `(("pkg-config" ,pkg-config))) (inputs `(("mariadb" ,mariadb) + ;; FIXME: This should be propagated from MariaDB, but add it here + ;; for now to prevent a large rebuild. + ("openssl" ,openssl) ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) -- cgit v1.2.3 From 37d203985e2817b0962129384e8b993a1bb92de9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 19:00:49 +0200 Subject: gnu: python-cython: Disable tests that fail on armhf. * gnu/packages/python.scm (python-cython)[arguments]: On armhf-linux, add phase to disable two tests. --- gnu/packages/python.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1d718bf228..fa5d3f5c54 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2845,6 +2845,24 @@ and is very extensible.") (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 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 _ (invoke "python" "runtests.py" "-vv")))))) (home-page "http://cython.org/") -- cgit v1.2.3