From 614ca05ab04509f12a3bcff71db0068a6ac8af48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:58:40 +0200 Subject: [PATCH 001/435] gnu: glib: Update to 2.56.1. * gnu/packages/glib.scm (glib): Update to 2.56.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6ea73ac12e..3f61fb0a36 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -149,7 +149,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.0") + (version "2.56.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -157,7 +157,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc")) + "138b3hi7glfpbia49gi07lyz1dh9k0jl9vpd3aiwflf6y923zvs0")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything From e85f7ac21ce6ce6d0bbe035d30d5a9ec59d5d88c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:00:28 +0200 Subject: [PATCH 002/435] gnu: gobject-introspection: Update to 1.56.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.56.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3f61fb0a36..e68df128f0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -302,14 +302,14 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.56.0") + (version "1.56.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d")) + (base32 "0jx2kryjd7l0vl5gb3qp1qjfy3cjiizvcd1snsm7pzwrzz67aa2v")) (modules '((guix build utils))) (snippet '(begin From 41db0517cea14688306593ff5f50a1f60dc00e89 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:02:46 +0200 Subject: [PATCH 003/435] gnu: pango: Update to 1.42.1. * gnu/packages/gtk.scm (pango): Update to 1.42.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b55af15900..dda1a50c0c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -216,7 +216,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.0") + (version "1.42.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -224,7 +224,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0illn78nfwpa8y5knh9ir74wa1skc2hi8f3ny19zgpyf7n5dh94r")))) + "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. From d12dff4526def2bc8c3681c2e6af6641647734a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:14:00 +0200 Subject: [PATCH 004/435] gnu: cairo: Update to 1.14.12. * gnu/packages/gtk.scm (cairo): Update to 1.14.12. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dda1a50c0c..79d0646b7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -111,14 +111,14 @@ tools have full access to view and control running applications.") (define-public cairo (package (name "cairo") - (version "1.14.10") + (version "1.14.12") (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) (sha256 (base32 - "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy")) + "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c")) (patches (search-patches "cairo-CVE-2016-9082.patch")))) (build-system gnu-build-system) (propagated-inputs From 30d900d4eeb203ab6766bb7dabfeba62263d1617 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 21:36:44 +0200 Subject: [PATCH 005/435] gnu: sqlite: Update to 3.23.1. * gnu/packages/databases.scm (sqlite): Update to 3.23.1. --- 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 441a6977f6..bd12f4cdb1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.0") + (version "3.23.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "0jbf78g3cm5wq77k7sfg8fb6rz44hnp9hs7p5d66fwd000c1lwdp")))) + "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments From 1f172d8003e23f4d0679ef99ca0566f2b8777a4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:01:06 +0200 Subject: [PATCH 006/435] gnu: libuv: Update to 1.20.2. * gnu/packages/libevent.scm (libuv): Update to 1.20.2. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 983c8625e4..f80b205726 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.19.2") + (version "1.20.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w")))) + "08h39zhg75lmfmk4lx17hpxqrr5yjgnc9b5rpchcankc3lcsqxbb")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases From c98fe1d0648ba5d94f2954e9e5c3b2a22ef18fb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:02:56 +0200 Subject: [PATCH 007/435] gnu: cmake: Update to 3.11.1. * gnu/packages/cmake.scm (cmake): Update to 3.11.1. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e9fa866411..42391158c6 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -42,7 +42,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.0") + (version "3.11.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -50,7 +50,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0sv5k9q6braa8hhw0y3w19avqn0xn5czv5jf5fz5blnlf7ivw4y3")) + "033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp")) (modules '((guix build utils))) (snippet '(begin From 957aac763bc7fcad5fec362938be04cdd9b2f055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 21:19:04 +0200 Subject: [PATCH 008/435] gnu: xz: Update to 5.2.4. * gnu/packages/compression.scm (xz): Update to 5.2.4. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6f44c4fb02..4a34e89324 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -373,7 +373,7 @@ compressed with pbzip2 can be decompressed with bzip2).") (define-public xz (package (name "xz") - (version "5.2.3") + (version "5.2.4") (source (origin (method url-fetch) (uri (list (string-append "http://tukaani.org/xz/xz-" version @@ -382,7 +382,7 @@ compressed with pbzip2 can be decompressed with bzip2).") version ".tar.gz"))) (sha256 (base32 - "1jr8pxnz55ifc8cvp3ivgl79ph9iik5aypsc9cma228aglsqp4ki")))) + "0ibi2zsfaz6l756spjwc5rayf4ckgc9hwmy8qinppcyk4svz64mm")))) (build-system gnu-build-system) (synopsis "General-purpose data compression") (description From 48869860bed868708c3b830da0fd94886fab3af0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:28:48 +0200 Subject: [PATCH 009/435] gnu: poppler: Update to 0.64.0. * gnu/packages/pdf.scm (poppler): Update to 0.64.0. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c9a53698bd..ca3a601826 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Rene Saavedra -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,14 +79,14 @@ (define-public poppler (package (name "poppler") - (version "0.63.0") + (version "0.64.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17")))) + "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no From 32c18fcb3c3cb10303aa4ef07571867e8ce3fe8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 03:34:17 +0200 Subject: [PATCH 010/435] gnu: file: Update to 5.33. * gnu/packages/file.scm (file): Update to 5.33. --- gnu/packages/file.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 0473c519d5..78f0360c2e 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +29,14 @@ (define-public file (package (name "file") - (version "5.32") + (version "5.33") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) (sha256 (base32 - "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6")))) + "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) (build-system gnu-build-system) ;; When cross-compiling, this package depends upon a native install of From 38e4d5956f8d585b1c0263a1a6c79e749d7e7c90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:34:47 +0200 Subject: [PATCH 011/435] gnu: libjpeg: Update to 9c. * gnu/packages/image.scm (libjpeg): Update to 9c. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a6d8b320da..5a3542b4aa 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -251,13 +251,13 @@ files. It can compress them as much as 40% losslessly.") (define-public libjpeg (package (name "libjpeg") - (version "9b") + (version "9c") (source (origin (method url-fetch) (uri (string-append "http://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 - "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4")))) + "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5")))) (build-system gnu-build-system) (synopsis "Library for handling JPEG files") (description From 5ecd5fefd0e9fb0965662f2094c16363325ba614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:45:03 +0200 Subject: [PATCH 012/435] gnu: libgpg-error: Update to 1.29. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.29. [source]: Remove upstreamed patch. * gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 5 +- .../libgpg-error-aarch64-logging-fix.patch | 58 ------------------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2dc64b7e9..74e86d97a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -850,7 +850,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ - %D%/packages/patches/libgpg-error-aarch64-logging-fix.patch \ %D%/packages/patches/libgxps-CVE-2017-11590.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 17207e2173..df86ee2fc6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -69,7 +69,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.28") + (version "1.29") (source (origin (method url-fetch) @@ -77,8 +77,7 @@ version ".tar.bz2")) (sha256 (base32 - "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry")) - (patches (search-patches "libgpg-error-aarch64-logging-fix.patch")))) + "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") diff --git a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch b/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch deleted file mode 100644 index d848d639b2..0000000000 --- a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=patch;h=791177de023574223eddf7288eb7c5a0721ac623 - -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk - -Signed-off-by: Werner Koch ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - --- -2.8.0.rc3 - From b745e216e4e17272d2ccd8f92acd6a9065db9112 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:12:59 +0200 Subject: [PATCH 013/435] gnu: cups-minimal, cups: Update to 2.2.7. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.7. [source]: Add patch to build without LINUX-PAM. * gnu/packages/patches/cups-fix-builds-without-PAM.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cups.scm | 7 +- .../patches/cups-fix-builds-without-PAM.patch | 201 ++++++++++++++++++ 3 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cups-fix-builds-without-PAM.patch diff --git a/gnu/local.mk b/gnu/local.mk index 74e86d97a0..4fa88e300d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -616,6 +616,7 @@ dist_patch_DATA = \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ + %D%/packages/patches/cups-fix-builds-without-PAM.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index a9cc3acba0..4ff79bdecb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -173,7 +173,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) @@ -181,7 +181,10 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20")))) + "0spaqv943bzzq31gqdp73934jgyhhlbzdmgvrmf5cxvhfdxn6jrw")) + ;; “PAM will soon [in 2.3.x] be required for authentication, period.” + ;; + (patches (search-patches "cups-fix-builds-without-PAM.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/cups-fix-builds-without-PAM.patch b/gnu/packages/patches/cups-fix-builds-without-PAM.patch new file mode 100644 index 0000000000..cf51bfb0f7 --- /dev/null +++ b/gnu/packages/patches/cups-fix-builds-without-PAM.patch @@ -0,0 +1,201 @@ +From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 2 Apr 2018 20:05:13 -0400 +Subject: [PATCH] Fix builds without PAM (Issue #5283) + +--- + CHANGES.md | 8 +++- + scheduler/auth.c | 134 ++----------------------------------------------------- + 2 files changed, 11 insertions(+), 131 deletions(-) + +diff --git a/CHANGES.md b/CHANGES.md +index f568f35af..e8fc1fbdd 100644 +--- a/CHANGES.md ++++ b/CHANGES.md +@@ -1,7 +1,13 @@ +-CHANGES - 2.2.7 - 2018-03-22 ++CHANGES - 2.2.8 - 2018-04-02 + ============================ + + ++Changes in CUPS v2.2.8 ++---------------------- ++ ++- Fixed builds without PAM (Issue #5283) ++ ++ + Changes in CUPS v2.2.7 + ---------------------- + +diff --git a/scheduler/auth.c b/scheduler/auth.c +index 8b134b5d7..fa4e2715d 100644 +--- a/scheduler/auth.c ++++ b/scheduler/auth.c +@@ -1,8 +1,8 @@ + /* + * Authorization routines for the CUPS scheduler. + * +- * Copyright 2007-2016 by Apple Inc. +- * Copyright 1997-2007 by Easy Software Products, all rights reserved. ++ * Copyright © 2007-2018 by Apple Inc. ++ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. + * + * This file contains Kerberos support code, copyright 2006 by + * Jelmer Vernooij. +@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t *con, const char *right); + static int compare_locations(cupsd_location_t *a, + cupsd_location_t *b); + static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); +-#if !HAVE_LIBPAM +-static char *cups_crypt(const char *pw, const char *salt); +-#endif /* !HAVE_LIBPAM */ + static void free_authmask(cupsd_authmask_t *am, void *data); + #if HAVE_LIBPAM + static int pam_func(int, const struct pam_message **, +@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ + * client... + */ + +- pass = cups_crypt(password, pw->pw_passwd); ++ pass = crypt(password, pw->pw_passwd); + + if (!pass || strcmp(pw->pw_passwd, pass)) + { + # ifdef HAVE_SHADOW_H + if (spw) + { +- pass = cups_crypt(password, spw->sp_pwdp); ++ pass = crypt(password, spw->sp_pwdp); + + if (pass == NULL || strcmp(spw->sp_pwdp, pass)) + { +@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ + } + + +-#if !HAVE_LIBPAM +-/* +- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, +- * as needed. +- */ +- +-static char * /* O - Encrypted password */ +-cups_crypt(const char *pw, /* I - Password string */ +- const char *salt) /* I - Salt (key) string */ +-{ +- if (!strncmp(salt, "$1$", 3)) +- { +- /* +- * Use MD5 passwords without the benefit of PAM; this is for +- * Slackware Linux, and the algorithm was taken from the +- * old shadow-19990827/lib/md5crypt.c source code... :( +- */ +- +- int i; /* Looping var */ +- unsigned long n; /* Output number */ +- int pwlen; /* Length of password string */ +- const char *salt_end; /* End of "salt" data for MD5 */ +- char *ptr; /* Pointer into result string */ +- _cups_md5_state_t state; /* Primary MD5 state info */ +- _cups_md5_state_t state2; /* Secondary MD5 state info */ +- unsigned char digest[16]; /* MD5 digest result */ +- static char result[120]; /* Final password string */ +- +- +- /* +- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. +- * Get a maximum of 8 characters of salt data after $1$... +- */ +- +- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) +- if (*salt_end == '$') +- break; +- +- /* +- * Compute the MD5 sum we need... +- */ +- +- pwlen = strlen(pw); +- +- _cupsMD5Init(&state); +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); +- +- _cupsMD5Init(&state2); +- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); +- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); +- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); +- _cupsMD5Finish(&state2, digest); +- +- for (i = pwlen; i > 0; i -= 16) +- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); +- +- for (i = pwlen; i > 0; i >>= 1) +- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); +- +- _cupsMD5Finish(&state, digest); +- +- for (i = 0; i < 1000; i ++) +- { +- _cupsMD5Init(&state); +- +- if (i & 1) +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- else +- _cupsMD5Append(&state, digest, 16); +- +- if (i % 3) +- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); +- +- if (i % 7) +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- +- if (i & 1) +- _cupsMD5Append(&state, digest, 16); +- else +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- +- _cupsMD5Finish(&state, digest); +- } +- +- /* +- * Copy the final sum to the result string and return... +- */ +- +- memcpy(result, salt, (size_t)(salt_end - salt)); +- ptr = result + (salt_end - salt); +- *ptr++ = '$'; +- +- for (i = 0; i < 5; i ++, ptr += 4) +- { +- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); +- +- if (i < 4) +- n |= (unsigned)digest[i + 12]; +- else +- n |= (unsigned)digest[5]; +- +- to64(ptr, n, 4); +- } +- +- to64(ptr, (unsigned)digest[11], 2); +- ptr += 2; +- *ptr = '\0'; +- +- return (result); +- } +- else +- { +- /* +- * Use the standard crypt() function... +- */ +- +- return (crypt(pw, salt)); +- } +-} +-#endif /* !HAVE_LIBPAM */ +- +- + /* + * 'free_authmask()' - Free function for auth masks. + */ From 4eef81d9ae5216829e74a803db1ab1a156a2aee0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:27:32 +0200 Subject: [PATCH 014/435] gnu: cups-filters: Update to 1.20.3. * gnu/packages/cups.scm (cups-filters): Update to 1.20.3. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4ff79bdecb..501cadddf5 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -50,7 +50,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.1") + (version "1.20.3") (source(origin (method url-fetch) (uri @@ -58,7 +58,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk")) + "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From ca2c342181771b83d46a94aec9786f8dd0e0a0b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:39:40 +0200 Subject: [PATCH 015/435] gnu: boost: Update to 1.67.0. * gnu/packages/boost.scm (boost): Update to 1.67.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6b17e30a8e..6f96e55710 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.66.0") + (version "1.67.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")) + "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) From 3f649c79c1f2c9431b0aea1463b2759eacd24540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 01:39:55 +0200 Subject: [PATCH 016/435] gnu: dbus: Update to 1.12.8. * gnu/packages/glib.scm (dbus): Update to 1.12.8. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e68df128f0..7380f7d898 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -79,7 +79,7 @@ (define dbus (package (name "dbus") - (version "1.12.6") + (version "1.12.8") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ version ".tar.gz")) (sha256 (base32 - "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2")) + "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments From a551ba9ba75ca8de136949b4e7ebe9f44d0c7d2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 14:59:20 +0200 Subject: [PATCH 017/435] gnu: python2: Update to 2.7.15. * gnu/packages/python.scm (python-2.7): Update to 2.7.15. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 37434c4758..3c07cfe4be 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -142,7 +142,7 @@ (define-public python-2.7 (package (name "python2") - (version "2.7.14") + (version "2.7.15") (source (origin (method url-fetch) @@ -150,7 +150,7 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi")) + "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92")) (patches (search-patches "python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" From 3cc9a8a1324b865fa70d61647c5a41de1e439522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 May 2018 00:11:19 +0200 Subject: [PATCH 018/435] gnu: libsigsegv: Install the shared library. Suggested by Weldon Goree . * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Add #:configure-flags. --- gnu/packages/libsigsegv.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index 7f63bb26c4..927a12f4cf 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2018 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -38,20 +38,23 @@ (home-page "https://www.gnu.org/software/libsigsegv/") (synopsis "Library for handling page faults") (arguments - ;; On MIPS, work around this error: - ;; - ;; In file included from fault-linux-mips-old.h:18:0, - ;; [...] - ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' - (if (string-contains (or (%current-target-system) (%current-system)) - "mips64el") - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-mips-old-h - (lambda _ - (substitute* "src/fault-linux-mips-old.h" - (("#include ") "")) - #t)))) - '())) + `(;; The shared library isn't built by default but some packages need it. + #:configure-flags '("--enable-shared") + + ;; On MIPS, work around this error: + ;; + ;; In file included from fault-linux-mips-old.h:18:0, + ;; [...] + ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' + ,@(if (string-contains (or (%current-target-system) (%current-system)) + "mips64el") + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-mips-old-h + (lambda _ + (substitute* "src/fault-linux-mips-old.h" + (("#include ") "")) + #t)))) + '()))) (description "GNU libsigsegv is a library to handle page faults, which occur when a program tries to access an unavailable region of memory, in user mode. By From ad4835fe018a4a0c1955385c819fed7ec4a841d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 17 Apr 2018 12:32:56 +0200 Subject: [PATCH 019/435] gremlin: Preserve offset info for dynamic entries. * guix/build/gremlin.scm (): New record type. (raw-dynamic-entries): Return a list of . (dynamic-entries): Adjust accordingly and return a list of . (elf-dynamic-info)[matching-entry]: New procedure. Use it. --- guix/build/gremlin.scm | 84 ++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index bb019967e5..78d1333117 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -99,10 +99,16 @@ dynamic linking information." ;; } d_un; ;; } Elf64_Dyn; +(define-record-type + (dynamic-entry type value offset) + dynamic-entry? + (type dynamic-entry-type) ;DT_* + (value dynamic-entry-value) ;string | number | ... + (offset dynamic-entry-offset)) ;integer + (define (raw-dynamic-entries elf segment) - "Return as a list of type/value pairs all the dynamic entries found in -SEGMENT, the 'PT_DYNAMIC' segment of ELF. In the result, each car is a DT_ -value, and the interpretation of the cdr depends on the type." + "Return as a list of for the dynamic entries found in +SEGMENT, the 'PT_DYNAMIC' segment of ELF." (define start (elf-segment-offset segment)) (define bytes @@ -123,7 +129,9 @@ value, and the interpretation of the cdr depends on the type." (if (= type DT_NULL) ;finished? (reverse result) (loop (+ offset (* 2 word-size)) - (alist-cons type value result))))))) + (cons (dynamic-entry type value + (+ start offset word-size)) + result))))))) (define (vma->offset elf vma) "Convert VMA, a virtual memory address, to an offset within ELF. @@ -148,35 +156,33 @@ offset." (define (dynamic-entries elf segment) "Return all the dynamic entries found in SEGMENT, the 'PT_DYNAMIC' segment -of ELF, as a list of type/value pairs. The type is a DT_ value, and the value -may be a string or an integer depending on the entry type (for instance, the -value of DT_NEEDED entries is a string.)" +of ELF, as a list of . The value of each entry may be a string +or an integer depending on the entry type (for instance, the value of +DT_NEEDED entries is a string.) Likewise the offset is the offset within the +string table if the type is a string." (define entries (raw-dynamic-entries elf segment)) (define string-table-offset - (any (match-lambda - ((type . value) - (and (= type DT_STRTAB) value)) - (_ #f)) + (any (lambda (entry) + (and (= (dynamic-entry-type entry) DT_STRTAB) + (dynamic-entry-value entry))) entries)) - (define (interpret-dynamic-entry type value) - (cond ((memv type (list DT_NEEDED DT_SONAME DT_RPATH DT_RUNPATH)) - (if string-table-offset - (pointer->string - (bytevector->pointer (elf-bytes elf) - (vma->offset - elf - (+ string-table-offset value)))) - value)) - (else - value))) + (define (interpret-dynamic-entry entry) + (let ((type (dynamic-entry-type entry)) + (value (dynamic-entry-value entry))) + (cond ((memv type (list DT_NEEDED DT_SONAME DT_RPATH DT_RUNPATH)) + (if string-table-offset + (let* ((offset (vma->offset elf (+ string-table-offset value))) + (value (pointer->string + (bytevector->pointer (elf-bytes elf) offset)))) + (dynamic-entry type value offset)) + (dynamic-entry type value (dynamic-entry-offset entry)))) + (else + (dynamic-entry type value (dynamic-entry-offset entry)))))) - (map (match-lambda - ((type . value) - (cons type (interpret-dynamic-entry type value)))) - entries)) + (map interpret-dynamic-entry entries)) ;;; @@ -200,21 +206,29 @@ value of DT_NEEDED entries is a string.)" (define (elf-dynamic-info elf) "Return dynamic-link information for ELF as an object, or #f if ELF lacks dynamic-link information." + (define (matching-entry type) + (lambda (entry) + (= type (dynamic-entry-type entry)))) + (match (dynamic-link-segment elf) (#f #f) ((? elf-segment? dynamic) (let ((entries (dynamic-entries elf dynamic))) - (%elf-dynamic-info (assv-ref entries DT_SONAME) - (filter-map (match-lambda - ((type . value) - (and (= type DT_NEEDED) value)) - (_ #f)) + (%elf-dynamic-info (find (matching-entry DT_SONAME) entries) + (filter-map (lambda (entry) + (and (= (dynamic-entry-type entry) + DT_NEEDED) + (dynamic-entry-value entry))) entries) - (or (and=> (assv-ref entries DT_RPATH) - search-path->list) + (or (and=> (find (matching-entry DT_RPATH) + entries) + (compose search-path->list + dynamic-entry-value)) '()) - (or (and=> (assv-ref entries DT_RUNPATH) - search-path->list) + (or (and=> (find (matching-entry DT_RUNPATH) + entries) + (compose search-path->list + dynamic-entry-value)) '())))))) (define %libc-libraries From b178fc236908ad2da86734ea8e01abd3ff8981da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 17 Apr 2018 13:38:12 +0200 Subject: [PATCH 020/435] gremlin: Add 'strip-runpath'. * guix/build/gremlin.scm (strip-runpath): New procedure. * tests/gremlin.scm (c-compiler): New variable. ("strip-runpath"): New test. --- guix/build/gremlin.scm | 46 +++++++++++++++++++++++++++++++++++++++++- tests/gremlin.scm | 35 +++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index 78d1333117..e8ea66dfb3 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -41,7 +41,8 @@ elf-dynamic-info-runpath expand-origin - validate-needed-in-runpath)) + validate-needed-in-runpath + strip-runpath)) ;;; Commentary: ;;; @@ -320,4 +321,47 @@ be found in RUNPATH ~s~%" ;; (format (current-error-port) "~a is OK~%" file)) (null? not-found)))))) +(define (strip-runpath file) + "Remove from the DT_RUNPATH of FILE any entries that are not necessary +according to DT_NEEDED." + (define (minimal-runpath needed runpath) + (filter (lambda (directory) + (and (string-prefix? "/" directory) + (any (lambda (lib) + (file-exists? (string-append directory "/" lib))) + needed))) + runpath)) + + (define port + (open-file file "r+b")) + + (catch #t + (lambda () + (let* ((elf (parse-elf (get-bytevector-all port))) + (entries (dynamic-entries elf (dynamic-link-segment elf))) + (needed (filter-map (lambda (entry) + (and (= (dynamic-entry-type entry) + DT_NEEDED) + (dynamic-entry-value entry))) + entries)) + (runpath (find (lambda (entry) + (= DT_RUNPATH (dynamic-entry-type entry))) + entries)) + (old (search-path->list + (dynamic-entry-value runpath))) + (new (minimal-runpath needed old))) + (unless (equal? old new) + (format (current-error-port) + "~a: stripping RUNPATH to ~s (removed ~s)~%" + file new + (lset-difference string=? old new)) + (seek port (dynamic-entry-offset runpath) SEEK_SET) + (put-bytevector port (string->utf8 (string-join new ":"))) + (put-u8 port 0)) + (close-port port) + new)) + (lambda (key . args) + (false-if-exception (close-port port)) + (apply throw key args)))) + ;;; gremlin.scm ends here diff --git a/tests/gremlin.scm b/tests/gremlin.scm index 2885554967..1b47d5c384 100644 --- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,12 +18,14 @@ (define-module (test-gremlin) #:use-module (guix elf) + #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (guix build utils) #:use-module (guix build gremlin) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) #:use-module (rnrs io ports) + #:use-module (ice-9 popen) #:use-module (ice-9 match)) (define %guile-executable @@ -37,6 +39,9 @@ (define read-elf (compose parse-elf get-bytevector-all)) +(define c-compiler + (or (which "gcc") (which "cc") (which "g++"))) + (test-begin "gremlin") @@ -63,4 +68,32 @@ "../${ORIGIN}/bar/$ORIGIN/baz" "ORIGIN/foo"))) +(unless c-compiler + (test-skip 1)) +(test-equal "strip-runpath" + "hello\n" + (call-with-temporary-directory + (lambda (directory) + (with-directory-excursion directory + (call-with-output-file "t.c" + (lambda (port) + (display "int main () { puts(\"hello\"); }" port))) + (invoke c-compiler "t.c" + "-Wl,-rpath=/foo" "-Wl,-rpath=/bar") + (let* ((dyninfo (elf-dynamic-info + (parse-elf (call-with-input-file "a.out" + get-bytevector-all)))) + (old (elf-dynamic-info-runpath dyninfo)) + (new (strip-runpath "a.out")) + (new* (strip-runpath "a.out"))) + (validate-needed-in-runpath "a.out") + (and (member "/foo" old) (member "/bar" old) + (not (member "/foo" new)) + (not (member "/bar" new)) + (equal? new* new) + (let* ((pipe (open-input-pipe "./a.out")) + (str (get-string-all pipe))) + (close-pipe pipe) + str))))))) + (test-end "gremlin") From 8005640201fbc9b113f4f76fc7e55fe3f9a72738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 18 Apr 2018 18:31:28 +0200 Subject: [PATCH 021/435] build-system/meson: Use 'strip-runpath' instead of PatchELF. * guix/build/meson-build-system.scm (fix-runpath): Call 'strip-runpath' instead of invoking 'patchelf'. --- guix/build/meson-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e7690a4c37..7efd433d6c 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -135,7 +135,7 @@ for example libraries only needed for the tests." (find-files dir elf-pred)) existing-elf-dirs)))) (for-each (lambda (elf-file) - (system* "patchelf" "--shrink-rpath" elf-file) + (strip-runpath elf-file) (handle-file elf-file elf-list)) elf-list))))) (for-each handle-output outputs) From 475c11b1a7699e63467c0182da3602fbe6222378 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 May 2018 15:37:16 +0200 Subject: [PATCH 022/435] gnu: jemalloc: Update to 5.1.0. * gnu/packages/jemalloc.scm (jemalloc): Update to 5.1.0. [source](patches): Remove. * gnu/packages/patches/jemalloc-arm-address-bits.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/jemalloc.scm | 5 +-- .../patches/jemalloc-arm-address-bits.patch | 39 ------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/jemalloc-arm-address-bits.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4fa88e300d..72de5f20b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -802,7 +802,6 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ - %D%/packages/patches/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index 5086df7a1b..cb870208e4 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -32,7 +32,7 @@ (define-public jemalloc (package (name "jemalloc") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) (uri (string-append @@ -40,8 +40,7 @@ version "/jemalloc-" version ".tar.bz2")) (sha256 (base32 - "1sf3lzgb0y8nnyzmp4zrca3sngdxw3kfh20sna9z03jv74fph528")) - (patches (search-patches "jemalloc-arm-address-bits.patch")))) + "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/jemalloc-arm-address-bits.patch b/gnu/packages/patches/jemalloc-arm-address-bits.patch deleted file mode 100644 index f2ef24c25a..0000000000 --- a/gnu/packages/patches/jemalloc-arm-address-bits.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8cfc9dec37b312a2686f602bbcdd102ca07cca99 Mon Sep 17 00:00:00 2001 -From: David Goldblatt -Date: Fri, 29 Sep 2017 13:54:08 -0700 -Subject: [PATCH] ARM: Don't extend bit LG_VADDR to compute high address bits. - -In userspace ARM on Linux, zero-ing the high bits is the correct way to do this. -This doesn't fix the fact that we currently set LG_VADDR to 48 on ARM, when in -fact larger virtual address sizes are coming soon. We'll cross that bridge when -we come to it. ---- - include/jemalloc/internal/rtree.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/include/jemalloc/internal/rtree.h b/include/jemalloc/internal/rtree.h -index b5d4db39..4563db23 100644 ---- a/include/jemalloc/internal/rtree.h -+++ b/include/jemalloc/internal/rtree.h -@@ -178,9 +178,21 @@ rtree_leaf_elm_bits_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm, - - JEMALLOC_ALWAYS_INLINE extent_t * - rtree_leaf_elm_bits_extent_get(uintptr_t bits) { -+# ifdef __aarch64__ -+ /* -+ * aarch64 doesn't sign extend the highest virtual address bit to set -+ * the higher ones. Instead, the high bits gets zeroed. -+ */ -+ uintptr_t high_bit_mask = ((uintptr_t)1 << LG_VADDR) - 1; -+ /* Mask off the slab bit. */ -+ uintptr_t low_bit_mask = ~(uintptr_t)1; -+ uintptr_t mask = high_bit_mask & low_bit_mask; -+ return (extent_t *)(bits & mask); -+# else - /* Restore sign-extended high bits, mask slab bit. */ - return (extent_t *)((uintptr_t)((intptr_t)(bits << RTREE_NHIB) >> - RTREE_NHIB) & ~((uintptr_t)0x1)); -+# endif - } - - JEMALLOC_ALWAYS_INLINE szind_t From ffd526e61ab1b45c6c913ab4e139193e4d5bee9b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 22 May 2018 07:41:45 +0300 Subject: [PATCH 023/435] gnu: cmake: Delete Emacs library. * gnu/packages/cmake.scm (cmake)[arguments]: Delete Emacs library. --- gnu/packages/cmake.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 42391158c6..e43707389b 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -85,6 +85,13 @@ " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'split-package + ;; Remove files that have been packaged in other package recipes. + (lambda _ + (delete-file "Auxiliary/cmake-mode.el") + (substitute* "Auxiliary/CMakeLists.txt" + ((".*cmake-mode.el.*") "")) + #t)) (add-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of From 5e6bd3ebdcfad2bdb5c65427b5ebfe44a9e436d8 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 31 May 2018 14:05:01 +0200 Subject: [PATCH 024/435] gnu: libuv: Update to 1.20.3. * gnu/packages/libevent.scm (libuv): Update to 1.20.3. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f80b205726..3e4768b401 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "08h39zhg75lmfmk4lx17hpxqrr5yjgnc9b5rpchcankc3lcsqxbb")))) + "0yc569q47gidqsdsbx30l6i60lwh97pavdnwac0gv9f72vcsmdrv")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases From 4dd91dff477b9717b3fa494b23976e4d69ab7dfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Jun 2018 23:30:30 +0200 Subject: [PATCH 025/435] build-system/r: Fix type error. Reported-by: Mark H Weaver * guix/build/r-build-system.scm (pipe-to-r): Pass a list to the condition's "arguments" field. --- guix/build/r-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/r-build-system.scm b/guix/build/r-build-system.scm index 4d8ac5b479..2c0b322da9 100644 --- a/guix/build/r-build-system.scm +++ b/guix/build/r-build-system.scm @@ -44,7 +44,7 @@ (unless (zero? code) (raise (condition ((@@ (guix build utils) &invoke-error) (program "R") - (arguments (string-append params " " command)) + (arguments (cons command params)) (exit-status (status:exit-val code)) (term-signal (status:term-sig code)) (stop-signal (status:stop-sig code))))))))) From 52630ca08487f8b65fe316aebc5ad9d8c050d731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 17:26:10 +0200 Subject: [PATCH 026/435] gnu: fribidi: Update to 1.0.4. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.4. --- gnu/packages/fribidi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 0368779240..10920aa200 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "0aw3i1g96axbr96flw4543dvhb8zlgb0w8314ks6cq2g1i9invdx")))) + (base32 "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl")))) (build-system gnu-build-system) (arguments `(#:configure-flags From d577e00f969dbee50930b9aabf096ce9b277ac81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:27:43 +0200 Subject: [PATCH 027/435] gnu: shared-mime-info: Update to 1.9. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.9. --- 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 de212bfb44..6c7b4ebdce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -937,14 +937,14 @@ guidelines.") (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 - "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a")))) + "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. From f68f5e28ed9ff02cac7c569b35bccc0d8df091ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:27:47 +0200 Subject: [PATCH 028/435] gnu: cups, cups-minimal: Update to 2.2.8. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.8. [source]: Remove patch... * gnu/packages/patches/cups-fix-builds-without-PAM.patch: ...delete... * gnu/local.mk (dist_patch_DATA): ..and remove it. --- gnu/local.mk | 1 - gnu/packages/cups.scm | 7 +- .../patches/cups-fix-builds-without-PAM.patch | 201 ------------------ 3 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 gnu/packages/patches/cups-fix-builds-without-PAM.patch diff --git a/gnu/local.mk b/gnu/local.mk index a4c27f6417..f901f21b55 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -621,7 +621,6 @@ dist_patch_DATA = \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ - %D%/packages/patches/cups-fix-builds-without-PAM.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 501cadddf5..201c180013 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -173,7 +173,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.7") + (version "2.2.8") (source (origin (method url-fetch) @@ -181,10 +181,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "0spaqv943bzzq31gqdp73934jgyhhlbzdmgvrmf5cxvhfdxn6jrw")) - ;; “PAM will soon [in 2.3.x] be required for authentication, period.” - ;; - (patches (search-patches "cups-fix-builds-without-PAM.patch")))) + "1r7r7b3nqpzc1a9dczqpj2mr8rkcwf01676v11sp4j7w4qfzqs1r")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/cups-fix-builds-without-PAM.patch b/gnu/packages/patches/cups-fix-builds-without-PAM.patch deleted file mode 100644 index cf51bfb0f7..0000000000 --- a/gnu/packages/patches/cups-fix-builds-without-PAM.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 2 Apr 2018 20:05:13 -0400 -Subject: [PATCH] Fix builds without PAM (Issue #5283) - ---- - CHANGES.md | 8 +++- - scheduler/auth.c | 134 ++----------------------------------------------------- - 2 files changed, 11 insertions(+), 131 deletions(-) - -diff --git a/CHANGES.md b/CHANGES.md -index f568f35af..e8fc1fbdd 100644 ---- a/CHANGES.md -+++ b/CHANGES.md -@@ -1,7 +1,13 @@ --CHANGES - 2.2.7 - 2018-03-22 -+CHANGES - 2.2.8 - 2018-04-02 - ============================ - - -+Changes in CUPS v2.2.8 -+---------------------- -+ -+- Fixed builds without PAM (Issue #5283) -+ -+ - Changes in CUPS v2.2.7 - ---------------------- - -diff --git a/scheduler/auth.c b/scheduler/auth.c -index 8b134b5d7..fa4e2715d 100644 ---- a/scheduler/auth.c -+++ b/scheduler/auth.c -@@ -1,8 +1,8 @@ - /* - * Authorization routines for the CUPS scheduler. - * -- * Copyright 2007-2016 by Apple Inc. -- * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * Copyright © 2007-2018 by Apple Inc. -+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. - * - * This file contains Kerberos support code, copyright 2006 by - * Jelmer Vernooij. -@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t *con, const char *right); - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ From 5ccd6e2b53758ff770826820091df34f8a1fb087 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 19:04:30 +0200 Subject: [PATCH 029/435] gnu: mit-krb5: Update to 1.16.1. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.16.1. --- gnu/packages/kerberos.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6877f5b873..7b16da781e 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2012, 2017 Ludovic Courtès ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,7 +47,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.16") + (version "1.16.1") (source (origin (method url-fetch) (uri (list @@ -58,7 +59,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "024yjr15ij0qdnay0bcqfpclgfri0qa8iw4r5zdlryxhhdgi5szs")))) + "05qis9l93hhxaknbp0a2v5cr24fsy52fqx20aqqcgl1s9qwzwkr1")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) From 5b5a8d6b21ec01b8d0d3ba4d5c9b9e81577072ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:35:27 +0200 Subject: [PATCH 030/435] gnu: isl: Update to 0.19. * gnu/packages/gcc.scm (isl): Update to 0.19. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5012d9a913..2ab70c107c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -816,7 +816,7 @@ as the 'native-search-paths' field." (define-public isl (package (name "isl") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (list (string-append @@ -827,7 +827,7 @@ as the 'native-search-paths' field." name "-" version ".tar.gz"))) (sha256 (base32 - "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))) + "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") From ac98b7a96bcd29948bd54a76cf304e3d2d90b6c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:08 +0200 Subject: [PATCH 031/435] gnu: bison: Update to 3.0.5. * gnu/packages/bison.scm (bison): Update to 3.0.5. --- gnu/packages/bison.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 09c6481a16..3e47a2a1b2 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-public bison (package (name "bison") - (version "3.0.4") + (version "3.0.5") (source (origin (method url-fetch) @@ -37,10 +38,10 @@ version ".tar.xz")) (sha256 (base32 - "1qbgf6q1n2z17k8g33444m0q68kf3fbiq65q7jlrzpvvj73jh957")))) + "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) - ;; m4 is not present in PATH when cross-building + ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) (inputs `(("flex" ,flex))) (propagated-inputs `(("m4" ,m4))) From eb5d2792a0c32dd4e087359920c0375fb7486509 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:35:26 +0200 Subject: [PATCH 032/435] gnu: freetype: Update to 2.9.1. * gnu/packages/fontutils.scm (freetype): Update to 2.9.1. [source]: Remove patch... * gnu/packages/patches/freetype-CVE-2018-6942.patch: ...delete... * gnu/local.mk (dist_patch_DATA): ...and remove it. --- gnu/local.mk | 1 - gnu/packages/fontutils.scm | 5 ++- .../patches/freetype-CVE-2018-6942.patch | 31 ------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/freetype-CVE-2018-6942.patch diff --git a/gnu/local.mk b/gnu/local.mk index f901f21b55..5b6fe71d1c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -678,7 +678,6 @@ dist_patch_DATA = \ %D%/packages/patches/freeimage-CVE-2016-5684.patch \ %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \ %D%/packages/patches/freeimage-unbundle.patch \ - %D%/packages/patches/freetype-CVE-2018-6942.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index f7dc2e7634..cf18b55aae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -54,14 +54,13 @@ (define-public freetype (package (name "freetype") - (version "2.9") + (version "2.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6")) - (patches (search-patches "freetype-CVE-2018-6942.patch")))) + "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/freetype-CVE-2018-6942.patch b/gnu/packages/patches/freetype-CVE-2018-6942.patch deleted file mode 100644 index 680f357765..0000000000 --- a/gnu/packages/patches/freetype-CVE-2018-6942.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix CVE-2018-6942: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942 -https://people.canonical.com/~ubuntu-security/cve/2018/CVE-2018-6942.html - -Copied from upstream (ChangeLog section removed): -https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index d855aaa..551f14a 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7532,8 +7532,16 @@ - return; - } - -- for ( i = 0; i < num_axes; i++ ) -- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ if ( coords ) -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ } -+ else -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = 0; -+ } - } - - From 2008bc6b8f23c1425cb48dea431009e71d487d3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:48:53 +0200 Subject: [PATCH 033/435] gnu: libdrm: Update to 2.4.92. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.92. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index be082eef73..1c6e23e264 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -318,7 +318,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.91") + (version "2.4.92") (source (origin (method url-fetch) @@ -328,7 +328,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3")) + "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments From 605f0621f3dfaa06d54cc81502f813ba43542b77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:23 +0200 Subject: [PATCH 034/435] gnu: libunistring: Update to 0.9.10. * gnu/packages/libunistring.scm (libunistring): Update to 0.9.10. [source]: Remove now-unnecessary snippet. --- gnu/packages/libunistring.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index 6a3afd4f05..b6656904eb 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ (define-public libunistring (package (name "libunistring") - (version "0.9.9") + (version "0.9.10") (source (origin (method url-fetch) (uri (string-append @@ -40,17 +41,7 @@ version ".tar.xz")) (sha256 (base32 - "0cx8v6862w7vvacbkcvg49kfx731ckdgaybmzw1zav71zkn97nd4")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + "1mq57h06622m6qc5cv347fc3qk5mj840axw3c0vd7qmnwk1v53zb")))) (propagated-inputs (libiconv-if-needed)) (build-system gnu-build-system) (arguments From 1a1d055903155fbfb05c7f72d9c0ab73a189465f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 14:59:04 +0200 Subject: [PATCH 035/435] gnu: wayland-protocols: Update to 1.14. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.14. --- 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 a6b79f41b0..ea48afcb20 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -473,7 +473,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append @@ -481,7 +481,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07")))) + "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) From f9bb942adf919360f0f70e3a83a126d5c1a82c6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 15:32:52 +0200 Subject: [PATCH 036/435] gnu: libidn: Update to 1.35. * gnu/packages/libidn.scm (libidn): Update to 1.35. [source]: Remove now-unnecessary snippet. --- gnu/packages/libidn.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 249c3f8458..07fed8081b 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,26 +33,16 @@ (define-public libidn (package (name "libidn") - (version "1.34") + (version "1.35") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/libidn-" version ".tar.gz")) (sha256 (base32 - "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "lib/gltests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi")))) (build-system gnu-build-system) -;; FIXME: No Java and C# libraries are currently built. + ;; FIXME: No Java and C# libraries are currently built. (synopsis "Internationalized string processing library") (description "libidn is a library implementing of the Stringprep, Punycode and IDNA From 86c19ed94a4b1fea3de82ea6049dd94271449ce8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 16:47:15 +0200 Subject: [PATCH 037/435] gnu: jansson: Update to 2.11. * gnu/packages/web.scm (jansson): Update to 2.11. --- 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 7819a87479..cfc27cd118 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -503,7 +503,7 @@ libraries for working with JNLP applets.") (define-public jansson (package (name "jansson") - (version "2.10") + (version "2.11") (source (origin (method url-fetch) (uri @@ -511,7 +511,7 @@ libraries for working with JNLP applets.") version ".tar.gz")) (sha256 (base32 - "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq")))) + "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf")))) (build-system gnu-build-system) (home-page "http://www.digip.org/jansson/") (synopsis "JSON C library") From 314dcec1c0833efdc02c78e54aec1c7d34f31904 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:06:55 +0200 Subject: [PATCH 038/435] gnu: nghttp2: Update to 1.32.0. * gnu/packages/web.scm (nghttp2): Update to 1.32.0. --- 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 cfc27cd118..fcfc9b0b90 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6341,7 +6341,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.31.1") + (version "1.32.0") (source (origin (method url-fetch) @@ -6350,7 +6350,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "00z1687m4wi2gbgkijbv099l9hs1sjlyzbhh8jhn0xssx4xcifb5")))) + "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 From eca24b2f3de369477b268d902dfad6daed85433a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:09:29 +0200 Subject: [PATCH 039/435] gnu: linux-pam: Update to 1.3.1. * gnu/packages/linux.scm (linux-pam): Update to 1.3.1. [source]: Update upstream URI. --- gnu/packages/linux.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e6e849ecbd..cc1ee48792 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -467,17 +467,17 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-pam (package (name "linux-pam") - (version "1.3.0") + (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append - "http://www.linux-pam.org/library/" - "Linux-PAM-" version ".tar.bz2")) - (sha256 - (base32 - "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4")) - (patches (search-patches "linux-pam-no-setfsuid.patch")))) + (method url-fetch) + (uri (string-append + "https://github.com/linux-pam/linux-pam/releases/download/v" + version "/Linux-PAM-" version ".tar.xz")) + (sha256 + (base32 + "1nyh9kdi3knhxcbv5v4snya0g3gff0m671lnvqcbygw3rm77mx7g")) + (patches (search-patches "linux-pam-no-setfsuid.patch")))) (build-system gnu-build-system) (native-inputs From 4f3958dacb13713842ec5d1aaf7150d5b3716ef8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 19:22:30 +0200 Subject: [PATCH 040/435] gnu: cmake: Update to 3.11.3. * gnu/packages/cmake.scm (cmake): Update to 3.11.3. --- gnu/packages/cmake.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cc2d90712d..00ddc625f1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.1") + (version "3.11.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -51,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp")) + "16n310smy3h4q3i7l1hcv0hlrwdvh082f1r7s36c3zxppsv3aw98")) (modules '((guix build utils))) (snippet '(begin From f1799efb31be3e9d655efb9e30c391ff9f6cd58f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 21:01:45 +0200 Subject: [PATCH 041/435] gnu: perl: Ungraft version 5.26.2. * gnu/packages/perl.scm (perl): Update to 5.26.2. [replacement]: Ungraft. (perl-5.26.2, perl/fixed): Remove variables. --- gnu/packages/perl.scm | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2d2bb62a78..cfc73c5b3c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -44,7 +44,6 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2 #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) @@ -61,15 +60,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.26.1") - (replacement perl/fixed) + (version "5.26.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7")) + "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")) (patches (search-patches "perl-file-path-CVE-2017-6512.patch" "perl-no-sys-dirs.patch" @@ -160,39 +158,6 @@ (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" -;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913. -;; See . -(define perl-5.26.2 - (package - (inherit perl) - (version "5.26.2") - (source (origin - (inherit (package-source perl)) - (uri (string-append "mirror://cpan/src/5.0/perl-" - version ".tar.gz")) - (sha256 - (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))))) - -;; When grafting perl, complications arise when the replacement perl has a -;; different version number than the original. So, here we create a version -;; of perl-5.26.2 that thinks it is version 5.26.1. See -;; and . -(define perl/fixed - (package - (inherit perl-5.26.2) - (version "5.26.1") - (arguments - (substitute-keyword-arguments (package-arguments perl-5.26.2) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'revert-perl-subversion - (lambda _ - (substitute* "patchlevel.h" - (("^#define PERL_SUBVERSION 2") - "#define PERL_SUBVERSION 1")) - #t)))))))) - (define-public perl-algorithm-c3 (package (name "perl-algorithm-c3") From d30e9e61098a4fc1b0e5764a77ca15d2d63d8ae4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jun 2018 13:06:38 +0200 Subject: [PATCH 042/435] gnu: sqlite: Update to 3.24.0. * gnu/packages/databases.scm (sqlite): Update to 3.24.0. --- 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 94eb68486b..7690a85f1b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.1") + (version "3.24.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) + "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments From 551a2f9e696c598dbaf91a12039fee839a1524e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:09:32 +0200 Subject: [PATCH 043/435] gnu: libidn2: Update to 2.0.5. * gnu/packages/libidn.scm (libidn2): Update to 2.0.5. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 07fed8081b..7cf061768e 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -57,14 +57,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "00f2fyw5kwr9is3cdn5h9arzxp0lnvg0z9bb9zyfs0dq81gaqim4")))) + "0s4nkazy1xbs6bbq4farby1xhmhzk5bdclbil5gqdwyzxsgabxqg")))) (native-inputs `(("lzip" ,lzip))) (inputs From 7391a938d0b897fd5c456e785f2dbf5a8fb8c8d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:22:06 +0200 Subject: [PATCH 044/435] gnu: harfbuzz: Update to 1.8.0. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 40e16d2475..6e09681ae0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.7.6") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys")))) + "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo From 53411dfcd6e696fc4aea11c70d411db5300ac5e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:28:40 +0200 Subject: [PATCH 045/435] gnu: libbsd: Update to 0.9.1. * gnu/packages/libbsd.scm (libbsd): Update to 0.9.1. --- gnu/packages/libbsd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm index 58b0be872c..a616de70bd 100644 --- a/gnu/packages/libbsd.scm +++ b/gnu/packages/libbsd.scm @@ -25,14 +25,14 @@ (define-public libbsd (package (name "libbsd") - (version "0.8.7") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "https://libbsd.freedesktop.org/releases/" "libbsd-" version ".tar.xz")) (sha256 (base32 - "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m")))) + "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n")))) (build-system gnu-build-system) (synopsis "Utility functions from BSD systems") (description "This library provides useful functions commonly found on BSD From 243ea8673f783d5a85df94b09d4ffd4bc6cc97ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Jun 2018 23:02:31 +0200 Subject: [PATCH 046/435] gnu: gcc: Fix 'gcc-strmov-store-file-names.patch'. Fixes . Previously GCC would crash when encountering a 'static const' element without an initializer, as in: #define _GNU_SOURCE #include void foo (char *x) { static const char buf[12]; memcpy (x, buf, 12); } * gnu/packages/patches/gcc-strmov-store-file-names.patch: Return false when DECL_INITIAL returns NULL_TREE. --- .../patches/gcc-strmov-store-file-names.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gcc-strmov-store-file-names.patch b/gnu/packages/patches/gcc-strmov-store-file-names.patch index 9f9162855d..7358de3326 100644 --- a/gnu/packages/patches/gcc-strmov-store-file-names.patch +++ b/gnu/packages/patches/gcc-strmov-store-file-names.patch @@ -15,7 +15,7 @@ and . --- gcc-5.3.0/gcc/builtins.c 2016-10-18 10:50:46.080616285 +0200 +++ gcc-5.3.0/gcc/builtins.c 2016-11-09 15:26:43.693042737 +0100 -@@ -3192,6 +3192,54 @@ determine_block_size (tree len, rtx len_ +@@ -3192,6 +3192,58 @@ determine_block_size (tree len, rtx len_ GET_MODE_MASK (GET_MODE (len_rtx))); } @@ -35,9 +35,13 @@ and . + if (TREE_CODE (str) == VAR_DECL + && TREE_STATIC (str) + && TREE_READONLY (str)) -+ /* STR may be a 'static const' variable whose initial value -+ is a string constant. See . */ -+ str = DECL_INITIAL (str); ++ { ++ /* STR may be a 'static const' variable whose initial value ++ is a string constant. See . */ ++ str = DECL_INITIAL (str); ++ if (str == NULL_TREE) ++ return false; ++ } + + if (TREE_CODE (str) != STRING_CST) + return false; From dbe1bd5dd9ca7a8a52e679f573b409340a2632d6 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 22 Jun 2018 23:34:04 +0200 Subject: [PATCH 047/435] gnu: doxygen: Update to 1.8.14. * gnu/packages/documentation.scm (doxygen): Update to 1.8.14. --- gnu/packages/documentation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index e36200bbab..9425df707c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -123,14 +123,14 @@ markup) can be customized and extended by the user.") (define-public doxygen (package (name "doxygen") - (version "1.8.13") + (version "1.8.14") (source (origin (method url-fetch) (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/" name "-" version ".src.tar.gz")) (sha256 (base32 - "0srzawqn3apzrg8hwycwrawdylmmjrndij4spw6xr1vspn3phrmg")) + "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi")) (patches (search-patches "doxygen-test.patch")))) (build-system cmake-build-system) (native-inputs From 8839b6beb163b4bbe11018990d16f927f68e9196 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Jun 2018 10:35:43 +0200 Subject: [PATCH 048/435] gnu: vala: Update to 0.40.7. * gnu/packages/gnome.scm (vala): Update to 0.40.7. [native-inputs]: Add grep and sed. [inputs]: Add graphviz. [arguments]: Fix PKG_CONFIG_PATH before building tests; remove obsolete configure flag. --- gnu/packages/gnome.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6c7b4ebdce..01df6f15e7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -121,6 +121,7 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages xml) #:use-module (gnu packages gl) + #:use-module (gnu packages graphviz) #:use-module (gnu packages compression) #:use-module (gnu packages spice) #:use-module (gnu packages tex) @@ -2033,7 +2034,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.36.3") + (version "0.40.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2041,7 +2042,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0706izk9prxqclm7gv4f63diwnlc1llvfl5sc9ghqbgn076lx2mc")))) + "1v0ak68lrnbb5lyd48j6sxa35vfrii86zmhxdhkdb85k1bv65rmy")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2049,20 +2050,25 @@ passwords in the GNOME keyring.") (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") + (substitute* "valadoc/tests/testrunner.sh" + (("export PKG_CONFIG_PATH=" m) + (string-append m "$PKG_CONFIG_PATH:"))) ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - #t))) - ;; Build the Vala API generator - #:configure-flags '("--enable-vapigen"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) + ("grep" ,grep) + ("sed" ,sed) ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests + (inputs + `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.26.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://live.gnome.org/Vala/") (synopsis "Compiler for the GObject type system") (description From 695c501dbed1fdd974861ab36cc702aaccf33d24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 09:11:03 +0200 Subject: [PATCH 049/435] gnu: freetype: Enable build of freetype-config. * gnu/packages/fontutils.scm (freetype)[arguments]: Add configure flag to enable freetype-config. --- gnu/packages/fontutils.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cf18b55aae..de87f998ae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,10 @@ (sha256 (base32 "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) (build-system gnu-build-system) + (arguments + ;; The use of "freetype-config" is deprecated, but other packages still + ;; depend on it. + `(#:configure-flags (list "--enable-freetype-config"))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs From 3e1ebaab35e96f60bb2736af6c6cea244ae415c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 16:47:41 +0200 Subject: [PATCH 050/435] gnu: texlive: Update to 20180414. * gnu/packages/tex.scm (texlive, texlive-bin, texlive-extra-src, texlive-texmf-src, texlive-texmf): Update to 20180414. (texlive-bin)[source]: Replace patch. [arguments]: Add build phase "use-code-for-new-poppler". --- gnu/packages/tex.scm | 120 +++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b6bc9dda62..6ce36f871d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -76,42 +76,41 @@ (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-extra.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-extra.tar.xz") (sha256 (base32 - "0zvd2zskk78ig114mfj24g15qys41hzqv59fmqpirdbgq9c9gr5g")))) + "0a83kymxc8zmlxjb0y1gf6mx7qnf0hxffwkivwh5yh138y2rfhsv")))) (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-texmf.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-texmf.tar.xz") (sha256 (base32 - "1v69y3kgkbk24f7s4dfkknwd317mqmck5jgpyb35wqgqfy5p0qrz")))) + "1b8zigzg8raxkhhzphcmynf84rbdbj2ym2qkz24v8n0qx82zmqms")))) (define-public texlive-bin (package (name "texlive-bin") - (version "20170524") + (version "20180414") (source (origin - (method url-fetch) - (uri (string-append "ftp://tug.org/historic/systems/texlive/2017/" + (method url-fetch) + (uri (string-append "ftp://tug.org/historic/systems/texlive/2018/" "texlive-" version "-source.tar.xz")) + (sha256 + (base32 + "0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y")) (patches (list - ;; This is required for compatibility with Poppler >= 0.58. - ;; See - ;; and for some discussion. + ;; This is required for compatibility with Poppler 0.64.0 and to fix a + ;; segmentation fault in dvipdfm-x from XeTeX. (origin (method url-fetch) - (uri (string-append "https://git.archlinux.org/svntogit/packages.git/plain" - "/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin" - "&id=ba2de374e2b21ecc4b85cc9777f2f15c4d356c61")) + (uri (string-append "http://www.linuxfromscratch.org/patches/blfs/" + "svn/texlive-" version "-source-upstream_fixes-1.patch")) (file-name "texlive-poppler-compat.patch") (sha256 (base32 - "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n"))))) - (sha256 (base32 - "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81")))) + "0f8vhyj167y4xj0jx47vkybrcacfpxw0wdn1b777yq3xmhlahhlg"))))))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) @@ -175,44 +174,51 @@ (not (or (string-prefix? "aarch64" s) (string-prefix? "mips64" s)))) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unix-detection - ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, - ;; and the "gs" ghostscript executable on Unix. It detects Unix by - ;; checking for the existence of the /usr/bin directory. Since - ;; GuixSD does not have /usr/bin, it is also detected as Windows. - (lambda _ - (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" - (("gswin32c") "gs")) - #t)) - (add-after 'install 'postint - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (texlive-extra (assoc-ref inputs "texlive-extra-src")) - (unpack (assoc-ref %standard-phases 'unpack)) - (patch-source-shebangs - (assoc-ref %standard-phases 'patch-source-shebangs))) - ;; Create symbolic links for the latex variants and their - ;; man pages. - (with-directory-excursion (string-append out "/bin/") - (for-each symlink - '("pdftex" "pdftex" "xetex" "luatex") - '("latex" "pdflatex" "xelatex" "lualatex"))) - (with-directory-excursion (string-append share "/man/man1/") - (symlink "luatex.1" "lualatex.1")) - ;; Unpack texlive-extra and install tlpkg. - (mkdir "texlive-extra") - (with-directory-excursion "texlive-extra" - (apply unpack (list #:source texlive-extra)) - (apply patch-source-shebangs (list #:source texlive-extra)) - (invoke "mv" "tlpkg" share)) - ;; texlua shebangs are not patched by the patch-source-shebangs - ;; phase because the texlua executable does not exist at that - ;; time. - (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) - (with-directory-excursion out - (patch-source-shebangs)))))))) + (modify-phases %standard-phases + (add-after 'unpack 'use-code-for-new-poppler + (lambda _ + (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc" + "texk/web2c/pdftexdir/pdftoepdf.cc") + (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" + "texk/web2c/pdftexdir/pdftosrc.cc") + #t)) + (add-after 'unpack 'fix-unix-detection + ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, + ;; and the "gs" ghostscript executable on Unix. It detects Unix by + ;; checking for the existence of the /usr/bin directory. Since + ;; GuixSD does not have /usr/bin, it is also detected as Windows. + (lambda _ + (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" + (("gswin32c") "gs")) + #t)) + (add-after 'install 'postint + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (texlive-extra (assoc-ref inputs "texlive-extra-src")) + (unpack (assoc-ref %standard-phases 'unpack)) + (patch-source-shebangs + (assoc-ref %standard-phases 'patch-source-shebangs))) + ;; Create symbolic links for the latex variants and their + ;; man pages. + (with-directory-excursion (string-append out "/bin/") + (for-each symlink + '("pdftex" "pdftex" "xetex" "luatex") + '("latex" "pdflatex" "xelatex" "lualatex"))) + (with-directory-excursion (string-append share "/man/man1/") + (symlink "luatex.1" "lualatex.1")) + ;; Unpack texlive-extra and install tlpkg. + (mkdir "texlive-extra") + (with-directory-excursion "texlive-extra" + (apply unpack (list #:source texlive-extra)) + (apply patch-source-shebangs (list #:source texlive-extra)) + (invoke "mv" "tlpkg" share)) + ;; texlua shebangs are not patched by the patch-source-shebangs + ;; phase because the texlua executable does not exist at that + ;; time. + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) + (with-directory-excursion out + (patch-source-shebangs)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. @@ -3926,7 +3932,7 @@ directly generate PDF documents instead of DVI.") (define texlive-texmf (package (name "texlive-texmf") - (version "2017") + (version "20180414") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -3998,7 +4004,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "2017") + (version "20180414") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash) ; for wrap-program From 698ec949079ae9930ff10c869ca1a90264c05210 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 17:01:24 +0200 Subject: [PATCH 051/435] gnu: pango: Propagate fribidi. * gnu/packages/gtk.scm (pango)[inputs]: Move fribidi from here... [propagated-inputs]: ...to here. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6e09681ae0..dfe982c803 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus +;;; Coypright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016 Kei Kebreau @@ -229,13 +229,13 @@ affine transformation (scale, rotation, shear, etc.).") (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. `(("cairo" ,cairo) + ("fribidi" ,fribidi) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) ("harfbuzz" ,harfbuzz))) (inputs - `(("fribidi" ,fribidi) - ("zlib" ,zlib) + `(("zlib" ,zlib) ;; Some packages, such as Openbox, expect Pango to be built with the ;; optional libxft support. From 9ca381f0f1f5fe34f34bb8dc87f7d1739880bca1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 21:02:50 +0200 Subject: [PATCH 052/435] gnu: gnome-backgrounds: Update to 3.28.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.28.0. [build-system]: Use meson-build-system. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 01df6f15e7..794fb17471 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5882,7 +5882,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.26.2") + (version "3.28.0") (source (origin (method url-fetch) @@ -5891,8 +5891,8 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "0kzrh5h0cfby3rhsy31d1w1c0rr3wcc845kv6zibqw1x8v9si2rs")))) - (build-system glib-or-gtk-build-system) + "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj")))) + (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) (home-page "https://git.gnome.org/browse/gnome-backgrounds") From cda7f4bc8ecf331d623c7d37b01931a46830c648 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 22:09:36 +0200 Subject: [PATCH 053/435] gnu: inkscape: Fix build with poppler. * gnu/packages/inkscape.scm (inkscape)[source]: Add upstream patch to fix incompatibility with latest version of poppler. --- gnu/packages/inkscape.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index de9940df1c..8471cf2392 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2014, 2016 Mark H Weaver -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -54,7 +54,16 @@ "inkscape-" version ".tar.bz2")) (sha256 (base32 - "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")))) + "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")) + (patches + (list (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "a600c6438fef2f4c06f9a4a7d933d99fb054a973.diff")) + (file-name "inkscape-poppler-compat.patch") + (sha256 + (base32 + "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))))))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) From 302213b9be577bf6e120405ef4316520403fbee3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 30 Jun 2018 18:06:20 +0200 Subject: [PATCH 054/435] build-system/meson: Use invoke. * guix/build/meson-build-system.scm (configure, build, check, install): Use "invoke" and unconditionally return #t. --- guix/build/meson-build-system.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 7efd433d6c..6dac007a6d 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 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,15 +59,17 @@ (mkdir build-dir) (chdir build-dir) - (zero? (apply system* "meson" args)))) + (apply invoke "meson" args) + #t)) (define* (build #:key parallel-build? #:allow-other-keys) "Build a given meson package." - (zero? (apply system* "ninja" - (if parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '("-j" "1"))))) + (apply invoke "ninja" + (if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '("-j" "1"))) + #t) (define* (check #:key test-target parallel-tests? tests? #:allow-other-keys) @@ -75,13 +78,13 @@ (number->string (parallel-job-count)) "1")) (if tests? - (zero? (system* "ninja" test-target)) - (begin - (format #t "test suite not run~%") - #t))) + (invoke "ninja" test-target) + (format #t "test suite not run~%")) + #t) (define* (install #:rest args) - (zero? (system* "ninja" "install"))) + (invoke "ninja" "install") + #t) (define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec" "bin" "sbin")) From cb9a84bd89f9d38f1177afd86e8a04080709588b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:02 +0300 Subject: [PATCH 055/435] gnu: gdbm: Update to 1.16. * gnu/packages/databases.scm (gdbm): Update to 1.16. --- 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 9cbdf616c0..bb70005064 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.14.1") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd")))) + "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") From 1aa5c246e91c0c9f926783c110322c4953249349 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:57 +0300 Subject: [PATCH 056/435] gnu: bash: Update to patch level 23. * gnu/packages/bash.scm (%patch-series-4.4): Add patches 20 through 23. --- gnu/packages/bash.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 64f7782f58..46cb13048d 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -79,7 +79,11 @@ (16 "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh") (17 "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp") (18 "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v") - (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7"))) + (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7") + (20 "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q") + (21 "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx") + (22 "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5") + (23 "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of From 38a978154effb371c2e845e4e16cc59f32cc7176 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jun 2018 21:19:51 +0200 Subject: [PATCH 057/435] gnu: cmake: Update to 3.11.4. * gnu/packages/cmake.scm (cmake): Update to 3.11.4. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 00ddc625f1..4146e55a12 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.3") + (version "3.11.4") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "16n310smy3h4q3i7l1hcv0hlrwdvh082f1r7s36c3zxppsv3aw98")) + "1xc7zwmyfa7hdarwb4hmfhhs7i5bv9q6499y93hy6zcig2glx1lg")) (modules '((guix build utils))) (snippet '(begin From 9dfbf405864e988359461408d75b6938c97aef33 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 10:59:58 -0400 Subject: [PATCH 058/435] gnu: libgcrypt: Ungraft. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.3. [replacement]: Remove field. (libgcrypt/fixed): Remove variable. --- gnu/packages/gnupg.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9564afbb90..5365c2b528 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -107,16 +107,15 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package - (replacement libgcrypt/fixed) (name "libgcrypt") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8")))) + "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) @@ -142,19 +141,6 @@ generation.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgcrypt"))))) -(define libgcrypt/fixed - (package - (inherit libgcrypt) - (name "libgcrypt") - (version "1.8.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" - version ".tar.bz2")) - (sha256 - (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))))) - (define-public libassuan (package (name "libassuan") From 7de44023a2d357ee634cd015d685a334a8eedcbf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 11:09:20 -0400 Subject: [PATCH 059/435] gnu: libgpg-error: Update to 1.31. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.31. (libgpg-error-1.31): Remove variable. (gpgme)[propagated-inputs]: Replace libgpg-error-1.31 with libgpg-error. --- gnu/packages/gnupg.scm | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5365c2b528..47fb904f77 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -70,7 +70,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.29") + (version "1.31") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.bz2")) (sha256 (base32 - "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc")))) + "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") @@ -91,20 +91,6 @@ Daemon and possibly more in the future.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgpg-error"))))) -;; Some packages (e.g. GPGME) require a newer libgpg-error to deal with -;; error codes from recent GnuPG. Remove this in the next rebuild cycle. -(define-public libgpg-error-1.31 - (package - (inherit libgpg-error) - (version "1.31") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" - version ".tar.bz2")) - (sha256 - (base32 - "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))))) - (define-public libgcrypt (package (name "libgcrypt") @@ -389,7 +375,7 @@ libskba (working with X.509 certificates and CMS data).") `(("gnupg" ,gnupg))) (propagated-inputs ;; Needs to be propagated because gpgme.h includes gpg-error.h. - `(("libgpg-error" ,libgpg-error-1.31))) + `(("libgpg-error" ,libgpg-error))) (inputs `(("libassuan" ,libassuan))) (home-page "https://www.gnupg.org/related_software/gpgme/") From 9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jul 2018 11:21:47 +0300 Subject: [PATCH 060/435] gnu: lcms: Use libjpeg. * gnu/packages/ghostscript.scm (lcms)[inputs]: Replace libpjeg@8 with libjpeg. --- gnu/packages/ghostscript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0a6043ba65..49e035f0b4 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -52,7 +52,7 @@ (sha256 (base32 "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8")))) (build-system gnu-build-system) - (inputs `(("libjpeg-8" ,libjpeg-8) + (inputs `(("libjpeg" ,libjpeg) ("libtiff" ,libtiff) ("zlib" ,zlib))) (synopsis "Little CMS, a small-footprint colour management engine") From 49b92a24144b207170703fd09036e893d933997f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Jul 2018 22:39:06 +0300 Subject: [PATCH 061/435] gnu: tk: Add symlink for 'wish' binary. * gnu/packages/tcl.scm (tk)[arguments]: Add custom phase to create a symlink from 'wish' to 'wish8.6'. [home-page]: Use https. --- gnu/packages/tcl.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 97e1427bec..06f4f9bb58 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -25,6 +25,7 @@ (define-module (gnu packages tcl) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages) @@ -145,12 +146,21 @@ X11 GUIs.") (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ (chdir "unix") #t)) + (add-after + 'install 'create-wish-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (symlink (string-append out "/bin/wish" + ,(version-major+minor + (package-version tk))) + (string-append out "/bin/wish"))) + #t)) (add-after 'install 'add-fontconfig-flag (lambda* (#:key inputs outputs #:allow-other-keys) @@ -179,7 +189,7 @@ X11 GUIs.") (propagated-inputs `(("libx11" ,libx11) ("libxext" ,libxext))) - (home-page "http://www.tcl.tk/") + (home-page "https://www.tcl.tk/") (synopsis "Graphical user interface toolkit for Tcl") (description "Tk is a graphical toolkit for building graphical user From 5212c52ce524ebfd78fae5bc68a0499148f3bf80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:11:45 +0200 Subject: [PATCH 062/435] gnu: bzip2: Simplify phase. * gnu/packages/compression.scm (bzip2)[arguments]: Use SCANDIR instead of FIND-FILES when locating the shared library. --- gnu/packages/compression.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d9d15a710d..7453b07eaf 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -246,6 +246,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) + (ice-9 ftw) (srfi srfi-1)) #:phases (modify-phases %standard-phases @@ -274,19 +275,18 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in ;; it create all the (un)versioned symlinks, so we handle it here. (let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib")) - ;; Find the actual library (e.g. "libbz2.so.1.0.6"). - (lib (string-drop - (car (find-files - "." - (lambda (file stat) - (and (string-prefix? "./libbz2.so" file) - (eq? 'regular (stat:type stat)))))) - 2)) - (soversion (string-drop lib (string-length "libbz2.so.")))) + (soname "libbz2.so") + ;; Locate the built library (e.g. "libbz2.so.1.0.6"). + (lib (car (scandir "." + (lambda (file) + (and (string-prefix? soname file) + (eq? 'regular + (stat:type (lstat file)))))))) + (soversion (string-drop lib (+ 1 (string-length soname))))) (install-file lib libdir) (with-directory-excursion libdir ;; Create symlinks libbz2.so.1 -> libbz2.so.1.0, etc. - (let loop ((base "libbz2.so") + (let loop ((base soname) (numbers (string-split soversion #\.))) (unless (null? numbers) (let ((so-file (string-append base "." (car numbers)))) From 45719c1dfb7bdce3c91086e5bed26643dccf8191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:39:01 +0200 Subject: [PATCH 063/435] gnu: bzip2: Add static output. * gnu/packages/compression.scm (bzip2)[arguments]: Add phase for moving static library. [outputs]: New field. --- gnu/packages/compression.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7453b07eaf..c82edcc2ad 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -293,6 +293,14 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (symlink so-file base) (loop so-file (cdr numbers)))))) #t))) + (add-after 'install-shared-lib 'move-static-lib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libbz2.a" (string-append static "/lib")) + (delete-file "libbz2.a") + #t)))) (add-after 'install-shared-lib 'patch-scripts (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) @@ -307,6 +315,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in ,@(if (%current-target-system) '(#:tests? #f) '()))) + (outputs '("out" "static")) (synopsis "High-quality data compression program") (description "bzip2 is a freely available, patent free (see below), high-quality data From 6c4709889c665f194822677dc7a1fcd513e46708 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 13:46:20 +0200 Subject: [PATCH 064/435] gnu: binutils: Update to 2.31.1. * gnu/packages/base.scm (binutils): Update to 2.31.1. (binutils/fixed): Remove variable * gnu/packages/linux.scm (make-linux-libre): Remove AArch64 workaround. * gnu/packages/patches/binutils-aarch64-symbol-relocation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/base.scm | 15 ++------ gnu/packages/linux.scm | 6 ---- .../binutils-aarch64-symbol-relocation.patch | 36 ------------------- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/binutils-aarch64-symbol-relocation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1f09260a4a..80e2a43868 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -585,7 +585,6 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bind-CVE-2018-5738.patch \ - %D%/packages/patches/binutils-aarch64-symbol-relocation.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fef6002b3c..c95ab379af 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -435,14 +435,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.30") + (version "2.31.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg")) + "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) @@ -480,17 +480,6 @@ included.") (license gpl3+) (home-page "https://www.gnu.org/software/binutils/"))) -(define-public binutils/fixed - ;; TODO: Incorporate this in binutils during the next rebuild cycle. - (hidden-package - (package - (inherit binutils) - (source (origin - (inherit (package-source binutils)) - (patches (append (origin-patches (package-source binutils)) - (search-patches - "binutils-aarch64-symbol-relocation.patch")))))))) - (define* (make-ld-wrapper name #:key (target (const #f)) binutils diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ff3024d574..76c67f4588 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -296,12 +296,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (or (%current-target-system) (%current-system))) ((or "x86_64" "i386") `(("gcc" ,gcc-7))) - ("arm64" - ;; Work around a binutils 2.30 bug where some kernel symbols would - ;; be incorrectly marked as relocatable: - ;; . - `(("ld-wrapper" ,(make-ld-wrapper "ld-wrapper" - #:binutils binutils/fixed)))) (_ '())) ,@(match (and configuration-file diff --git a/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch b/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch deleted file mode 100644 index fbd596862b..0000000000 --- a/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix a regression in Binutils 2.30 where some symbols are incorrectly assumed -to be addresses: - -https://sourceware.org/bugzilla/show_bug.cgi?id=22764 - -Patch taken from upstream (with ChangeLog entries and tests omitted): - -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=279b2f94168ee91e02ccd070d27c983fc001fe12 - -diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c -index af448f9..2737773 100644 ---- a/bfd/elfnn-aarch64.c -+++ b/bfd/elfnn-aarch64.c -@@ -7189,10 +7189,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, - #if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: - #endif -- if (bfd_link_pic (info) -- && (sec->flags & SEC_ALLOC) != 0 -- && (sec->flags & SEC_READONLY) != 0) -+ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) - { -+ if (h != NULL -+ /* This is an absolute symbol. It represents a value instead -+ of an address. */ -+ && ((h->root.type == bfd_link_hash_defined -+ && bfd_is_abs_section (h->root.u.def.section)) -+ /* This is an undefined symbol. */ -+ || h->root.type == bfd_link_hash_undefined)) -+ break; -+ -+ /* For local symbols, defined global symbols in a non-ABS section, -+ it is assumed that the value is an address. */ - int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; - _bfd_error_handler - /* xgettext:c-format */ From 50849734e986a5824bcca20fe64b2886f8f1a42b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:14:59 +0200 Subject: [PATCH 065/435] gnu: pcre: Install static libraries to separate output. * gnu/packages/pcre.scm (pcre)[outputs]: Add "static". [arguments]: Add 'move-static-libs' phase. --- gnu/packages/pcre.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 5719b7bb45..21752e9cfd 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -50,7 +50,8 @@ (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) - "doc")) ;1.8 MiB of HTML + "doc" ;1.8 MiB of HTML + "static")) ;1.8 MiB static libraries (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) @@ -63,7 +64,19 @@ "--enable-unicode-properties" "--enable-pcre16" "--enable-pcre32" - "--enable-jit"))) + "--enable-jit") + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((source (string-append (assoc-ref outputs "out") "/lib")) + (static (string-append (assoc-ref outputs "static") "/lib"))) + (mkdir-p static) + (for-each (lambda (lib) + (link lib (string-append static "/" + (basename lib))) + (delete-file lib)) + (find-files source "\\.a$")) + #t)))))) (synopsis "Perl Compatible Regular Expressions") (description "The PCRE library is a set of functions that implement regular expression From ebd551705c99db0d82c875001d0ad44c7408883e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:05:46 +0200 Subject: [PATCH 066/435] gnu: fftw: Update to 3.3.8. * gnu/packages/algebra.scm (fftw): Update to 3.3.8. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 45d15d6fd5..045daef96a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -523,14 +523,14 @@ a C program.") (define-public fftw (package (name "fftw") - (version "3.3.7") + (version "3.3.8") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-" version".tar.gz")) (sha256 (base32 - "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v")))) + "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1")))) (build-system gnu-build-system) (arguments `(#:configure-flags From 1d3de9796778f5a11dc91c666ec2f19e8dd56969 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:37:08 +0200 Subject: [PATCH 067/435] gnu: libgc: Update to 7.6.6. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.6. [source](uri): Change to the new download location, as noted on the home page. --- gnu/packages/bdw-gc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index eba30217da..42ec61e324 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -30,14 +30,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.4") + (version "7.6.6") (source (origin (method url-fetch) - (uri (string-append "http://www.hboehm.info/gc/gc_source/gc-" - version ".tar.gz")) + (uri (string-append "https://github.com/ivmai/bdwgc/releases" + "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r")))) + "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79")))) (build-system gnu-build-system) (arguments `(#:configure-flags From f94a8654d686b7ec36fdb28b6f0e8b0f48b14447 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 00:21:02 +0200 Subject: [PATCH 068/435] gnu: perl: Update to 5.28.0. * gnu/packages/patches/perl-deterministic-ordering.patch: Adjust path. * gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch, gnu/packages/patches/perl-file-path-CVE-2017-6512.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/perl.scm (perl): Update to 5.28.0. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../perl-archive-tar-CVE-2018-12015.patch | 36 ---- .../patches/perl-deterministic-ordering.patch | 6 +- .../perl-file-path-CVE-2017-6512.patch | 173 ------------------ gnu/packages/perl.scm | 6 +- 5 files changed, 5 insertions(+), 218 deletions(-) delete mode 100644 gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch delete mode 100644 gnu/packages/patches/perl-file-path-CVE-2017-6512.patch diff --git a/gnu/local.mk b/gnu/local.mk index 80e2a43868..41a10f5916 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1001,8 +1001,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perf-gcc-ice.patch \ - %D%/packages/patches/perl-archive-tar-CVE-2018-12015.patch \ - %D%/packages/patches/perl-file-path-CVE-2017-6512.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch b/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch deleted file mode 100644 index 6460cf5855..0000000000 --- a/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2018-12015: - -https://security-tracker.debian.org/tracker/CVE-2018-12015 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12015 -https://rt.cpan.org/Ticket/Display.html?id=125523 - -Patch taken from this upstream commit and adapted to apply to -the bundled copy in the Perl distribution: - -https://github.com/jib/archive-tar-new/commit/ae65651eab053fc6dc4590dbb863a268215c1fc5 - -diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm -index 6244369..a83975f 100644 ---- a/cpan/Archive-Tar/lib/Archive/Tar.pm -+++ b/cpan/Archive-Tar/lib/Archive/Tar.pm -@@ -845,6 +845,20 @@ sub _extract_file { - return; - } - -+ ### If a file system already contains a block device with the same name as -+ ### the being extracted regular file, we would write the file's content -+ ### to the block device. So remove the existing file (block device) now. -+ ### If an archive contains multiple same-named entries, the last one -+ ### should replace the previous ones. So remove the old file now. -+ ### If the old entry is a symlink to a file outside of the CWD, the new -+ ### entry would create a file there. This is CVE-2018-12015 -+ ### . -+ if (-l $full || -e _) { -+ if (!unlink $full) { -+ $self->_error( qq[Could not remove old file '$full': $!] ); -+ return; -+ } -+ } - if( length $entry->type && $entry->is_file ) { - my $fh = IO::File->new; - $fh->open( $full, '>' ) or ( diff --git a/gnu/packages/patches/perl-deterministic-ordering.patch b/gnu/packages/patches/perl-deterministic-ordering.patch index 92e33ef135..be63d5cde3 100644 --- a/gnu/packages/patches/perl-deterministic-ordering.patch +++ b/gnu/packages/patches/perl-deterministic-ordering.patch @@ -12,10 +12,10 @@ reproducibility. cpan/Devel-PPPort/PPPort_xs.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/cpan/Devel-PPPort/PPPort_xs.PL b/cpan/Devel-PPPort/PPPort_xs.PL +diff --git a/dist/Devel-PPPort/PPPort_xs.PL b/dist/Devel-PPPort/PPPort_xs.PL index 5f18940..149f2fe 100644 ---- a/cpan/Devel-PPPort/PPPort_xs.PL -+++ b/cpan/Devel-PPPort/PPPort_xs.PL +--- a/dist/Devel-PPPort/PPPort_xs.PL ++++ b/dist/Devel-PPPort/PPPort_xs.PL @@ -38,7 +38,7 @@ END my $file; my $sec; diff --git a/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch b/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch deleted file mode 100644 index 28ab067599..0000000000 --- a/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch +++ /dev/null @@ -1,173 +0,0 @@ -Fix CVE-2017-6512: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6512 -https://rt.cpan.org/Public/Bug/Display.html?id=121951 - -Patch copied from Debian, adapted to apply to the copy of File::Path in Perl -5.24.0. - -https://github.com/jkeenan/File-Path/commit/e5ef95276ee8ad471c66ee574a5d42552b3a6af2 -https://anonscm.debian.org/cgit/perl/perl.git/diff/debian/patches/fixes/file_path_chmod_race.diff?id=e7b50f8fb6413f8ddfbbfda2d531615fb029e2d3 - -From d760748be0efca7c05454440e24f3df77bf7cf5d Mon Sep 17 00:00:00 2001 -From: John Lightsey -Date: Tue, 2 May 2017 12:03:52 -0500 -Subject: Prevent directory chmod race attack. - -CVE-2017-6512 is a race condition attack where the chmod() of directories -that cannot be entered is misused to change the permissions on other -files or directories on the system. This has been corrected by limiting -the directory-permission loosening logic to systems where fchmod() is -supported. - -[Backported (whitespace adjustments) to File-Path 2.12 / perl 5.24 by -Dominic Hargreaves for Debian.] - -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=121951 -Bug-Debian: https://bugs.debian.org/863870 -Patch-Name: fixes/file_path_chmod_race.diff ---- - cpan/File-Path/lib/File/Path.pm | 39 +++++++++++++++++++++++++-------------- - cpan/File-Path/t/Path.t | 40 ++++++++++++++++++++++++++-------------- - 2 files changed, 51 insertions(+), 28 deletions(-) - -diff --git a/cpan/File-Path/lib/File/Path.pm b/cpan/File-Path/lib/File/Path.pm -index 034da1e..a824cc8 100644 ---- a/cpan/File-Path/lib/File/Path.pm -+++ b/cpan/File-Path/lib/File/Path.pm -@@ -354,21 +354,32 @@ sub _rmtree { - - # see if we can escalate privileges to get in - # (e.g. funny protection mask such as -w- instead of rwx) -- $perm &= oct '7777'; -- my $nperm = $perm | oct '700'; -- if ( -- !( -- $arg->{safe} -- or $nperm == $perm -- or chmod( $nperm, $root ) -- ) -- ) -- { -- _error( $arg, -- "cannot make child directory read-write-exec", $canon ); -- next ROOT_DIR; -+ # This uses fchmod to avoid traversing outside of the proper -+ # location (CVE-2017-6512) -+ my $root_fh; -+ if (open($root_fh, '<', $root)) { -+ my ($fh_dev, $fh_inode) = (stat $root_fh )[0,1]; -+ $perm &= oct '7777'; -+ my $nperm = $perm | oct '700'; -+ local $@; -+ if ( -+ !( -+ $arg->{safe} -+ or $nperm == $perm -+ or !-d _ -+ or $fh_dev ne $ldev -+ or $fh_inode ne $lino -+ or eval { chmod( $nperm, $root_fh ) } -+ ) -+ ) -+ { -+ _error( $arg, -+ "cannot make child directory read-write-exec", $canon ); -+ next ROOT_DIR; -+ } -+ close $root_fh; - } -- elsif ( !chdir($root) ) { -+ if ( !chdir($root) ) { - _error( $arg, "cannot chdir to child", $canon ); - next ROOT_DIR; - } -diff --git a/cpan/File-Path/t/Path.t b/cpan/File-Path/t/Path.t -index ff52fd6..956ca09 100644 ---- a/cpan/File-Path/t/Path.t -+++ b/cpan/File-Path/t/Path.t -@@ -3,7 +3,7 @@ - - use strict; - --use Test::More tests => 127; -+use Test::More tests => 126; - use Config; - use Fcntl ':mode'; - use lib 't/'; -@@ -18,6 +18,13 @@ BEGIN { - - my $Is_VMS = $^O eq 'VMS'; - -+my $fchmod_supported = 0; -+if (open my $fh, curdir()) { -+ my ($perm) = (stat($fh))[2]; -+ $perm &= 07777; -+ eval { $fchmod_supported = chmod( $perm, $fh); }; -+} -+ - # first check for stupid permissions second for full, so we clean up - # behind ourselves - for my $perm (0111,0777) { -@@ -299,16 +306,19 @@ is($created[0], $dir, "created directory (old style 3 mode undef) cross-check"); - - is(rmtree($dir, 0, undef), 1, "removed directory 3 verbose undef"); - --$dir = catdir($tmp_base,'G'); --$dir = VMS::Filespec::unixify($dir) if $Is_VMS; -+SKIP: { -+ skip "fchmod of directories not supported on this platform", 3 unless $fchmod_supported; -+ $dir = catdir($tmp_base,'G'); -+ $dir = VMS::Filespec::unixify($dir) if $Is_VMS; - --@created = mkpath($dir, undef, 0200); -+ @created = mkpath($dir, undef, 0400); - --is(scalar(@created), 1, "created write-only dir"); -+ is(scalar(@created), 1, "created read-only dir"); - --is($created[0], $dir, "created write-only directory cross-check"); -+ is($created[0], $dir, "created read-only directory cross-check"); - --is(rmtree($dir), 1, "removed write-only dir"); -+ is(rmtree($dir), 1, "removed read-only dir"); -+} - - # borderline new-style heuristics - if (chdir $tmp_base) { -@@ -450,26 +460,28 @@ SKIP: { - } - - SKIP : { -- my $skip_count = 19; -+ my $skip_count = 18; - # this test will fail on Windows, as per: - # http://perldoc.perl.org/perlport.html#chmod - - skip "Windows chmod test skipped", $skip_count - if $^O eq 'MSWin32'; -+ skip "fchmod() on directories is not supported on this platform", $skip_count -+ unless $fchmod_supported; - my $mode; - my $octal_mode; - my @inputs = ( -- 0777, 0700, 0070, 0007, -- 0333, 0300, 0030, 0003, -- 0111, 0100, 0010, 0001, -- 0731, 0713, 0317, 0371, 0173, 0137, -- 00 ); -+ 0777, 0700, 0470, 0407, -+ 0433, 0400, 0430, 0403, -+ 0111, 0100, 0110, 0101, -+ 0731, 0713, 0317, 0371, -+ 0173, 0137); - my $input; - my $octal_input; -- $dir = catdir($tmp_base, 'chmod_test'); - - foreach (@inputs) { - $input = $_; -+ $dir = catdir($tmp_base, sprintf("chmod_test%04o", $input)); - # We can skip from here because 0 is last in the list. - skip "Mode of 0 means assume user defaults on VMS", 1 - if ($input == 0 && $Is_VMS); diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 27b49e6652..3eb5b1eacf 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -61,18 +61,16 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.26.2") + (version "5.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")) + "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky")) (patches (search-patches - "perl-file-path-CVE-2017-6512.patch" "perl-no-sys-dirs.patch" - "perl-archive-tar-CVE-2018-12015.patch" "perl-autosplit-default-time.patch" "perl-deterministic-ordering.patch" "perl-reproducible-build-date.patch")))) From 463ad503b1a0e107e2b6b8317745acc13f49ad2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 01:03:12 +0200 Subject: [PATCH 069/435] gnu: readline: Update to 7.0.5. * gnu/packages/readline.scm (%patch-series-7.0): Add patch 4 and 5. --- gnu/packages/readline.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 4695e9fc71..59fa8af8af 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -48,7 +48,9 @@ (patch-series (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs") (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7") - (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy"))) + (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy") + (4 "0r3bbaf12iz8m02z6p3fzww2m365fhn71xmzab2p62gj54s6h9gr") + (5 "0lxpa4f72y2nsgj6fgrhjk2nmmxvccys6aciwfxwchb5f21rq5fa"))) (define-public readline (package From 78a9a2501d121c370684a86ffe105ffdc8ca7d70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 23:15:12 +0200 Subject: [PATCH 070/435] gnu: texinfo: Fix FTBFS with Perl 5.28. * gnu/packages/patches/texinfo-perl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/texinfo.scm (texinfo)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/texinfo-perl-compat.patch | 51 +++++++++++++++++++ gnu/packages/texinfo.scm | 1 + 3 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/texinfo-perl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 41a10f5916..45a7f06032 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1137,6 +1137,7 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ + %D%/packages/patches/texinfo-perl-compat.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ diff --git a/gnu/packages/patches/texinfo-perl-compat.patch b/gnu/packages/patches/texinfo-perl-compat.patch new file mode 100644 index 0000000000..a7348fde0d --- /dev/null +++ b/gnu/packages/patches/texinfo-perl-compat.patch @@ -0,0 +1,51 @@ +Fix compatibility with newer Perls. + +The first patch is taken from upstream: +https://svn.savannah.gnu.org/viewvc/texinfo?view=revision&revision=8008 + +The second gets rid of a deprecation warning that breaks some tests. +Taken from Fedora: . + +--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2017/04/30 14:57:26 7765 ++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018/07/13 15:39:29 8008 +@@ -248,6 +248,11 @@ + + dTHX; + ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ switch_to_global_locale(); ++#endif ++ + if (setlocale (LC_CTYPE, "en_US.UTF-8") + || setlocale (LC_CTYPE, "en_US.utf8")) + goto success; +@@ -320,6 +325,10 @@ + { + success: ; + free (utf8_locale); ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ sync_locale(); ++#endif + /* + fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); + fprintf (stderr, "character encoding is: %s\n", + +diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm +--- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 ++++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 +@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 109a24bf62..5fe7f1ec9c 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -37,6 +37,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) + (patches (search-patches "texinfo-perl-compat.patch")) (sha256 (base32 "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) From 56cd03d68673484d70841cd23a48c2324cbd021b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:40:55 +0200 Subject: [PATCH 071/435] gnu: libuv: Update to 1.22.0. * gnu/packages/libevent.scm (libuv): Update to 1.22.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 3e4768b401..bd7ea6f33e 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.20.3") + (version "1.22.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0yc569q47gidqsdsbx30l6i60lwh97pavdnwac0gv9f72vcsmdrv")))) + "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases From d64edd2c81499cc2b5013d31f570463ee6a00752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:44:10 +0200 Subject: [PATCH 072/435] gnu: libuv: Drop redundant 'autogen' phase. * gnu/packages/libevent.scm (libuv)[arguments]: Remove #:phases. --- gnu/packages/libevent.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bd7ea6f33e..18e443be80 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -131,14 +131,7 @@ limited support for fork events.") "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - ;; Fashionable people don't run 'make dist' these days, so - ;; we need to do that ourselves. - (invoke "sh" "autogen.sh")))) - - ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. + '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) From f2ca4fa5c34ba719fae8a2fd86cacc10c6096481 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:48:42 +0200 Subject: [PATCH 073/435] gnu: cmake: Update to 3.12.0. * gnu/packages/cmake.scm (cmake): Update to 3.12.0. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 4146e55a12..e113048690 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.4") + (version "3.12.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1xc7zwmyfa7hdarwb4hmfhhs7i5bv9q6499y93hy6zcig2glx1lg")) + "0scxdgdrkrri0f5fm7cb969vcl4k1wanmhaa22fh9ffdys81ly6h")) (modules '((guix build utils))) (snippet '(begin From c9566534136b32519b200878c846a0017409d603 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:54:34 +0200 Subject: [PATCH 074/435] gnu: harfbuzz: Update to 1.8.4. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.4. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 76346f6bb2..6aa79bb779 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.8.0") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1")))) + "1za5lmzz4j2plh6a12llnwxyy7dnspsykjlq1qp9x9hdza32yn9w")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo From 7da8ba2eaeb17382ef3c26051e244bc94ef4ae51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:56:27 +0200 Subject: [PATCH 075/435] gnu: pango: Update to 1.42.2. * gnu/packages/gtk.scm (pango): Update to 1.42.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6aa79bb779..ff2f9827b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -216,7 +216,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.1") + (version "1.42.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -224,7 +224,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli")))) + "1qm17k7r4299jbvqifk469q4hs5qj9j19kr4h9nfy5h4sjs1dr5i")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. From 0d517c073d5f6b7f4cddc57013d75c7fb19a9c75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 15:00:43 +0200 Subject: [PATCH 076/435] gnu: util-linux: Update to 2.32.1. * gnu/packages/linux.scm (util-linux): Update to 2.32.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 76c67f4588..32ae759659 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -560,7 +560,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.32") + (version "2.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -568,7 +568,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc")) + "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet From 08b87ab0dfa4bae0eb57f3d8915f655bf20d94fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Jul 2018 17:54:54 +0200 Subject: [PATCH 077/435] gnu: pcre: Update to 8.42. * gnu/packages/pcre.scm (pcre): Update to 8.42. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 21752e9cfd..564a23d012 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -35,7 +35,7 @@ (define-public pcre (package (name "pcre") - (version "8.41") + (version "8.42") (source (origin (method url-fetch) (uri (list @@ -46,7 +46,7 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76")))) + "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c")))) (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) From 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Jul 2018 17:58:16 +0200 Subject: [PATCH 078/435] Revert "packages: Enable threaded compression of source tarballs." Threaded compression makes tarballs non-deterministic: the result depends on the number of threads used for compressing. See . This reverts commit c8a3dea847bb9f87fa1876d0c6c3356d6226f121. --- guix/packages.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index c762fa7c39..cc1f11ace2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -629,11 +629,6 @@ specifies modules in scope when evaluating SNIPPET." (apply invoke (string-append #+tar "/bin/tar") "cvf" #$output - ;; The bootstrap xz does not support - ;; threaded compression (introduced in - ;; 5.2.0), but it ignores the extra flag. - (string-append "--use-compress-program=" - #+xz "/bin/xz --threads=0") ;; avoid non-determinism in the archive "--mtime=@0" "--owner=root:0" From 5a0b3c34088d36ac03e705dea573f62f84d96f11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:40 +0200 Subject: [PATCH 079/435] gnu: openssl: Incorporate grafted changes. * gnu/packages/tls.scm (openssl)[replacement]: Remove field. [source](patches): Add 'openssl-1.0.2-CVE-2018-0495.patch' and 'openssl-1.0.2-CVE-2018-0732.patch'. (openssl/fixed): Remove variable. --- gnu/packages/tls.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f1dca66552..e99b7a83ba 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -260,7 +260,6 @@ required structures.") (define-public openssl (package (name "openssl") - (replacement openssl/fixed) (version "1.0.2o") (source (origin (method url-fetch) @@ -275,6 +274,8 @@ required structures.") (base32 "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc")) (patches (search-patches "openssl-runpath.patch" + "openssl-1.0.2-CVE-2018-0495.patch" + "openssl-1.0.2-CVE-2018-0732.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -397,15 +398,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl/fixed - (package - (inherit openssl) - (source (origin - (inherit (package-source openssl)) - (patches (append (origin-patches (package-source openssl)) - (search-patches "openssl-1.0.2-CVE-2018-0495.patch" - "openssl-1.0.2-CVE-2018-0732.patch"))))))) - (define-public openssl-next (package (inherit openssl) From 99cfdfb10c7bf42911f2ff59ef3489761ebc063d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:48 +0200 Subject: [PATCH 080/435] gnu: ghostscript: Incorporate grafted changes. * gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field. (source)[patches]: Add 'ghostscript-CVE-2018-10194.patch'. (ghostscript/fixed): Remove variable. --- gnu/packages/ghostscript.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index bc14fd0be0..cd7cd604fd 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -132,7 +132,6 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (replacement ghostscript/fixed) (version "9.23") (source (origin @@ -145,6 +144,7 @@ printing, and psresize, for adjusting page sizes.") (base32 "1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz")) (patches (search-patches "ghostscript-runpath.patch" + "ghostscript-CVE-2018-10194.patch" "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -251,16 +251,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define-public ghostscript/fixed - (hidden-package - (package - (inherit ghostscript) - (source - (origin - (inherit (package-source ghostscript)) - (patches (append (origin-patches (package-source ghostscript)) - (search-patches "ghostscript-CVE-2018-10194.patch")))))))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) From 41e2e58a2afce2ad55f1f90374d9f92af27f3d6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:44:40 +0200 Subject: [PATCH 081/435] gnu: libtiff: Incorporate grafted changes. * gnu/packages/image.scm (libtiff)[replacement]: Remove field. [source](patches): Add 'libtiff-CVE-2018-8905.patch' and 'libtiff-CVE-2018-10963.patch'. (libtiff/fixed): Remove variable. --- gnu/packages/image.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a330a31599..1c3a2b7d2b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -394,7 +394,6 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (replacement libtiff/fixed) (version "4.0.9") (source (origin @@ -405,7 +404,9 @@ extracting icontainer icon files.") (base32 "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf")) (patches (search-patches "libtiff-CVE-2017-9935.patch" - "libtiff-CVE-2017-18013.patch")))) + "libtiff-CVE-2017-18013.patch" + "libtiff-CVE-2018-8905.patch" + "libtiff-CVE-2018-10963.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation @@ -427,17 +428,6 @@ collection of tools for doing simple manipulations of TIFF images.") "See COPYRIGHT in the distribution.")) (home-page "http://www.simplesystems.org/libtiff/"))) -(define libtiff/fixed - (package - (inherit libtiff) - (source - (origin - (inherit (package-source libtiff)) - (patches - (append (origin-patches (package-source libtiff)) - (search-patches "libtiff-CVE-2018-8905.patch" - "libtiff-CVE-2018-10963.patch"))))))) - (define-public leptonica (package (name "leptonica") From dcf105da63993abd25e76ae8b152deb09baf5cf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:46:41 +0200 Subject: [PATCH 082/435] gnu: curl: Remove graft for 7.61.0. * gnu/packages/curl.scm (curl): Update to 7.61.0. [replacement]: Remove field. (curl-7.61.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index e724fd147b..8bed48fd87 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.59.0") - (replacement curl-7.61.0) + (version "7.61.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1z310hrjm2vmbcpkyp81dcmj9rk127zkjyawpy2pah0nz6yslkp4")))) + "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -141,19 +140,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.0 - (package - (inherit curl) - (version "7.61.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))))) - (define-public kurly (package (name "kurly") From fa258af20c29ad7e0c300553eb5cde2bb7ef15f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:52:22 +0200 Subject: [PATCH 083/435] gnu: libgpg-error: Update to 1.32. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.32. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index cb0954f5a8..54b44996ef 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -70,7 +70,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.bz2")) (sha256 (base32 - "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))) + "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") From 52f1687dc7bbe0928f801ab2f1a9e3716930e150 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:04:07 +0200 Subject: [PATCH 084/435] gnu: docbook-xsl: Delete bundled jars. * gnu/packages/docbook.scm (docbook-xsl)[source](modules, snippet): New fields. --- gnu/packages/docbook.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 1c00e56d6d..1e5379b020 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -138,11 +138,15 @@ by no means limited to these applications.) This package provides XML DTDs.") (method url-fetch) (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" version "/docbook-xsl-" version ".tar.bz2")) - ;; Note: If removing all patches, the XZ dependency is no longer needed. (patches (search-patches "docbook-xsl-nonrecursive-string-subst.patch")) (sha256 (base32 - "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")))) + "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "\\.jar$")) + #t)))) (build-system trivial-build-system) (arguments `(#:builder (let ((name-version (string-append ,name "-" ,version))) @@ -168,7 +172,7 @@ by no means limited to these applications.) This package provides XML DTDs.") #t)) #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) - ("xz" ,xz) + ("xz" ,xz) ;needed for repacked tarballs ("tar" ,tar))) (home-page "http://docbook.org") (synopsis "DocBook XSL style sheets for document authoring") From 95bbab76cdaa1d203cfeafe63d436c8d222c69de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:36:46 +0200 Subject: [PATCH 085/435] gnu: fribidi: Update to 1.0.5. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.5. [arguments]: Remove. --- gnu/packages/fribidi.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 10920aa200..dfd2a77c20 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -36,11 +36,8 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl")))) + (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list "--disable-docs"))) ; TODO: enable; requires c2man (synopsis "Implementation of the Unicode bidirectional algorithm") (description "GNU FriBidi is an implementation of the Unicode Bidirectional From 3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:43:35 +0200 Subject: [PATCH 086/435] gnu: icu4c: Update to 62.1. * gnu/packages/icu4c.scm (icu4c): Update to 62.1. --- gnu/packages/icu4c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index c4d3703794..61333a3e75 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -32,7 +32,7 @@ (define-public icu4c (package (name "icu4c") - (version "61.1") + (version "62.1") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "1vxgkx0cyvdy00a9yd5khkx14r5kcndkax2wa99klm52x2dgh1yh")))) + (base32 "18ssgnwzzpm1g1fvbm9h1fvryiwxvvn5wc3fdakdsl33cs6qdn9x")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) From 28c4905b123e7de85e5d2b654f4d15289625f2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 26 Jul 2018 22:58:30 +0200 Subject: [PATCH 087/435] packages: 'patch-and-repack' compresses tarballs again. * guix/packages.scm (patch-and-repack): Add missing "a" in "tar cvfa". Fixes a regression introduced in 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 whereby we'd always create uncompressed tarballs. --- guix/packages.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3d9f281b74..01045ded07 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -628,7 +628,7 @@ specifies modules in scope when evaluating SNIPPET." #:fail-on-error? #t))))) (apply invoke (string-append #+tar "/bin/tar") - "cvf" #$output + "cvfa" #$output ;; avoid non-determinism in the archive "--mtime=@0" "--owner=root:0" From 8c7bebd6ea99f0ee4fb46a48ecb1883754c8cdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 26 Jul 2018 22:59:49 +0200 Subject: [PATCH 088/435] gexp: Remove backward compatibility hack for 'imported-files'. * guix/gexp.scm (gexp->derivation): Remove #:import-creates-derivation?. (imported-files): Remove #:derivation? and adjust callers. (imported-modules), compiled-modules): Likewise. * guix/packages.scm (patch-and-repack): Adjust 'gexp->derivation' call. --- guix/gexp.scm | 28 ++++------------------------ guix/packages.scm | 3 --- tests/gexp.scm | 6 +++--- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index ffc976d61b..f358102782 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -601,12 +601,6 @@ names and file names suitable for the #:allowed-references argument to allowed-references disallowed-references leaked-env-vars local-build? (substitutable? #t) - - ;; TODO: This parameter is transitional; it's here - ;; to avoid a full rebuild. Remove it on the next - ;; rebuild cycle. - import-creates-derivation? - deprecation-warnings (script-name (string-append name "-builder"))) "Return a derivation NAME that runs EXP (a gexp) with GUILE-FOR-BUILD (a @@ -701,8 +695,6 @@ The other arguments are as for 'derivation'." extensions)) (modules (if (pair? %modules) (imported-modules %modules - #:derivation? - import-creates-derivation? #:system system #:module-path module-path #:guile guile-for-build @@ -711,8 +703,6 @@ The other arguments are as for 'derivation'." (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules - #:derivation? - import-creates-derivation? #:system system #:module-path module-path #:extensions extensions @@ -1141,11 +1131,6 @@ to the source files instead of copying them." (define* (imported-files files #:key (name "file-import") - - ;; TODO: Remove this parameter on the next rebuild - ;; cycle. - (derivation? #f) - ;; The following parameters make sense when creating ;; an actual derivation. (system (%current-system)) @@ -1157,11 +1142,10 @@ file-like objects and not local file names.) FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, as returned by 'local-file' for example." - (if (or derivation? - (any (match-lambda - ((_ . (? struct? source)) #t) - (_ #f)) - files)) + (if (any (match-lambda + ((_ . (? struct? source)) #t) + (_ #f)) + files) (imported-files/derivation files #:name name #:symlink? derivation? #:system system #:guile guile @@ -1171,7 +1155,6 @@ as returned by 'local-file' for example." (define* (imported-modules modules #:key (name "module-import") - (derivation? #f) ;TODO: remove on next rebuild (system (%current-system)) (guile (%guile-for-build)) (module-path %load-path) @@ -1196,14 +1179,12 @@ last one is created from the given object." (cons f (search-path* module-path f))))) modules))) (imported-files files #:name name - #:derivation? derivation? #:system system #:guile guile #:deprecation-warnings deprecation-warnings))) (define* (compiled-modules modules #:key (name "module-import-compiled") - (derivation? #f) ;TODO: remove on next rebuild (system (%current-system)) (guile (%guile-for-build)) (module-path %load-path) @@ -1223,7 +1204,6 @@ they can refer to each other." (not (equal? module-path %load-path)))) (mlet %store-monad ((modules (imported-modules modules - #:derivation? derivation? #:system system #:guile guile #:module-path diff --git a/guix/packages.scm b/guix/packages.scm index 01045ded07..eab0b3404c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -641,9 +641,6 @@ specifies modules in scope when evaluating SNIPPET." (let ((name (tarxz-name original-file-name))) (gexp->derivation name build - ;; TODO: Remove this on the next rebuild cycle. - #:import-creates-derivation? #t - #:graft? #f #:system system #:deprecation-warnings #t ;to avoid a rebuild diff --git a/tests/gexp.scm b/tests/gexp.scm index b22e635805..a0ed34aa6d 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -654,11 +654,11 @@ (drv (imported-files files))) (define (file=? file1 file2) ;; Assume deduplication is in place. - (= (stat:ino (lstat file1)) - (stat:ino (lstat file2)))) + (= (stat:ino (stat file1)) + (stat:ino (stat file2)))) (mbegin %store-monad - (built-derivations (list drv)) + (built-derivations (list (pk 'drv drv))) (mlet %store-monad ((dir -> (derivation->output-path drv)) (plain* (text-file "foo" "bar!")) (q-scm* (interned-file q-scm "c"))) From 4a42abc52c3303ae50c4ca79a00dabbea05b5fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 27 Jul 2018 00:02:00 +0200 Subject: [PATCH 089/435] gexp: Inline bug-fix in 'compiled-modules'. This is a followup to 5d669883ecc104403c5d3ba7d172e9c02234577c. * guix/gexp.scm (compiled-modules)[build-utils-hack?]: Remove. Inline everything as if BUILD-UTILS-HACK? is true. --- guix/gexp.scm | 66 ++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 43 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index f358102782..c1070ba436 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1195,14 +1195,6 @@ corresponding to MODULES. All the MODULES are built in a context where they can refer to each other." (define total (length modules)) - (define build-utils-hack? - ;; To avoid a full rebuild, we limit the fix below to the case where - ;; MODULE-PATH is different from %LOAD-PATH. This happens when building - ;; modules for 'compute-guix-derivation' upon 'guix pull'. TODO: Make - ;; this unconditional on the next rebuild cycle. - (and (member '(guix build utils) modules) - (not (equal? module-path %load-path)))) - (mlet %store-monad ((modules (imported-modules modules #:system system #:guile guile @@ -1248,46 +1240,34 @@ they can refer to each other." (setvbuf (current-output-port) (cond-expand (guile-2.2 'line) (else _IOLBF))) - (ungexp-splicing - (if build-utils-hack? - (gexp ((define mkdir-p - ;; Capture 'mkdir-p'. - (@ (guix build utils) mkdir-p)))) - '())) + (define mkdir-p + ;; Capture 'mkdir-p'. + (@ (guix build utils) mkdir-p)) ;; Add EXTENSIONS to the search path. - ;; TODO: Remove the outer 'ungexp-splicing' on the next rebuild cycle. - (ungexp-splicing - (if (null? extensions) - '() - (gexp ((set! %load-path - (append (map (lambda (extension) - (string-append extension - "/share/guile/site/" - (effective-version))) - '((ungexp-native-splicing extensions))) - %load-path)) - (set! %load-compiled-path - (append (map (lambda (extension) - (string-append extension "/lib/guile/" - (effective-version) - "/site-ccache")) - '((ungexp-native-splicing extensions))) - %load-compiled-path)))))) + (set! %load-path + (append (map (lambda (extension) + (string-append extension + "/share/guile/site/" + (effective-version))) + '((ungexp-native-splicing extensions))) + %load-path)) + (set! %load-compiled-path + (append (map (lambda (extension) + (string-append extension "/lib/guile/" + (effective-version) + "/site-ccache")) + '((ungexp-native-splicing extensions))) + %load-compiled-path)) (set! %load-path (cons (ungexp modules) %load-path)) - (ungexp-splicing - (if build-utils-hack? - ;; Above we loaded our own (guix build utils) but now we may - ;; need to load a compile a different one. Thus, force a - ;; reload. - (gexp ((let ((utils (ungexp - (file-append modules - "/guix/build/utils.scm")))) - (when (file-exists? utils) - (load utils))))) - '())) + ;; Above we loaded our own (guix build utils) but now we may need to + ;; load a compile a different one. Thus, force a reload. + (let ((utils (string-append (ungexp modules) + "/guix/build/utils.scm"))) + (when (file-exists? utils) + (load utils))) (mkdir (ungexp output)) (chdir (ungexp modules)) From 8afa18d6e7f7aad7965af7e82e5afc975d19caea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 27 Jul 2018 00:09:52 +0200 Subject: [PATCH 090/435] gexp: Remove #:deprecation-warnings from 'imported-files'. This is a followup to 30d722c392960373bb45c3248d318ef6e248fb67. * guix/gexp.scm (imported-files/derivation): Remove #:deprecation-warnings. Pass "GUILE_WARN_DEPRECATED=no" unconditionally to #:env-vars of 'gexp->derivation'. Adjust caller. (imported-files): Remove #:deprecation-warnings and adjust callers. (imported-modules): Likewise. (compiled-modules, gexp->derivation): Adjust accordingly. --- guix/gexp.scm | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index c1070ba436..3a600c3830 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -697,9 +697,7 @@ The other arguments are as for 'derivation'." (imported-modules %modules #:system system #:module-path module-path - #:guile guile-for-build - #:deprecation-warnings - deprecation-warnings) + #:guile guile-for-build) (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules @@ -1070,15 +1068,7 @@ to a tree suitable for 'interned-file-tree'." #:key (name "file-import") (symlink? #f) (system (%current-system)) - (guile (%guile-for-build)) - - ;; XXX: The only reason we have - ;; #:deprecation-warnings is because (guix - ;; build utils), which we use here, relies - ;; on _IO*, which is deprecated in 2.2. On - ;; the next full-rebuild cycle, we should - ;; disable such warnings unconditionally. - (deprecation-warnings #f)) + (guile (%guile-for-build))) "Return a derivation that imports FILES into STORE. FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, @@ -1118,24 +1108,17 @@ to the source files instead of copying them." #:guile-for-build guile #:local-build? #t - ;; TODO: On the next rebuild cycle, set to "no" - ;; unconditionally. + ;; Avoid deprecation warnings about the use of the _IO* + ;; constants in (guix build utils). #:env-vars - (case deprecation-warnings - ((#f) - '(("GUILE_WARN_DEPRECATED" . "no"))) - ((detailed) - '(("GUILE_WARN_DEPRECATED" . "detailed"))) - (else - '()))))) + '(("GUILE_WARN_DEPRECATED" . "no"))))) (define* (imported-files files #:key (name "file-import") ;; The following parameters make sense when creating ;; an actual derivation. (system (%current-system)) - (guile (%guile-for-build)) - (deprecation-warnings #f)) + (guile (%guile-for-build))) "Import FILES into the store and return the resulting derivation or store file name (a derivation is created if and only if some elements of FILES are file-like objects and not local file names.) FILES must be a list @@ -1148,8 +1131,7 @@ as returned by 'local-file' for example." files) (imported-files/derivation files #:name name #:symlink? derivation? - #:system system #:guile guile - #:deprecation-warnings deprecation-warnings) + #:system system #:guile guile) (interned-file-tree `(,name directory ,@(file-mapping->tree files))))) @@ -1157,8 +1139,7 @@ as returned by 'local-file' for example." #:key (name "module-import") (system (%current-system)) (guile (%guile-for-build)) - (module-path %load-path) - (deprecation-warnings #f)) + (module-path %load-path)) "Return a derivation that contains the source files of MODULES, a list of module names such as `(ice-9 q)'. All of MODULES must be either names of modules to be found in the MODULE-PATH search path, or a module name followed @@ -1180,8 +1161,7 @@ last one is created from the given object." modules))) (imported-files files #:name name #:system system - #:guile guile - #:deprecation-warnings deprecation-warnings))) + #:guile guile))) (define* (compiled-modules modules #:key (name "module-import-compiled") @@ -1199,9 +1179,7 @@ they can refer to each other." #:system system #:guile guile #:module-path - module-path - #:deprecation-warnings - deprecation-warnings))) + module-path))) (define build (gexp (begin From 2abd76e8afe64ef4f4041ff02e9b22debb9f0483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 27 Jul 2018 11:20:09 +0200 Subject: [PATCH 091/435] gnu: guile: Update to 2.2.4. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.4. (guile-2.2.4): Remove. * gnu/packages/package-management.scm (guix)[inputs]: Switch to GUILE-2.2. * guix/self.scm (guile-for-build): Likewise. --- gnu/packages/guile.scm | 18 ++---------------- gnu/packages/package-management.scm | 4 +--- guix/self.scm | 4 +--- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f179f293ea..59f09375ad 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -228,7 +228,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) @@ -238,7 +238,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3")) + "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything @@ -302,20 +302,6 @@ without requiring the source code to be rewritten.") (base32 "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w")))))) -(define-public guile-2.2.4 - ;; This version contains important bug fixes, in particular wrt. to crashes - ;; of multi-threaded code as used by 'guix pull' and grafting. - (package - (inherit guile-2.2) - (version "2.2.4") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) - (define-public guile-next (deprecated-package "guile-next" guile-2.2)) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b7e3b320f6..58b8ca235c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -264,9 +264,7 @@ ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ;; Use 2.2.4 to avoid various thread-safety issues while building - ;; code in parallel. - ("guile" ,guile-2.2.4) + ("guile" ,guile-2.2) ;; Many tests rely on the 'guile-bootstrap' package, which is why we ;; have it here. diff --git a/guix/self.scm b/guix/self.scm index 5ad644b1df..21b85eb253 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -896,10 +896,8 @@ running Guile." (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2.2)) ("2.2" - ;; Use the latest version, which has fixes for - ;; and VM stack-marking issues. (canonical-package (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2.4))) + 'guile-2.2))) ("2.0" (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.0)))) From 8bece84022752b635b28dba0b051d215bcc19fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 27 Jul 2018 11:26:02 +0200 Subject: [PATCH 092/435] gnu: guile: Remove version 2.2.2. * gnu/packages/guile.scm (guile-2.2.2): Remove. * guix/self.scm (guile-for-build): Remove special case for "2.2.2". (guix-derivation): Likewise. * build-aux/build-self.scm (build): Likewise. --- build-aux/build-self.scm | 4 +--- gnu/packages/guile.scm | 15 --------------- guix/self.scm | 9 +-------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 3ecdc931a5..d8f3ff9bb0 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -297,9 +297,7 @@ person's version identifier." ;; The procedure below is our return value. (define* (build source #:key verbose? (version (date-version-string)) system - (guile-version (match ((@ (guile) version)) - ("2.2.2" "2.2.2") - (_ (effective-version)))) + (guile-version (effective-version)) (pull-version 0) #:allow-other-keys #:rest rest) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 59f09375ad..a6de4467d3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -287,21 +287,6 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) -(define-public guile-2.2.2 - ;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects - ;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in - ;; . - (package - (inherit guile-2.2) - (version "2.2.2") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w")))))) - (define-public guile-next (deprecated-package "guile-next" guile-2.2)) diff --git a/guix/self.scm b/guix/self.scm index 21b85eb253..c800c452e6 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -890,11 +890,6 @@ running Guile." 'canonical-package)) (match version - ("2.2.2" - ;; Gross hack to avoid ABI incompatibilities (see - ;; .) - (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2.2)) ("2.2" (canonical-package (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2))) @@ -925,9 +920,7 @@ is not supported." #:name (string-append "guix-" (shorten version)) #:pull-version pull-version - #:guile-version (match guile-version - ("2.2.2" "2.2") - (version version)) + #:guile-version guile-version #:guile-for-build guile))) (if guix (lower-object guix) From 1428bce348b1beff97676fce9350f6d87a2ca8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 27 Jul 2018 11:32:59 +0200 Subject: [PATCH 093/435] build-self: Default to Guile 2.2 when building a standalone Guix. * build-aux/build-self.scm (build): Change #:guile-version to default to "2.2" when PULL-VERSION is greater than 0. --- build-aux/build-self.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index d8f3ff9bb0..edb7f5d9c5 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -297,8 +297,15 @@ person's version identifier." ;; The procedure below is our return value. (define* (build source #:key verbose? (version (date-version-string)) system - (guile-version (effective-version)) (pull-version 0) + + ;; For the standalone Guix, default to Guile 2.2. For old + ;; versions of 'guix pull' (pre-0.15.0), we have to use the + ;; same Guile as the current one. + (guile-version (if (> pull-version 0) + "2.2" + (effective-version))) + #:allow-other-keys #:rest rest) "Return a derivation that unpacks SOURCE into STORE and compiles Scheme From b148506df74e48006194448a089eb16d4fcffc59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 01:57:46 +0200 Subject: [PATCH 094/435] gnu: openldap: Don't build static libraries. * gnu/packages/openldap.scm (openldap)[arguments]: Add "--disable-static" to #:configure-flags. Remove phase 'provide-libtool'. --- gnu/packages/openldap.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index d952f412e2..ac81026e28 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -70,11 +70,9 @@ (native-inputs `(("libtool" ,libtool))) (arguments `(#:tests? #f + #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases - (add-after 'configure 'provide-libtool - (lambda _ (copy-file (which "libtool") "libtool") - #t)) (add-after 'install 'patch-sasl-path ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) From fbd2b8da5d7e6edb16ba7128324f6bc48ac68569 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 04:36:02 +0200 Subject: [PATCH 095/435] gnu: icu4c: Don't keep a reference to coreutils. * gnu/packages/icu4c.scm (icu4c)[arguments]: Add phase 'avoid-coreutils-reference'. --- gnu/packages/icu4c.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 61333a3e75..cbba9aa42a 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -58,7 +58,15 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source - (lambda _ (chdir "source") #t))))) + (lambda _ (chdir "source") #t)) + (add-after 'install 'avoid-coreutils-reference + ;; Don't keep a reference to the build tools. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (find-files (string-append out "/lib/icu") + "\\.inc$") + (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install")) + #t)))))) (synopsis "International Components for Unicode") (description "ICU is a set of C/C++ and Java libraries providing Unicode and From 5f8642ea6ae675d0fb5b06e616064458433087d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:40:21 +0200 Subject: [PATCH 096/435] gnu: libxml2: Move static library to separate output. * gnu/packages/xml.scm (libxml2)[outputs, arguments]: New fields. --- gnu/packages/xml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1bf99f2fe5..85fd553b40 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -129,6 +129,20 @@ hierarchical form with variable field lengths.") (base32 "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b")))) (build-system gnu-build-system) + (outputs '("out" "static")) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((src (string-append (assoc-ref outputs "out") "/lib")) + (dst (string-append (assoc-ref outputs "static") + "/lib"))) + (mkdir-p dst) + (for-each (lambda (ar) + (rename-file ar (string-append dst "/" + (basename ar)))) + (find-files src "\\.a$")) + #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. From 7ba79d5d76327054f96f66625c314e365d5d9fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:47:24 +0200 Subject: [PATCH 097/435] gnu: libxml2: Add explicit dependency on XZ. * gnu/packages/xml.scm (libxml2)[inputs]: New field. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 85fd553b40..644753ff53 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -145,6 +145,7 @@ hierarchical form with variable field lengths.") #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") + (inputs `(("xz" ,xz))) (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. (native-inputs `(("perl" ,perl))) ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' From d66146073def03d1a3d61607bc6b77997284904b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:08:30 +0200 Subject: [PATCH 098/435] gnu: python: Remove outdated comment and phases. * gnu/packages/python.scm (python-2.7)[arguments]: Don't set SOURCE_DATE_EPOCH or make libraries writable, since those are handled by gnu-build-system. (python-3.6): Don't override :#tests?. --- gnu/packages/python.scm | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 097e80b606..cdeedfe73b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -178,23 +178,7 @@ "tk")) ;tkinter; adds 50 MiB to the closure (build-system gnu-build-system) (arguments - `(;; 356 tests OK. - ;; 6 tests failed: - ;; test_compileall test_distutils test_import test_shutil test_socket - ;; test_subprocess - ;; 39 tests skipped: - ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 - ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk - ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_curses - ;; test_dl test_gdb test_gl test_imageop test_imgfile test_ioctl - ;; test_kqueue test_linuxaudiodev test_macos test_macostools - ;; test_msilib test_ossaudiodev test_scriptpackages test_smtpnet - ;; test_socketserver test_startfile test_sunaudiodev test_timeout - ;; test_tk test_ttk_guionly test_urllib2net test_urllibnet - ;; test_winreg test_winsound test_zipfile64 - ;; 4 skips unexpected on linux2: - ;; test_bsddb test_bsddb3 test_gdb test_ioctl - #:test-target "test" + `(#:test-target "test" #:configure-flags (list "--enable-shared" ;allow embedding "--with-system-ffi" ;build ctypes @@ -219,11 +203,6 @@ "Lib/test/support/__init__.py" "Lib/test/test_subprocess.py")) (("/bin/sh") (which "sh"))) - - ;; Use zero as the timestamp in .pyc files so that builds are - ;; deterministic. TODO: Remove it when this variable is set in - ;; gnu-build-system.scm. - (setenv "SOURCE_DATE_EPOCH" "1") #t)) (add-before 'configure 'do-not-record-configure-flags (lambda* (#:key configure-flags #:allow-other-keys) @@ -281,15 +260,6 @@ file)))))) (call-with-output-file "__init__.py" (const #t)) #t))))))) - (add-before 'strip 'make-libraries-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make .so files writable so they can be stripped. - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (file) - (chmod file #o755)) - (find-files (string-append out "/lib") - "\\.so")) - #t))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so @@ -377,7 +347,6 @@ data types.") #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) - ((#:tests? _) #t) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'patch-timestamp-for-pyc-files From a1454169e0080d834cbddf94f04c5bcb7c3703e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:14:15 +0200 Subject: [PATCH 099/435] gnu: python: Update to 3.7.0. * gnu/packages/python.scm (python-3.6): Rename to ... (python-3.7): ... this. Update to 3.7.0. [arguments]: Remove phase 'patch-timestamp-for-pyc-files' and related code. Add phases to unset SOURCE_DATE_EPOCH during the check phase. (python-3): Is now PYTHON-3.7. * guix/build/python-build-system.scm (enable-bytecode-determinism): Don't set DETERMINISTIC_BUILD. --- gnu/packages/python.scm | 61 +++++++----------------------- guix/build/python-build-system.scm | 2 - 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cdeedfe73b..e39460594b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -321,10 +321,10 @@ data types.") (name "python") (properties `((superseded . ,python-2))))) -(define-public python-3.6 +(define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.6.5") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -337,7 +337,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l")) + "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3")) (snippet '(begin (for-each delete-file @@ -348,53 +348,18 @@ data types.") (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-timestamp-for-pyc-files - (lambda _ - ;; We set DETERMINISTIC_BUILD to only override the mtime when - ;; building with Guix, lest we break auto-compilation in - ;; environments. - (setenv "DETERMINISTIC_BUILD" "1") - (substitute* "Lib/py_compile.py" - (("source_stats\\['mtime'\\]") - "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])")) - - ;; Use deterministic hashes for strings, bytes, and datetime - ;; objects. - (setenv "PYTHONHASHSEED" "0") - - ;; Reset mtime when validating bytecode header. - (substitute* "Lib/importlib/_bootstrap_external.py" - (("source_mtime = int\\(source_stats\\['mtime'\\]\\)") - "source_mtime = 1")) - #t)) - ;; These tests fail because of our change to the bytecode - ;; validation. They fail because expected exceptions do not get - ;; thrown. This seems to be no problem. - (add-after 'unpack 'disable-broken-bytecode-tests - (lambda _ - (substitute* "Lib/test/test_importlib/source/test_file_loader.py" - (("test_bad_marshal") - "disable_test_bad_marshal") - (("test_no_marshal") - "disable_test_no_marshal") - (("test_non_code_marshal") - "disable_test_non_code_marshal")) - #t)) - ;; Unset DETERMINISTIC_BUILD to allow for tests that check that - ;; stale pyc files are rebuilt. - (add-before 'check 'allow-non-deterministic-compilation - (lambda _ (unsetenv "DETERMINISTIC_BUILD") #t)) - ;; We need to rebuild all pyc files for three different - ;; optimization levels to replace all files that were not built - ;; deterministically. - - ;; FIXME: Without this phase we have close to 2000 files that + `(modify-phases ,phases + ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it + ;; again afterwards. See . + (add-before 'check 'unset-SOURCE_DATE_EPOCH + (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) + (add-after 'check 'reset-SOURCE_DATE_EPOCH + (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) + ;; FIXME: Without this phase we have close to 400 files that ;; differ across different builds of this package. With this phase - ;; there are about 500 files left that differ. + ;; there are 44 files left that differ. (add-after 'install 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) - (setenv "DETERMINISTIC_BUILD" "1") (let ((out (assoc-ref outputs "out"))) (for-each (lambda (opt) @@ -421,7 +386,7 @@ data types.") "/site-packages")))))))) ;; Current 3.x version. -(define-public python-3 python-3.6) +(define-public python-3 python-3.7) ;; Current major version. (define-public python python-3) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 376ea81f1a..5bb0ba49d5 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -246,8 +246,6 @@ installed with setuptools." (define* (enable-bytecode-determinism #:rest _) "Improve determinism of pyc files." - ;; Set DETERMINISTIC_BUILD to override the embedded mtime in pyc files. - (setenv "DETERMINISTIC_BUILD" "1") ;; Use deterministic hashes for strings, bytes, and datetime objects. (setenv "PYTHONHASHSEED" "0") #t) From 81d967075ebe0facc4cbaf6718b89405ea9195d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 18:25:16 +0200 Subject: [PATCH 100/435] gnu: python: Rebuild bytecode after removing tests. * gnu/packages/python.scm (python-3.7)[arguments]: Run 'rebuild-bytecode' after 'remove-tests' to save CPU cycles. Adjust exclude regex. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e39460594b..3d924f7476 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -358,7 +358,7 @@ data types.") ;; FIXME: Without this phase we have close to 400 files that ;; differ across different builds of this package. With this phase ;; there are 44 files left that differ. - (add-after 'install 'rebuild-bytecode + (add-after 'remove-tests 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each @@ -372,8 +372,7 @@ data types.") "-m" "compileall" "-f" ; force rebuild ;; Don't build lib2to3, because it's Python 2 code. - ;; Also don't build obviously broken test code. - "-x" "(lib2to3|test/bad.*)" + "-x" "lib2to3.*" ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) From a422e2478e695bd1211fda827c767134de39fb2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:53:50 +0200 Subject: [PATCH 101/435] gnu: python: Build reproducibly. \o/ * gnu/packages/python.scm (python-3.7)[arguments]: Set PYTHONHASHSEED before rebuilding all bytecode. Adjust regex so that lib2to3_ex.py gets compiled. --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3d924f7476..6cab84715a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -361,6 +361,9 @@ data types.") (add-after 'remove-tests 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") (for-each (lambda (opt) (format #t "Compiling with optimization level: ~a\n" @@ -372,7 +375,7 @@ data types.") "-m" "compileall" "-f" ; force rebuild ;; Don't build lib2to3, because it's Python 2 code. - "-x" "lib2to3.*" + "-x" "lib2to3/.*" ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) From bc46a45ae7937c03c3cb1889ce1a461313a8e154 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:59:22 +0200 Subject: [PATCH 102/435] gnu: python-py: Add missing dependency on setuptools-scm. * gnu/packages/python.scm (python-py)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6cab84715a..7a4d47a9d6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1725,6 +1725,8 @@ matching them against a list of media-ranges.") ;; Expected '/tmp/guix-build-python-py-1.4.31.drv-0/py-1.4.31/py'. ;; Is this module globally installed?" '(#:tests? #f)) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (home-page "http://pylib.readthedocs.io/") (synopsis "Python library for parsing, I/O, instrospection, and logging") (description From a0d77eba72da7f589970a4da2723fbb869a10df7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:00:53 +0200 Subject: [PATCH 103/435] gnu: python-py: Update to 1.5.4. * gnu/packages/python.scm (python-py): Update to 1.5.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7a4d47a9d6..c4a2e8d685 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1710,14 +1710,14 @@ matching them against a list of media-ranges.") (define-public python-py (package (name "python-py") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99")))) + "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from From 3765c9c95b226228fdf9fe9bbfc777140ac38b6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:02:21 +0200 Subject: [PATCH 104/435] gnu: python-py: Update home page. * gnu/packages/python.scm (python-py)[home-page]: Change to repository URL. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c4a2e8d685..b4cc934663 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1727,7 +1727,7 @@ matching them against a list of media-ranges.") '(#:tests? #f)) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "http://pylib.readthedocs.io/") + (home-page "https://github.com/pytest-dev/py") (synopsis "Python library for parsing, I/O, instrospection, and logging") (description "Py is a Python library for file name parsing, .ini file parsing, I/O, From e8e7cd12c744024005a3698d652bc274cdac0fff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:06:17 +0200 Subject: [PATCH 105/435] gnu: python-pyflakes: Update to 2.0.0. * gnu/packages/python.scm (python-pyflakes): Update to 2.0.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b4cc934663..1b182139f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5512,14 +5512,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "1.5.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da")))) + "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") From 9e7d6e818cbea2049a2d2b2eb4c689d3b0d3efb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:09:10 +0200 Subject: [PATCH 106/435] gnu: python-more-itertools: Update to 4.2.0. * gnu/packages/python.scm (python-more-itertools): Update to 4.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1b182139f5..37e19dad3c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13299,14 +13299,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.1.0") + (version "4.2.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9")))) + "1s6qhl7a7jy8gqw8p545rxfp7rwz1hmjr9p6prk93zbv6f9rhsrb")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six-bootstrap))) From fdf5344a23359ead55df86e7f1da9f0545bc2d97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:21:55 +0200 Subject: [PATCH 107/435] gnu: python-pycodestyle: Update to 2.4.0. * gnu/packages/python.scm (python-pycodestyle): Update to 2.4.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 37e19dad3c..b336649e11 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3806,14 +3806,14 @@ as the original project seems to have been abandoned circa 2007.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8")))) + "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") From d0205dfd92bf8e515a5efc2400543fcaba0bdd0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:32:03 +0200 Subject: [PATCH 108/435] gnu: python-setuptools: Update to 40.0.0. * gnu/packages/python.scm (python-setuptools): Update to 40.0.0. [source](uri): Adjust to zipball archive. --- 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 b336649e11..444b9fd573 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -844,14 +844,14 @@ API for locking files.") (define-public python-setuptools (package (name "python-setuptools") - (version "31.0.0") + (version "40.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "setuptools" version)) + (uri (pypi-uri "setuptools" version ".zip")) (sha256 (base32 - "0ypybh4hx3bv4vhg2dc74xpj1g56ggnaffm87k4abhwjwq6wq608")) + "0pq116lr14gnc62v76nk0npkm6krb2mpp7p9ab369zgv4n7dnah1")) (modules '((guix build utils))) (snippet '(begin From fb4c6115f5aa1fb940e6501388f9fd25b738bc8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:59:01 +0200 Subject: [PATCH 109/435] gnu: python-pytest-runner: Update to 4.2. * gnu/packages/check.scm (python-pytest-runner): Update to 4.2. [arguments]: Remove. --- gnu/packages/check.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 42b90bc2b2..3239bf895e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -729,26 +729,15 @@ supports coverage of subprocesses.") (define-public python-pytest-runner (package (name "python-pytest-runner") - (version "2.11.1") + (version "4.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest-runner" version)) (sha256 (base32 - "1cw978kqqcq916b9gfns1qjqvg33c5ail5jhw9054dsynkm32flq")))) + "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The fancy way of setting the version with setuptools_scm does not - ;; seem to work here. - (add-after 'unpack 'set-version - (lambda _ - (substitute* "docs/conf.py" - (("version = setuptools_scm\\.get_version\\(root='\\.\\.')") - (string-append "version = \"" ,version "\""))) - #t))))) (native-inputs `(("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) From 153812ee0d2fb643b6db3a6c918fced512198d4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:09:03 +0200 Subject: [PATCH 110/435] gnu: python-flake8: Update to 3.5.0. * gnu/packages/python.scm (python-flake8): Update to 3.5.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 444b9fd573..130769800f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5617,14 +5617,14 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.4.1") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "1n0i38592vy3q0x2a9bf8z6rhhn04i30wsn5i5zzcj7qkxvl8062")))) + "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj")))) (build-system python-build-system) (arguments `(#:phases From 85f1342f01ad0fe6e5b23cabd5a6365b6a8e22bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:17:43 +0200 Subject: [PATCH 111/435] gnu: python-hypothesis: Update to 3.66.6. * gnu/packages/check.scm (python-hypothesis): Update to 3.66.6. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3239bf895e..8ee7d97731 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1386,13 +1386,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.52.0") + (version "3.66.6") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0g54cypfi5qj6cgxfr7l1nb41r1cqhhngx4qxn4ga9h720rcsbr8")))) + "0jlcbnirj5ndv4gvb3rmydligljn1alim9d4dk377188y09iwl5k")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) From 9f585a528eb7dc9ae5e1c1d901f84189ef8063e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:47:41 +0200 Subject: [PATCH 112/435] gnu: python-pytest-cov: Update to 2.5.1. * gnu/packages/check.scm (python-pytest-cov): Update to 2.5.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8ee7d97731..b2a0ecce48 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -693,14 +693,14 @@ and many external plugins.") (define-public python-pytest-cov (package (name "python-pytest-cov") - (version "2.4.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-cov" version)) (sha256 (base32 - "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k")))) + "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3")))) (build-system python-build-system) (arguments `(#:phases From 1166b9c795e3762ece2623143ae2fe0984b4a158 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:41:37 +0200 Subject: [PATCH 113/435] gnu: Add python-invoke. * gnu/packages/python.scm (python-invoke, python2-invoke): New public variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 130769800f..60a41ea0cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10767,6 +10767,32 @@ projects.") (define-public python2-incremental (package-with-python2 python-incremental)) +(define-public python-invoke + (package + (name "python-invoke") + (home-page "http://www.pyinvoke.org/") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "invoke" version)) + (sha256 + (base32 + "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6")))) + (build-system python-build-system) + (arguments + ;; XXX: Requires many dependencies that are not yet in Guix. + `(#:tests? #f)) + (synopsis "Pythonic task execution") + (description + "Invoke is a Python task execution tool and library, drawing inspiration +from various sources to arrive at a powerful and clean feature set. It is +evolved from the Fabric project, but focuses on local and abstract concerns +instead of servers and network commands.") + (license license:bsd-3))) + +(define-public python2-invoke + (package-with-python2 python-invoke)) + (define-public python-automat (package (name "python-automat") From a9ae30b78ed591e8212a4b918024c771f0896a4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:11:01 +0200 Subject: [PATCH 114/435] gnu: python-pytest: Update to 3.6.3. * gnu/packages/check.scm (python-pytest): Update to 3.6.3. [propagated-inputs]: Add PYTHON-ATOMICWRITES. [native-inputs]: Add PYTHON-INVOKE. --- gnu/packages/check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b2a0ecce48..134e640344 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.5.0") + (version "3.6.3") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1q832zd07zak2lyxbycxjydh0jp7y3hvawjqzlvra6aghz8r3r7s")))) + "0lnppwpz5i06sdhzv5b2j4x2f42mil38nx1l0kmnzvibdikwhlq4")))) (build-system python-build-system) (arguments `(#:phases @@ -644,7 +644,8 @@ standard library.") line))) #t))))) (propagated-inputs - `(("python-attrs" ,python-attrs-bootstrap) + `(("python-atomicwrites" ,python-atomicwrites) + ("python-attrs" ,python-attrs-bootstrap) ("python-more-itertools" ,python-more-itertools) ("python-pluggy" ,python-pluggy) ("python-py" ,python-py) @@ -653,6 +654,7 @@ standard library.") `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) + ("python-invoke" ,python-invoke) ;XXX: not needed for >3.6.3 ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm))) From 25ccb99347d7f8e54fecf0d8b397e21c3879d0fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:12:14 +0200 Subject: [PATCH 115/435] gnu: python-pytest-mock: Update to 1.10.0. * gnu/packages/check.scm (python-pytest-mock): Update to 1.10.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 134e640344..9a53a7eb72 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -756,14 +756,14 @@ supports coverage of subprocesses.") (define-public python-pytest-mock (package (name "python-pytest-mock") - (version "1.6.3") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-mock" version)) (sha256 (base32 - "075v7b2wm5f839r1a30n21wfk5rfqp3d05q7zb9jlb2wmxki23cj")))) + "1h6lgpmsvs9s8j2s80v06f9f3iaw1n1rc51mbrxk1f12sw4q56nq")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) From fc8778e2934e623b4cfae253942a721cea42a43b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:09:39 +0200 Subject: [PATCH 116/435] gnu: gdb: Fix build with Python >= 3.7. * gnu/packages/patches/gdb-python-3.7.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gdb.scm (gdb)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gdb.scm | 1 + gnu/packages/patches/gdb-python-3.7.patch | 52 +++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/gdb-python-3.7.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2bdd4742d..b8189eb2c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -709,6 +709,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2018-5711.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ + %D%/packages/patches/gdb-python-3.7.patch \ %D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 36ccb79d67..4c47cc5854 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -42,6 +42,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) + (patches (search-patches "gdb-python-3.7.patch")) (sha256 (base32 "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg")))) diff --git a/gnu/packages/patches/gdb-python-3.7.patch b/gnu/packages/patches/gdb-python-3.7.patch new file mode 100644 index 0000000000..c51442c8b2 --- /dev/null +++ b/gnu/packages/patches/gdb-python-3.7.patch @@ -0,0 +1,52 @@ +Fix build failure with Python 3.7 and newer. + +Taken from this upstream commit, sans ChangeLog update: + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=aeab512851bf6ed623d1c6c4305b6ce05e51a10c + +diff --git a/gdb/python/python.c b/gdb/python/python.c +index 1805c90..20fc674 100644 +--- a/gdb/python/python.c ++++ b/gdb/python/python.c +@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) + restore_active_ext_lang (previous_active); + } + ++#ifdef IS_PY3K ++/* This is called via the PyImport_AppendInittab mechanism called ++ during initialization, to make the built-in _gdb module known to ++ Python. */ ++PyMODINIT_FUNC ++init__gdb_module (void) ++{ ++ return PyModule_Create (&python_GdbModuleDef); ++} ++#endif ++ + static bool + do_start_initialization () + { +@@ -1707,6 +1718,9 @@ do_start_initialization () + remain alive for the duration of the program's execution, so + it is not freed after this call. */ + Py_SetProgramName (progname_copy); ++ ++ /* Define _gdb as a built-in module. */ ++ PyImport_AppendInittab ("_gdb", init__gdb_module); + #else + Py_SetProgramName (progname.release ()); + #endif +@@ -1716,9 +1730,7 @@ do_start_initialization () + PyEval_InitThreads (); + + #ifdef IS_PY3K +- gdb_module = PyModule_Create (&python_GdbModuleDef); +- /* Add _gdb module to the list of known built-in modules. */ +- _PyImport_FixupBuiltin (gdb_module, "_gdb"); ++ gdb_module = PyImport_ImportModule ("_gdb"); + #else + gdb_module = Py_InitModule ("_gdb", python_GdbMethods); + #endif +-- +2.9.3 + From 4696368108c2e1500a8f1d8a0d75b5f0aef1c37a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 02:31:30 +0200 Subject: [PATCH 117/435] gnu: python-fonttools: Update to 3.28.0. * gnu/packages/python.scm (python-fonttools): Update to 3.28.0. [arguments]: Remove. [native-inputs]: Add PYTHON-PYTEST and PYTHON-PYTEST-RUNNER. --- gnu/packages/python.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 60a41ea0cd..7e46a76109 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5894,28 +5894,18 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.15.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "1hhj97izwliy0vybmza72d90l5d4mcn50y8akq7kyccfl82vdx4d")))) + "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) (build-system python-build-system) - (arguments - '(#:test-target "check" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-setuppy - ;; Remove the undocumented "extra_path" argument, which adds an - ;; intervening directories between site-packages and the package - ;; directory. - (lambda _ - (substitute* "setup.py" - (("^[ \t]*extra_path *= *'FontTools',") "")) - #t))))) (native-inputs - `(("unzip" ,unzip))) + `(("unzip" ,unzip) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/behdad/fonttools") (synopsis "Tools to manipulate font files") (description From a4b7a1cb4abc2614d898b8722c3ac779ce148fa0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Jul 2018 17:12:01 +0300 Subject: [PATCH 118/435] gnu: python-3.7: Update deleted tests. * gnu/packages/python.scm (python-3.7)[source]: Update the list of files to be deleted in the snippet. --- 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 7e46a76109..4033573a8b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -341,9 +341,9 @@ data types.") (snippet '(begin (for-each delete-file - '("Lib/ctypes/test/test_structures.py" ; fails on aarch64 - "Lib/ctypes/test/test_win32.py" ; fails on aarch64 - "Lib/test/test_fcntl.py")) ; fails on aarch64 + '("Lib/ctypes/test/test_win32.py" ; fails on aarch64 + "Lib/test/test_fcntl.py" ; fails on aarch64 + "Lib/test/test_posix.py")) ; fails on aarch64 #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) From 20b0aaf986be704c477c558de999bcd390959fc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:37:52 +0200 Subject: [PATCH 119/435] gnu: python-fonttools: Update license. This is a follow-up to commit 4696368108c2e1500a8f1d8a0d75b5f0aef1c37a. * gnu/packages/python.scm (python-fonttools)[license]: Change to EXPAT (since 3.21). --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4033573a8b..6f60b75f32 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5914,9 +5914,7 @@ supports reading and writing of TrueType/OpenType fonts, reading and writing of AFM files, reading (and partially writing) of PS Type 1 fonts. The package also contains a tool called “TTX” which converts TrueType/OpenType fonts to and from an XML-based format.") - (license (license:non-copyleft - "file://LICENSE.txt" - "See LICENSE.txt in the distribution.")))) + (license license:expat))) (define-public python2-fonttools (package-with-python2 python-fonttools)) From d37d975b748f65a1ace4b2434d04e30ed558a7a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:39:00 +0200 Subject: [PATCH 120/435] gnu: python-pytest: Update to 3.6.4. * gnu/packages/check.scm (python-pytest): Update to 3.6.4. [native-inputs]: Remove PYTHON-INVOKE. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9a53a7eb72..5cb9c7ab2e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.6.3") + (version "3.6.4") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0lnppwpz5i06sdhzv5b2j4x2f42mil38nx1l0kmnzvibdikwhlq4")))) + "0h85kzdi5pfkz9v0z8xyrsj1rvnmyyjpng7cran28jmnc41w27il")))) (build-system python-build-system) (arguments `(#:phases @@ -654,7 +654,6 @@ standard library.") `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) - ("python-invoke" ,python-invoke) ;XXX: not needed for >3.6.3 ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm))) From b4052c96ee252bd65ede6b7f0983942cb653a36c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:22:04 +0200 Subject: [PATCH 121/435] gnu: nettle: Move static libraries to separate output. * gnu/packages/nettle.scm (nettle-2)[outputs]: Add "static". [arguments]: Add #:phases. --- gnu/packages/nettle.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 67a3062a5a..1212f32812 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -44,8 +44,22 @@ ;; $libdir, which is not the case by default. Work around it. '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")))) - (outputs '("out" "debug")) + "/lib")) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (slib (string-append (assoc-ref outputs "static") + "/lib"))) + (mkdir-p slib) + (with-directory-excursion (string-append out "/lib") + (for-each (lambda (ar) + (rename-file ar (string-append + slib "/" + (basename ar)))) + (find-files "." "\\.a$"))) + #t)))))) + (outputs '("out" "debug" "static")) (native-inputs `(("m4" ,m4))) (propagated-inputs `(("gmp" ,gmp))) (home-page "https://www.lysator.liu.se/~nisse/nettle/") From d9f84612507423bb95bad91c6276c03e8cb934ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:33:50 +0200 Subject: [PATCH 122/435] gnu: libtasn1: Don't build static library. * gnu/packages/tls.scm (libtasn1)[arguments]: New field. --- gnu/packages/tls.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e99b7a83ba..f9c46c7bcb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -80,6 +80,8 @@ (base32 "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (native-inputs `(("perl" ,perl))) (home-page "https://www.gnu.org/software/libtasn1/") (synopsis "ASN.1 library") From cd9ad095c73057bd1d60c5011e7122ab7ac9fecf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:35:35 +0200 Subject: [PATCH 123/435] gnu: libidn2: Don't build static library. * gnu/packages/libidn.scm (libidn2)[arguments]: New field. --- gnu/packages/libidn.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 7cf061768e..765cefcfa4 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -70,6 +70,8 @@ Java libraries.") (inputs `(("libunistring" ,libunistring))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (synopsis "Internationalized domain name library for IDNA2008") (description "Libidn2 is an internationalized domain library implementing the IDNA2008 specifications. Libidn2 is believed to be a complete IDNA2008 From 1f2d64e4a86fbd77cfd7c773a9621a001516e1ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:42:59 +0200 Subject: [PATCH 124/435] gnu: libunistring: Don't install static library. * gnu/packages/libunistring.scm (libunistring)[arguments]: Add #:configure-flags. --- gnu/packages/libunistring.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index b6656904eb..debf3cc7dd 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -48,7 +48,8 @@ ;; Work around parallel build issue whereby C files may be compiled before ;; config.h is built: see and ;; . - '(#:parallel-build? #f)) + '(#:parallel-build? #f + #:configure-flags '("--disable-static"))) (synopsis "C library for manipulating Unicode strings") (description "GNU libunistring is a library providing functions to manipulate From 85b44823083f94bfc2bd552fb0460f188bd765f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:58:56 +0200 Subject: [PATCH 125/435] gnu: libidn: Don't build static libraries. * gnu/packages/libidn.scm (libidn)[arguments]: New field. --- gnu/packages/libidn.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 765cefcfa4..719a0f0b4b 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -43,6 +43,8 @@ "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi")))) (build-system gnu-build-system) ;; FIXME: No Java and C# libraries are currently built. + (arguments + `(#:configure-flags '("--disable-static"))) (synopsis "Internationalized string processing library") (description "libidn is a library implementing of the Stringprep, Punycode and IDNA From a44426ee01de3751c1016de570bfc82da0287f79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:59:33 +0200 Subject: [PATCH 126/435] gnu: shishi: Don't build static library. * gnu/packages/kerberos.scm (shishi)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/kerberos.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index cb14f765e2..508f9c4bd2 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -117,7 +117,7 @@ cryptography.") '(;; This is required since we patch some of the build scripts. ;; Remove for the next Shishi release after 1.0.2 or when ;; removing 'shishi-fix-libgcrypt-detection.patch'. - #:configure-flags '("ac_cv_libgcrypt=yes"))) + #:configure-flags '("ac_cv_libgcrypt=yes" "--disable-static"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("gnutls" ,gnutls) From 7b844100464633db5455a3931858bb57c9e529e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:00:07 +0200 Subject: [PATCH 127/435] gnu: curl: Don't build static library. * gnu/packages/curl.scm (curl)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/curl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8bed48fd87..08bbda12e0 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -84,7 +84,8 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi") + `(#:configure-flags '("--with-gnutls" "--with-gssapi" + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases From b90289dadc8ee15848ce911a2bdcd3ae8302d58c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:09:07 +0200 Subject: [PATCH 128/435] gnu: zlib: Move static library to separate output. * gnu/packages/compression.scm (zlib)[outputs]: New field. [arguments]: Add phase 'move-static-library'. --- gnu/packages/compression.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fdfa5ce39b..c206fd8664 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -85,6 +85,7 @@ (base32 "18dighcs333gsvajvvgqp8l4cx7h1x7yx9gd5xacnk80spyykrf3")))) (build-system gnu-build-system) + (outputs '("out" "static")) (arguments `(#:phases (modify-phases %standard-phases @@ -99,7 +100,15 @@ `((setenv "CHOST" ,(%current-target-system))) '()) (invoke "./configure" - (string-append "--prefix=" out)))))))) + (string-append "--prefix=" out))))) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libz.a" (string-append static "/lib")) + (delete-file "libz.a") + #t))))))) (home-page "https://zlib.net/") (synopsis "Compression library") (description From e076d9392df69f6730318d337b0e96f99b5cff12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 13:06:14 +0200 Subject: [PATCH 129/435] gnu: pango: Update to 1.42.3. * gnu/packages/gtk.scm (pango): Update to 1.42.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e351c6e96d..c4e00bc62a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.2") + (version "1.42.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -225,7 +225,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "1qm17k7r4299jbvqifk469q4hs5qj9j19kr4h9nfy5h4sjs1dr5i")))) + "0fnybmdrbx1d9g0rsxa4b31hvrh377n2ziz5rl13y56m0m9qfggv")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. From 07ca7165f90079948e7174468b47ecc7cd38531d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 15:02:36 +0200 Subject: [PATCH 130/435] gnu: poppler: Update to 0.67.0. * gnu/packages/pdf.scm (poppler): Update to 0.67.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index cb5442c433..f5f4f95b71 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -80,14 +80,14 @@ (define-public poppler (package (name "poppler") - (version "0.64.0") + (version "0.67.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj")))) + "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no From 82230603ce06de7aa3e4aef2fa093a6dbf0ef8df Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 3 Aug 2018 23:12:33 -0400 Subject: [PATCH 131/435] build-system/gnu: If a phase returns #f, the build fails. Fixes . Introduced by commit d8a3b1b9e847d4a44d2695f95af77170d4d2788f. * guix/build/gnu-build-system.scm (gnu-build): Use 'every' instead of 'for-each'. --- guix/build/gnu-build-system.scm | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index be5ad78b93..e5f3197b0a 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -792,26 +792,26 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." ;; The trick is to #:allow-other-keys everywhere, so that each procedure in ;; PHASES can pick the keyword arguments it's interested in. - (for-each (match-lambda - ((name . proc) - (let ((start (current-time time-monotonic))) - (format #t "starting phase `~a'~%" name) - (let ((result (apply proc args)) - (end (current-time time-monotonic))) - (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" - name result - (elapsed-time end start)) + (every (match-lambda + ((name . proc) + (let ((start (current-time time-monotonic))) + (format #t "starting phase `~a'~%" name) + (let ((result (apply proc args)) + (end (current-time time-monotonic))) + (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" + name result + (elapsed-time end start)) - ;; Issue a warning unless the result is #t. - (unless (eqv? result #t) - (format (current-error-port) "\ + ;; Issue a warning unless the result is #t. + (unless (eqv? result #t) + (format (current-error-port) "\ ## WARNING: phase `~a' returned `~s'. Return values other than #t ## are deprecated. Please migrate this package so that its phase ## procedures report errors by raising an exception, and otherwise ## always return #t.~%" - name result)) + name result)) - ;; Dump the environment variables as a shell script, for handy debugging. - (system "export > $NIX_BUILD_TOP/environment-variables") - result)))) - phases)) + ;; Dump the environment variables as a shell script, for handy debugging. + (system "export > $NIX_BUILD_TOP/environment-variables") + result)))) + phases)) From d60869805e313f2a733aa7a69932f1c5d2224845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 13:07:54 +0200 Subject: [PATCH 132/435] gnu: cups-filters: Update to 1.20.4. * gnu/packages/cups.scm (cups-filters): Update to 1.20.4. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 5e852501ce..c2c1a01b73 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,7 +53,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.3") + (version "1.20.4") (source(origin (method url-fetch) (uri @@ -61,7 +61,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv")) + "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From 4e8d9015e06ca3ea432da1b53f7518c767d32a11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:18:10 +0200 Subject: [PATCH 133/435] gnu: e2fsprogs: Update to 1.44.3. * gnu/packages/linux.scm (e2fsprogs): Update to 1.44.3. * gnu/packages/patches/e2fsprogs-glibc-2.27.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 5 +- .../patches/e2fsprogs-glibc-2.27.patch | 56 ------------------- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/e2fsprogs-glibc-2.27.patch diff --git a/gnu/local.mk b/gnu/local.mk index 44b275e95c..9eb6360375 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -644,7 +644,6 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ - %D%/packages/patches/e2fsprogs-glibc-2.27.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elogind-glibc-2.27.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3adc0d68e0..3665080218 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -732,7 +732,7 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.43.6") + (version "1.44.3") (source (origin (method url-fetch) (uri (string-append @@ -741,8 +741,7 @@ slabtop, and skill.") name "-" version ".tar.xz")) (sha256 (base32 - "00ilv65dzcgiap435j89xk86shf7rrav3wsik7cahy789qijdcn9")) - (patches (search-patches "e2fsprogs-glibc-2.27.patch")))) + "1djb9qnid1j0vvna2bhq4jsz2ig1xckbx7h4d86cr0gl61yrz2ax")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/e2fsprogs-glibc-2.27.patch b/gnu/packages/patches/e2fsprogs-glibc-2.27.patch deleted file mode 100644 index f0bc7130c0..0000000000 --- a/gnu/packages/patches/e2fsprogs-glibc-2.27.patch +++ /dev/null @@ -1,56 +0,0 @@ -Copied from: -https://github.com/openwrt/openwrt/blob/58a95f0f8ff768b43d68eed2b6a786e0f40f723b/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch - -From 01551bdba16ab16512a01affe02ade32c41ede8a Mon Sep 17 00:00:00 2001 -From: Palmer Dabbelt -Date: Fri, 29 Dec 2017 10:19:51 -0800 -Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk - -As of 2.27, glibc will have a copy_file_range library call to wrap the -new copy_file_range system call. This conflicts with the function in -misc/create_inode.c, which this patch renames _copy_file_range. - -Signed-off-by: Palmer Dabbelt -Signed-off-by: Theodore Ts'o ---- - misc/create_inode.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu - } - #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */ - --static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, -+static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, - off_t start, off_t end, char *buf, - char *zerobuf) - { -@@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil - - data_blk = data & ~(fs->blocksize - 1); - hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); -- err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, -+ err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, - zerobuf); - if (err) - return err; -@@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi - } - for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; - i++, ext++) { -- err = copy_file_range(fs, fd, e2_file, ext->fe_logical, -+ err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical, - ext->fe_logical + ext->fe_length, - buf, zerobuf); - if (err) -@@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f - goto out; - #endif - -- err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, -+ err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf, - zerobuf); - out: - ext2fs_free_mem(&zerobuf); From 029c2ba0c591d19537ec717f0d96c62459bc543b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:19:02 +0200 Subject: [PATCH 134/435] gnu: btrfs-progs: Add zlib:static. * gnu/packages/linux.scm (btrfs-progs)[inputs]: Add zlib:static. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3665080218..b25c5854b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3278,6 +3278,7 @@ and copy/paste text in the console and in xterm.") ("libuuid:static" ,util-linux "static") ("lzo" ,lzo) ("zlib" ,zlib) + ("zlib:static" ,zlib "static") ("zstd" ,zstd))) (native-inputs `(("pkg-config" ,pkg-config) ("asciidoc" ,asciidoc) From d3028f5b273d50a490a790fba94f49494f0c7b4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:55:40 +0200 Subject: [PATCH 135/435] gnu: python-libxml2: Do not build static output. This is a follow-up to commit 5f8642ea6ae675d0fb5b06e616064458433087d3. * gnu/packages/xml.scm (python-libxml2)[outputs]: Don't inherit from libxml2. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 644753ff53..26810773ce 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -166,6 +166,7 @@ project (but it is usable outside of the Gnome platform).") (package/inherit libxml2 (name "python-libxml2") (build-system python-build-system) + (outputs '("out")) (arguments `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. #:tests? #f From ccdc1690bd871a7a4dfa466087a85b9d180db903 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jun 2018 16:03:43 -0400 Subject: [PATCH 136/435] 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 082b889c2a..668143d999 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2764,14 +2764,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 @@ -2784,7 +2784,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 From cfe62fb22b96c76efde2872398d2814df3ecf113 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:07 +0200 Subject: [PATCH 137/435] gnu: python-cython: Remove failing test. * gnu/packages/python.scm (python-cython)[arguments]: Remove failing test. --- gnu/packages/python.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 668143d999..84683a9d16 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2784,7 +2784,11 @@ and is very extensible.") ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check - (lambda _ (invoke "python" "runtests.py" "-vv")))))) + (lambda _ + ;; The "with_outer_raising" test fails with Python 3.7. See + ;; https://github.com/cython/cython/issues/2454 + (delete-file "tests/run/generators_py.py") + (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 From 2df4ecd61d663211b3ce5a0036e25ff143b3b4b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:46 +0200 Subject: [PATCH 138/435] gnu: python-dbus: Update to 1.2.8. * gnu/packages/python.scm (python-dbus): Update to 1.2.8. [inputs]: Replace "python" with "python-wrapper". --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 84683a9d16..65daba4e4b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4873,15 +4873,15 @@ toolkit. Use it to build trees of widgets.") (define-public python-dbus (package (name "python-dbus") - (version "1.2.0") + (version "1.2.8") (source (origin (method url-fetch) - (uri (string-append - "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-" - version ".tar.gz")) + (uri (string-append "https://dbus.freedesktop.org/releases/dbus-python/" + "dbus-python-" version ".tar.gz")) (sha256 - (base32 "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71")))) + (base32 + "0vvvjmiwnc9cjlks3gcdk43ap7llhlpz7cm1wbw0nc2yfsxjpwdb")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4897,7 +4897,7 @@ toolkit. Use it to build trees of widgets.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python" ,python) + `(("python" ,python-wrapper) ("dbus-glib" ,dbus-glib))) (synopsis "Python bindings for D-bus") (description "python-dbus provides bindings for libdbus, the reference From 5417c92877c9893e23cb4023e4cebb332c6847f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:24:13 +0200 Subject: [PATCH 139/435] gnu: python-flake8: Use INVOKE. * gnu/packages/python.scm (python-flake8)[arguments]: Use INVOKE and always return #T. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 65daba4e4b..fc72bb25e1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5660,7 +5660,8 @@ complexity of Python source code.") (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (zero? (system* "pytest" "-v"))))))) + (invoke "pytest" "-v") + #t))))) (propagated-inputs `(("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) From bc731eada6b318c46325e614173f16f0501bc1ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 23:08:29 +0200 Subject: [PATCH 140/435] gnu: python-flake8: Fix build. * gnu/packages/python.scm (python-flake8)[arguments]: Add build phases "delete-broken-test" and "fix-problem-with-pycodestyle". [propagated-inputs]: Remove python-setuptools. --- gnu/packages/python.scm | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc72bb25e1..eba1cc9186 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5656,22 +5656,32 @@ complexity of Python source code.") (arguments `(#:phases (modify-phases %standard-phases + ;; Two errors don't seem to have assigned codes. + (add-after 'unpack 'delete-broken-test + (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t)) + (add-after 'unpack 'fix-problem-with-pycodestyle + (lambda _ + ;; See https://gitlab.com/pycqa/flake8/merge_requests/230 + ;; This should no longer be needed with the next release. + (substitute* "setup.py" + (("PEP8_PLUGIN\\('break_around_binary_operator'\\),") + "PEP8_PLUGIN('break_after_binary_operator'),\ +PEP8_PLUGIN('break_before_binary_operator'),")) + #t)) (delete 'check) (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v") - #t))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v") + #t))))) (propagated-inputs - `(("python-pycodestyle" ,python-pycodestyle) - ("python-pyflakes" ,python-pyflakes) - ;; flake8 depends on a newer setuptools than provided by python. - ("python-setuptools" ,python-setuptools) - ("python-mccabe" ,python-mccabe))) + `(("python-pycodestyle" ,python-pycodestyle) + ("python-pyflakes" ,python-pyflakes) + ("python-mccabe" ,python-mccabe))) (native-inputs - `(("python-mock" ,python-mock) ; TODO: only required for < 3.3 - ("python-pytest" ,python-pytest-bootstrap) - ("python-pytest-runner" ,python-pytest-runner))) + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest-bootstrap) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") From a7e231a2a3edbd6a70949432c1ff434d87f625ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Aug 2018 14:37:36 +0200 Subject: [PATCH 141/435] build-system/haskell: Let all phases return #T unconditionally. * guix/build/haskell-build-system.scm (make-ghc-package-database, register, check, haddock): Return #T unconditionally; use INVOKE. --- guix/build/haskell-build-system.scm | 43 +++++++++++++++-------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 26519ce5a6..5a72d22842 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Paul van der Walt +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,9 +179,10 @@ first match and return the content of the group." (unless (file-exists? dest) (copy-file file dest)))) conf-files) - (zero? (system* "ghc-pkg" - (string-append "--package-db=" %tmp-db-dir) - "recache")))) + (invoke "ghc-pkg" + (string-append "--package-db=" %tmp-db-dir) + "recache") + #t)) (define* (register #:key name system inputs outputs #:allow-other-keys) "Generate the compiler registration and binary package database files for a @@ -238,32 +240,31 @@ given Haskell package." (list (string-append "--gen-pkg-config=" config-file)))) (run-setuphs "register" params) ;; The conf file is created only when there is a library to register. - (or (not (file-exists? config-file)) - (begin - (mkdir-p config-dir) - (let* ((config-file-name+id - (call-with-ascii-input-file config-file (cut grep id-rx <>)))) - (install-transitive-deps config-file %tmp-db-dir config-dir) - (rename-file config-file - (string-append config-dir "/" - config-file-name+id ".conf")) - (zero? (system* "ghc-pkg" - (string-append "--package-db=" config-dir) - "recache"))))))) + (unless (file-exists? config-file) + (mkdir-p config-dir) + (let* ((config-file-name+id + (call-with-ascii-input-file config-file (cut grep id-rx <>)))) + (install-transitive-deps config-file %tmp-db-dir config-dir) + (rename-file config-file + (string-append config-dir "/" + config-file-name+id ".conf")) + (invoke "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache"))) + #t)) (define* (check #:key tests? test-target #:allow-other-keys) "Run the test suite of a given Haskell package." (if tests? (run-setuphs test-target '()) - (begin - (format #t "test suite not run~%") - #t))) + (format #t "test suite not run~%")) + #t) (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys) "Run the test suite of a given Haskell package." - (if haddock? - (run-setuphs "haddock" haddock-flags) - #t)) + (when haddock? + (run-setuphs "haddock" haddock-flags)) + #t) (define %standard-phases (modify-phases gnu:%standard-phases From 9611080117cc169ac9c5fba498f504f2431ef4d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:43:49 +0200 Subject: [PATCH 142/435] gnu: fontforge: Build with Python 2. * gnu/packages/fontutils.scm (fontforge)[inputs]: Replace python-wrapper with python-2. --- gnu/packages/fontutils.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 94cdc520ba..53b6355be6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -536,7 +536,10 @@ definitions.") ("libxml2" ,libxml2) ("pango" ,pango) ("potrace" ,potrace) - ("python" ,python-wrapper) + ;; FIXME: We use Python 2 here because there is a bug in Python + ;; 3.7 that is triggered when Py_Main is called after Py_Init, as + ;; is done by fontforge. This will be fixed in Python 3.7.1. + ("python" ,python-2) ("zlib" ,zlib))) (arguments '(#:phases From bedf0535ff97f7875c5006ed8af1bbd01897c377 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:44:20 +0200 Subject: [PATCH 143/435] gnu: inkscape: Add poppler compatibility patch. * gnu/packages/inkscape.scm (inkscape)[source]: Add second poppler compatibility patch. --- gnu/packages/inkscape.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 8471cf2392..1673cc602e 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -63,7 +63,15 @@ (file-name "inkscape-poppler-compat.patch") (sha256 (base32 - "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))))))) + "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "fa1c469aa8c005e07bb8676d72af9f7c16fae3e0.diff")) + (file-name "inkscape-poppler-compat2.patch") + (sha256 + (base32 + "14k9yrfjz4nx3bz9dk91q74mc0i7rvl2qzkwhcy1br71yqjvngn5"))))))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) From a3baaaa07a77ae03e891ed5b462d0836d8a2a66e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 16:00:22 +0200 Subject: [PATCH 144/435] 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. --- gnu/packages/build-tools.scm | 6 ++-- .../patches/meson-for-build-rpath.patch | 36 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index e693aec4ac..aaae0a0a6e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial @@ -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..04c07d05bf 100644 --- a/gnu/packages/patches/meson-for-build-rpath.patch +++ b/gnu/packages/patches/meson-for-build-rpath.patch @@ -2,22 +2,24 @@ This patch removes a part of meson that clears the rpath upon installation. This will only be applied to a special version of meson, used for the 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 +Patch for Meson 0.42.0 by Peter Mikkelsen +Adjusted for Meson 0.47.1 by Ricardo Wurmus +--- meson-0.47.1/mesonbuild/minstall.py.old 2018-08-10 11:01:27.812327013 +0200 ++++ meson-0.47.1/mesonbuild/minstall.py 2018-08-10 11:01:51.940368505 +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() From 25bd72678ae4048b0b84ee82bc5f2644367e9715 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 17:00:27 +0200 Subject: [PATCH 145/435] gnu: gcc@5: Build with isl@0.18. * gnu/packages/gcc.scm (gcc-5)[inputs]: Change ISL to ISL-0.18. (isl-0.18): New public variable. --- gnu/packages/gcc.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5bdd70b0db..46b70ce497 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -451,7 +451,8 @@ Go. It also includes runtime support libraries for these languages.") "$OBJDUMP_FOR_TARGET -T")) #t)))) (inputs - `(("isl" ,isl) + `(;; GCC5 needs which is removed in later versions. + ("isl" ,isl-0.18) ,@(package-inputs gcc-4.7))))) (define-public gcc-6 @@ -860,6 +861,20 @@ reduction, transitive closures on maps (which may encode infinite graphs), dependence analysis and bounds on piecewise step-polynomials.") (license lgpl2.1+))) +(define-public isl-0.18 + (package + (inherit isl) + (version "0.18") + (source (origin + (method url-fetch) + (uri (list (string-append "http://isl.gforge.inria.fr/isl-" + version ".tar.bz2") + (string-append %gcc-infrastructure + "isl-" version ".tar.gz"))) + (sha256 + (base32 + "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))))) + (define-public isl-0.11 (package (inherit isl) From 4866cba66ae40d722bb6c50b7dca27725ffa4532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Thu, 9 Aug 2018 16:45:45 +0200 Subject: [PATCH 146/435] gnu: libgcrypt: Make build reproducible. * gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (libgcrypt)[source]: Use it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 4 ++- .../libgcrypt-make-yat2m-reproducible.patch | 32 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1e2ce8f49e..341e1c4fdf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -860,6 +860,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 54b44996ef..942f975e56 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -101,7 +101,9 @@ Daemon and possibly more in the future.") version ".tar.bz2")) (sha256 (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))) + "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")) + (patches + (search-patches "libgcrypt-make-yat2m-reproducible.patch")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch new file mode 100644 index 0000000000..3056f0baad --- /dev/null +++ b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch @@ -0,0 +1,32 @@ +Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making +the build reproducible. + +This was already fixed upstream in GnuPG: +https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb + +and in libgpg-error: +https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64 + + +--- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100 ++++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200 +@@ -1475,6 +1484,7 @@ + main (int argc, char **argv) + { + int last_argc = -1; ++ const char *s; + + opt_source = "GNU"; + opt_release = ""; +@@ -1608,6 +1618,11 @@ + if (argc > 1) + die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n"); + ++ /* Take care of supplied timestamp for reproducible builds. See ++ * https://reproducible-builds.org/specs/source-date-epoch/ */ ++ if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s) ++ opt_date = s; ++ + /* Start processing. */ + if (argc && strcmp (*argv, "-")) + { From 16b1effb5f5bc0f2e1ca7fe5379e1f681c243fd2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:36:23 +0200 Subject: [PATCH 147/435] gnu: libgsf: Update to 1.14.44. * gnu/packages/gnome.scm (libgsf): Update to 1.14.44. --- 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 8459bf9ac1..040fd923ce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1176,7 +1176,7 @@ XML/CSS rendering engine.") (define-public libgsf (package (name "libgsf") - (version "1.14.43") + (version "1.14.44") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1184,7 +1184,7 @@ XML/CSS rendering engine.") name "-" version ".tar.xz")) (sha256 (base32 - "05pf3h0dha3s20ddsrljbx7m94qyiqs5igwxx1ql0vlsdlylx50j")))) + "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From 525a62e5eaa1c5e007198dc3261c6bc2932cfb6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:39:06 +0200 Subject: [PATCH 148/435] gnu: libical: Update to 3.0.4. * gnu/packages/calendar.scm (libical): Update to 3.0.4. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 79cef99826..3b901dcb4e 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -48,7 +48,7 @@ (define-public libical (package (name "libical") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (string-append @@ -56,7 +56,7 @@ version "/libical-" version ".tar.gz")) (sha256 (base32 - "0hcjyf35b8rrvy8xziqxc4imi28mmkixb09gknisvp6jsa5fp4av")))) + "0ifisnh42cw5z53hp9p52l3ggc7k877zlqk0n06gdhrk0bhidckj")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken From 233e7a028d69093ebdf0acb16146a5e4f884b4ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:41:25 +0200 Subject: [PATCH 149/435] gnu: qpdf: Update to 8.2.1. * gnu/packages/pdf.scm (qpdf): Update to 8.2.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 57a5e1c0ed..2778f1d6a3 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -644,14 +644,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "8.1.0") + (version "8.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx")) + "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove From 766e46e25f4e486a5691380dcfbd81e54a5a3e90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:44:18 +0200 Subject: [PATCH 150/435] gnu: libxkbcommon: Update to 0.8.2. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.8.2. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f100928393..9c3965394b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -157,14 +157,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8")))) + "136mdq11lrwg6rjmm44lmysxxgb9c35p4sq6k0cd129x82rw9f3s")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) From dd1e45335e135fe724acece440782344ef8ca9fd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 6 Jul 2018 18:32:50 +0200 Subject: [PATCH 151/435] guix: svn: Remove all .svn folders. * guix/build/svn.scm (svn-fetch): Remove all .svn folders as they contain timestamps. --- guix/build/svn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/svn.scm b/guix/build/svn.scm index 252d1d4ee5..913f89471b 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -51,7 +51,7 @@ valid Subversion revision. Return #t on success, #f otherwise." ;; of the repo. Since we want a fixed output, this directory needs ;; to be taken out. (with-directory-excursion directory - (delete-file-recursively ".svn")) + (for-each delete-file-recursively (find-files "." "^\\.svn$" #:directories? #t))) #t) From e6c4e41102f420cb05b32636909ecc9d45a624b7 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 20 Aug 2018 16:51:04 +0200 Subject: [PATCH 152/435] utils: Generate valid substitutions in 'wrap-program'. * guix/build/utils.scm (wrap-program)[export-variable]: Generate valid bash substitutions when using custom separators. --- guix/build/utils.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index c58a1afd1c..5fe3286843 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1057,11 +1057,11 @@ with definitions for VARS." (format #f "export ~a=\"~a\"" var (string-join rest sep))) ((var sep 'prefix rest) - (format #f "export ~a=\"~a${~a~a+~a}$~a\"" - var (string-join rest sep) var sep sep var)) + (format #f "export ~a=\"~a${~a:+~a}$~a\"" + var (string-join rest sep) var sep var)) ((var sep 'suffix rest) - (format #f "export ~a=\"$~a${~a~a+~a}~a\"" - var var var sep sep (string-join rest sep))) + (format #f "export ~a=\"$~a${~a+~a}~a\"" + var var var sep (string-join rest sep))) ((var '= rest) (format #f "export ~a=\"~a\"" var (string-join rest ":"))) From 8327ffcc7f3be866e1890ab3abd54ca5ea8421f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Aug 2018 21:21:16 +0200 Subject: [PATCH 153/435] gnu: unixodbc: Update to 2.3.7. * gnu/packages/databases.scm (unixodbc): Update to 2.3.7. --- 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 15bd7f1efb..ac2e5a19ab 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1532,7 +1532,7 @@ valid SQL query.") (define-public unixodbc (package (name "unixodbc") - (version "2.3.6") + (version "2.3.7") (source (origin (method url-fetch) (uri @@ -1540,7 +1540,7 @@ valid SQL query.") "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz")) (sha256 - (base32 "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8")))) + (base32 "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5")))) (build-system gnu-build-system) (synopsis "Data source abstraction library") (description "Unixodbc is a library providing an API with which to access From 4fb0871e77912808526d7c4098b18566593b2e05 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Aug 2018 21:21:28 +0200 Subject: [PATCH 154/435] gnu: at-spi2-atk: Update to 2.26.2. * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.26.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 429b0579c8..52824d2dec 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -570,7 +570,7 @@ is part of the GNOME accessibility project.") (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.26.1") + (version "2.26.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -578,7 +578,7 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l")))) + "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1")))) (build-system gnu-build-system) (arguments '(#:phases From bdb7447843e88a02a250ec6f782d3573eb734daf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 21 Aug 2018 05:13:09 +0200 Subject: [PATCH 155/435] gnu: fftw: Update to 3.3.8. * gnu/packages/algebra.scm (fftw): Update to 3.3.8. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c889433b41..9cc35ac5ec 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -522,14 +522,14 @@ a C program.") (define-public fftw (package (name "fftw") - (version "3.3.7") + (version "3.3.8") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-" version".tar.gz")) (sha256 (base32 - "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v")))) + "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1")))) (build-system gnu-build-system) (arguments `(#:configure-flags From aaaede49c1aacb43ffec8ad2cf34bcc764b3ff2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 Jun 2018 17:49:18 +0200 Subject: [PATCH 156/435] gnu: r-with-tests: Return #t from all phases. * gnu/packages/statistics.scm (r-with-tests)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 994529baa4..655beba9b8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -213,9 +213,9 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ "/share/zoneinfo")) #t)) (add-after 'build 'make-info - (lambda _ (zero? (system* "make" "info")))) + (lambda _ (invoke "make" "info"))) (add-after 'build 'install-info - (lambda _ (zero? (system* "make" "install-info"))))) + (lambda _ (invoke "make" "install-info")))) #:configure-flags `(;; We build the recommended packages here, because they are needed in ;; order to run the test suite. We disable them in the r-minimal From c0b3867c21d60c35dca6ecd44f00dc81afa87476 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 15:07:34 +0200 Subject: [PATCH 157/435] gnu: libunistring: Do install static library. ...but do so to a separate output. This reverts commit 1f2d64e4a86fbd77cfd7c773a9621a001516e1ce. * gnu/packages/libunistring.scm (libunistring)[outputs]: New field. [arguments]: Add phase for moving libunistring.a. Remove #:configure-flags. --- gnu/packages/libunistring.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index debf3cc7dd..fda839be54 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,13 +44,23 @@ (base32 "1mq57h06622m6qc5cv347fc3qk5mj840axw3c0vd7qmnwk1v53zb")))) (propagated-inputs (libiconv-if-needed)) + (outputs '("out" "static")) (build-system gnu-build-system) (arguments ;; Work around parallel build issue whereby C files may be compiled before ;; config.h is built: see and ;; . '(#:parallel-build? #f - #:configure-flags '("--disable-static"))) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libunistring.a" + (string-append static "/lib")) + (delete-file "libunistring.a") + #t))))))) (synopsis "C library for manipulating Unicode strings") (description "GNU libunistring is a library providing functions to manipulate From 3f35e0da86ea8524859905fe81eeffb712b2601e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 03:20:19 +0200 Subject: [PATCH 158/435] gnu: bootstrap-tarballs: Adjust to static outputs of zlib and libunistring. * gnu/packages/make-bootstrap.scm (%gcc-static)[inputs]: Add ZLIB:STATIC. (%guile-static)[inputs]: Add LIBUNISTRING:STATIC. --- gnu/packages/make-bootstrap.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 475749bbf6..65d632f64e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -22,7 +22,7 @@ (define-module (gnu packages make-bootstrap) #:use-module (guix utils) #:use-module (guix packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module ((gnu packages) #:select (search-patch)) @@ -34,6 +34,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages guile) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages multiprecision) @@ -440,6 +441,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "^gnu-user.*\\.h$")) ((" -lgcc_s}}") "}}")) #t))))))) + (inputs + `(("zlib:static" ,zlib "static") + ,@(package-inputs gcc))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -525,6 +529,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; Remove the 'debug' output (see above for the reason.) (outputs (delete "debug" (package-outputs guile-2.2))) + (inputs + `(("libunistring:static" ,libunistring "static") + ,@(package-inputs guile-2.2))) + (propagated-inputs `(("bdw-gc" ,libgc) ,@(alist-delete "bdw-gc" From 11e5bf70d5108db9f792113fd423f0b20805ac47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:46:42 +0200 Subject: [PATCH 159/435] gnu: harfbuzz: Update to 1.8.8. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.8. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c4e00bc62a..57f05eb49d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,7 +178,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.8.4") + (version "1.8.8") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -186,7 +186,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "1za5lmzz4j2plh6a12llnwxyy7dnspsykjlq1qp9x9hdza32yn9w")))) + "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo From a5dae0c03c4a12f6b92c89c01f1d41b2aec398df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:48:53 +0200 Subject: [PATCH 160/435] gnu: dbus: Update to 1.12.10. * gnu/packages/glib.scm (dbus): Update to 1.12.10. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index dbd9c8ff88..a4030a58aa 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -80,7 +80,7 @@ (define dbus (package (name "dbus") - (version "1.12.8") + (version "1.12.10") (source (origin (method url-fetch) (uri (string-append @@ -88,7 +88,7 @@ version ".tar.gz")) (sha256 (base32 - "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72")) + "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments From 09118c58dacfd8cd7ceff0cc3fea9c3e54ed9ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:51:06 +0200 Subject: [PATCH 161/435] gnu: glib: Update to 2.56.2. * gnu/packages/glib.scm (glib): Update to 2.56.2. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a4030a58aa..49a15b4d52 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -150,7 +150,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.1") + (version "2.56.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -158,7 +158,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "138b3hi7glfpbia49gi07lyz1dh9k0jl9vpd3aiwflf6y923zvs0")) + "12d738n1wpvrn39zvy9xazg5h6vzyiwsw8z1qibcj09mh4bbsjnn")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything From f203e533861005431e26adbbd1bb053c22dbf0de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:53:38 +0200 Subject: [PATCH 162/435] gnu: cmake: Update to 3.12.1. * gnu/packages/cmake.scm (cmake): Update to 3.12.1. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e113048690..03bce8b68d 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.12.0") + (version "3.12.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0scxdgdrkrri0f5fm7cb969vcl4k1wanmhaa22fh9ffdys81ly6h")) + "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5")) (modules '((guix build utils))) (snippet '(begin From 1c61a086bcb2644e6d6c6fc714dde498402cc561 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:55:14 +0200 Subject: [PATCH 163/435] gnu: expat: Update to 2.2.6. * gnu/packages/xml.scm (expat): Update to 2.2.6. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 26810773ce..e4284333bc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -64,14 +64,14 @@ (define-public expat (package (name "expat") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" version "/expat-" version ".tar.bz2")) (sha256 (base32 - "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r")))) + "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") From 85932a7b8ee2b4e0834da26465b5c5c77cddb025 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:03:44 +0200 Subject: [PATCH 164/435] gnu: libuv: Update to 1.23.0. * gnu/packages/libevent.scm (libuv): Update to 1.23.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 18e443be80..21c8d2a079 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.22.0") + (version "1.23.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) + "09yf7c71n8b80nbsv4lsmq5nqmb0rylhpx3z9jgkv5za9lr6sx6i")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. From fdf16a81b2440964a8fc5f5e40cad84c70d165e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:06:26 +0200 Subject: [PATCH 165/435] gnu: graphite2: Update to 1.3.12. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.12. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 53b6355be6..f9e117b2f4 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -378,7 +378,7 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.11") + (version "1.3.12") (source (origin (method url-fetch) @@ -386,7 +386,7 @@ applications should be.") "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "0z5dcgh8r3678awq6fb8igik7xmar5m6z9xxwpkkhradhk8jxfds")))) + "1l1940d8fz67jm6a0x8cjb5p2dv48cvz3wcskwa83hamd70k15fd")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests From 27885fcc26b7f9eed37c0e587d6be00ee8bb9cb3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:12:45 +0200 Subject: [PATCH 166/435] gnu: python-pluggy: Update to 0.7.1. * gnu/packages/python.scm (python-pluggy): Update to 0.7.1. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fde21d35f8..8f8aba947e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7671,15 +7671,17 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.6.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz")))) + "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (synopsis "Plugin and hook calling mechanism for Python") (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") From e2da8bcd9ed9042db46ae37a32be5374acab4f45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 21:43:45 +0200 Subject: [PATCH 167/435] gnu: python-pytest: Update to 3.7.2. * gnu/packages/check.scm (python-pytest): Update to 3.7.2. (python2-pytest)[propagated-inputs]: Add PYTHON2-PATHLIB. (python2-pytest-bootstrap)[propagated-inputs]: Add PYTHON-PATHLIB2-BOOTSTRAP. * gnu/packages/python.scm (python2-pathlib2-bootstrap): New public variable. --- gnu/packages/check.scm | 6 ++++-- gnu/packages/python.scm | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 242c531652..7abe821209 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.6.4") + (version "3.7.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0h85kzdi5pfkz9v0z8xyrsj1rvnmyyjpng7cran28jmnc41w27il")))) + "00jv750alrj62r586hcmvpqlmkqszqfm1x7n6qnqacjmmlis2n9l")))) (build-system python-build-system) (arguments `(#:phases @@ -673,6 +673,7 @@ and many external plugins.") (inherit pytest) (propagated-inputs `(("python2-funcsigs" ,python2-funcsigs) + ("python2-pathlib2" ,python2-pathlib2) ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-bootstrap @@ -689,6 +690,7 @@ and many external plugins.") (package (inherit pytest) (propagated-inputs `(("python2-funcsigs" ,python2-funcsigs-bootstrap) + ("python2-pathlib2" ,python2-pathlib2-bootstrap) ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-cov diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8f8aba947e..9e269b4820 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8389,6 +8389,15 @@ ambiguities (forward vs. backward slashes, etc.). @end enumerate") (license license:expat))) +(define-public python2-pathlib2-bootstrap + (hidden-package + (package + (inherit python2-pathlib2) + (name "python2-pathlib2-bootstrap") + (propagated-inputs + `(("python2-scandir" ,python2-scandir) + ("python2-six" ,python2-six-bootstrap)))))) + (define-public python-jellyfish (package (name "python-jellyfish") From 7f5d3445af3316ab67b5db4eb3def5c0265205ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:20:25 +0200 Subject: [PATCH 168/435] gnu: python-scandir: Update to 1.9.0. * gnu/packages/python.scm (python-scandir): Update to 1.9.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9e269b4820..c8a22a2f4b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11446,13 +11446,13 @@ It supports both normal and Unicode strings.") (define-public python-scandir (package (name "python-scandir") - (version "1.7") + (version "1.9.0") (source (origin (method url-fetch) (uri (pypi-uri "scandir" version)) (sha256 - (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) + (base32 "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases From e241f9a0207776a8fb11dc20ea705d3133bf9610 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:05:58 +0200 Subject: [PATCH 169/435] gnu: python-more-itertools: Update to 4.3.0. * gnu/packages/python.scm (python-more-itertools): Update to 4.3.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c8a22a2f4b..1c74f4e0a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13362,14 +13362,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.2.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1s6qhl7a7jy8gqw8p545rxfp7rwz1hmjr9p6prk93zbv6f9rhsrb")))) + "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six-bootstrap))) From 67a7da1f31d5a900802e11537876f2d75a2d3f87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:13:00 +0200 Subject: [PATCH 170/435] gnu: python-hypothesis: Update to 3.68.2. * gnu/packages/check.scm (python-hypothesis): Update to 3.68.2. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7abe821209..572761f661 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1413,13 +1413,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.66.6") + (version "3.68.2") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0jlcbnirj5ndv4gvb3rmydligljn1alim9d4dk377188y09iwl5k")))) + "15wlbdy148h3z0ckylf7zkszrfnnk254a6ld3qaf37lkf7hyp4r0")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) From b3751f9cea64ddb52d3d1c97ea62369967497469 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 03:31:23 +0200 Subject: [PATCH 171/435] gnu: python-setuptools-scm: Update to 3.1.0. * gnu/packages/python.scm (python-setuptools-scm): Update to 3.1.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1c74f4e0a7..e2406dfc3f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4414,13 +4414,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "1.15.6") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9")))) + "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") From c69d231c2a5656fe064a4fc2b6906fe3e194c7cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:24:44 +0200 Subject: [PATCH 172/435] gnu: python-pycparser: Update to 2.18. * gnu/packages/python.scm (python-pycparser): Update to 2.18. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e2406dfc3f..c3f34fc23d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4028,14 +4028,14 @@ a general image processing tool.") (define-public python-pycparser (package (name "python-pycparser") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri (pypi-uri "pycparser" version)) (sha256 (base32 - "1dkkjri0miidqb1zcqhqljfa34fcy9k5akasgwsv6k622zlk3b0a")))) + "09mjyw82ibqzl449g7swy8bfxnfpmas0815d2rkdjlcqw81wma4r")))) (outputs '("out" "doc")) (build-system python-build-system) (native-inputs From f6cd3f7970c5b5a1ca008a1a51db4bddb8ce8ae2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:31:51 +0200 Subject: [PATCH 173/435] gnu: python-ipaddress: Update to 1.0.22. * gnu/packages/python.scm (python-ipaddress): Update to 1.0.22. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3f34fc23d..0ad0626cba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6324,13 +6324,13 @@ implementations of ASN.1-based codecs and protocols.") (define-public python-ipaddress (package (name "python-ipaddress") - (version "1.0.19") + (version "1.0.22") (source (origin (method url-fetch) (uri (pypi-uri "ipaddress" version)) (sha256 (base32 - "10agaa1cys1bk1ycpl2w8lky9vjx8h1xh1z29mg0niqx0638c390")))) + "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi")))) (build-system python-build-system) (home-page "https://github.com/phihag/ipaddress") (synopsis "IP address manipulation library") From d76cd3defd96b656a504322103921d167eb6e3d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:50:12 +0200 Subject: [PATCH 174/435] gnu: python-lxml: Update to 4.2.4. * gnu/packages/python.scm (python-lxml): Update to 4.2.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0ad0626cba..fb465fac6a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4919,14 +4919,14 @@ implementation of D-Bus.") (define-public python-lxml (package (name "python-lxml") - (version "3.8.0") + (version "4.2.4") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 (base32 - "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk")))) + "1jk336k0kw616gfhqk1wwxsjjwz0flld0n294lz8kxch610bxbz2")))) (build-system python-build-system) (inputs `(("libxml2" ,libxml2) From 827509a30caa7233877e5e22f7a188ce16f3747a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 05:02:45 +0200 Subject: [PATCH 175/435] gnu: python-olefile: Update to 0.45.1. * gnu/packages/python.scm (python-olefile): Update to 0.45.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fb465fac6a..a23d85ba21 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3946,7 +3946,7 @@ services for your Python modules and applications.") (define-public python-olefile (package (name "python-olefile") - (version "0.44") + (version "0.45.1") (source (origin (method url-fetch) @@ -3955,7 +3955,7 @@ services for your Python modules and applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wmxbrhyqjry2000zx0zdhqdqxhgi06nz7sbzjlh222q2zjv1gpj")))) + "18ai19zwagm6nli14k8bii31ipbab2rp7plrvsm6gmfql551a8ai")))) (build-system python-build-system) (home-page "https://www.decalage.info/python/olefileio") From e63199ec68747a590f7429a575302917857c37dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 14:59:43 +0200 Subject: [PATCH 176/435] gnu: libatomic-ops: Update to 7.6.6. * gnu/packages/bdw-gc.scm (libatomic-ops): Update to 7.6.6. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 42ec61e324..c7491f845f 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.4") + (version "7.6.6") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv")))) + "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") From 1935b8d56a4c739f468af973ac9057463c18d1bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 16:36:19 +0200 Subject: [PATCH 177/435] gnu: libffi: Don't optimize for the build machine CPU. * gnu/packages/libffi.scm (libffi)[arguments]: Add #:configure-flags. --- gnu/packages/libffi.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 0d54c305b2..7d3abaff18 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -50,7 +50,10 @@ (patches (search-patches "libffi-3.2.1-complex-alpha.patch")))) (build-system gnu-build-system) (arguments - `(#:phases + `(;; Prevent the build system from passing -march and -mtune to the + ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". + #:configure-flags '("--enable-portable-binary" "--without-gcc-arch") + #:phases (modify-phases %standard-phases (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) From 7b0faf32e955ce3af6defae696e0406624a40bdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 17:25:16 +0200 Subject: [PATCH 178/435] gnu: pango: Update to 1.42.4. * gnu/packages/gtk.scm (pango): Update to 1.42.4. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 57f05eb49d..c5c34d0acc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.3") + (version "1.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -225,7 +225,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0fnybmdrbx1d9g0rsxa4b31hvrh377n2ziz5rl13y56m0m9qfggv")))) + "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. From e2c7b7bb68594c2f4f3a13e98da1e32509a080a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 23:13:00 +0200 Subject: [PATCH 179/435] gnu: libssh2: MIPS workaround no longer is. * gnu/packages/ssh.scm (libssh2)[arguments]: Override the 'bootstrap' phase regardless of target system. Remove 'autoreconf' phase. --- gnu/packages/ssh.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index faa09e94c3..e09bfbde6f 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -117,23 +117,10 @@ remote applications.") (propagated-inputs `(("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) (arguments `(#:configure-flags `("--with-libgcrypt") - #:phases - ;; FIXME: In the next core-updates cycle, replace the entire - ;; following ,(...) form with its first 'modify-phases' - ;; subform. The change made here is only strictly needed on - ;; MIPS, but should work on any system. For now, we apply it - ;; only to MIPS to avoid forcing thousands of rebuilds on - ;; other systems. - ,(if (string-prefix? "mips" (or (%current-target-system) - (%current-system))) - '(modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "autoreconf" "-v")))) - '(modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ - (invoke "autoreconf" "-v"))))))) + #:phases (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-v")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (synopsis "Client-side C library implementing the SSH2 protocol") From 4750b3a268ed511fd50e6b348a1a81b5f76b5a40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 05:46:47 +0200 Subject: [PATCH 180/435] gnu: python-pytest: Run the tests again. "python setup.py test" is ineffective since 3.6.x. The circle is complete. * gnu/packages/check.scm (python-pytest)[arguments]: Override 'check' phase. [native-inputs]: Add PYTHON-PYTEST-BOOTSTRAP. --- gnu/packages/check.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 572761f661..ddd532528f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -642,7 +642,8 @@ standard library.") (string-append "@pytest.mark.skip" "(reason=\"Assumes that /usr exists.\")\n " line))) - #t))))) + #t)) + (replace 'check (lambda _ (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) @@ -656,6 +657,7 @@ standard library.") ("python-hypothesis" ,python-hypothesis) ("python-nose" ,python-nose) ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "http://pytest.org") (synopsis "Python testing library") From 9764dac51146dab653c2abf2c7c94832504d2517 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:08:39 +0200 Subject: [PATCH 181/435] gnu: python-markupsafe: Update to 1.0. * gnu/packages/python.scm (python-markupsafe): Update to 1.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a23d85ba21..1bfcebe914 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2193,7 +2193,7 @@ object.") (define-public python-markupsafe (package (name "python-markupsafe") - (version "0.23") + (version "1.0") (source (origin (method url-fetch) @@ -2202,7 +2202,7 @@ object.") version ".tar.gz")) (sha256 (base32 - "1hvip33wva3fnmvfp9x5klqri7hpl1hkgqmjbss18nmrb7zimv54")))) + "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6")))) (build-system python-build-system) (home-page "https://github.com/mitsuhiko/markupsafe") (synopsis "XML/HTML/XHTML markup safe string implementation for Python") From 4c36fc705199d60dc441328d4d1d0c90b792575a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:13:31 +0200 Subject: [PATCH 182/435] gnu: python-imagesize: Update to 1.0.0. * gnu/packages/python.scm (python-imagesize): Update to 1.0.0. [arguments]: Remove. --- gnu/packages/python.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1bfcebe914..2813b93e67 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10354,19 +10354,15 @@ useful as a validator for JSON data.") (define-public python-imagesize (package (name "python-imagesize") - (version "0.7.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "imagesize" version)) (sha256 (base32 - "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha")))) + "05b3p62r7rbcvvbk5vknr3bhcq9b2airysn6ric534mng136wcjv")))) (build-system python-build-system) - (arguments - '(;; Test files are not distributed on PyPi: - ;; https://github.com/shibukawa/imagesize_py/issues/7 - #:tests? #f)) (home-page "https://github.com/shibukawa/imagesize_py") (synopsis "Gets image size of files in variaous formats in Python") (description From 26aef5e9560e177d80ff34036c021ce4e537d241 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:18:29 +0200 Subject: [PATCH 183/435] gnu: python-imagesize: Fix typo. * gnu/packages/python.scm (python-imagesize)[synopsis]: Remove stray character. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2813b93e67..c3da0e89f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10364,7 +10364,7 @@ useful as a validator for JSON data.") "05b3p62r7rbcvvbk5vknr3bhcq9b2airysn6ric534mng136wcjv")))) (build-system python-build-system) (home-page "https://github.com/shibukawa/imagesize_py") - (synopsis "Gets image size of files in variaous formats in Python") + (synopsis "Gets image size of files in various formats in Python") (description "This package allows determination of image size from PNG, JPEG, JPEG2000 and GIF files in pure Python.") From c52ff2ed7670b67b3b523c8d7c8f4fcf030c068a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:59:53 +0200 Subject: [PATCH 184/435] gnu: python-packaging: Update to 17.1. * gnu/packages/python.scm (python-packaging): Update to 17.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3da0e89f1..f4236391d3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11568,14 +11568,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "16.8") + (version "17.1") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "17k1xbjshackwvbsnxqixbph8rbqhz4bf4g3al5xyzhavxgq6l2x")))) + "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh")))) (build-system python-build-system) (native-inputs `(("python-pretend" ,python-pretend) From 632900f58650f104ba9ae7125282ca13b38f010e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:00:17 +0200 Subject: [PATCH 185/435] gnu: python-packaging: Run the tests. * gnu/packages/python.scm (python-packaging)[arguments]: Override 'check' phase. --- gnu/packages/python.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f4236391d3..6284d0aca1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11577,6 +11577,10 @@ several utilities, as well as an API for building localization tools.") (base32 "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "py.test" "-vv")))))) (native-inputs `(("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) From 9871a896aacd4daa0d57fb83aa18eaf5f85c74f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:11:00 +0200 Subject: [PATCH 186/435] gnu: python-sqlalchemy: Use 'invoke'. * gnu/packages/databases.scm (python-sqlalchemy)[arguments]: Use INVOKE instead of SYSTEM*. --- 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 5820314289..0ac2905f55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2267,7 +2267,7 @@ Database API 2.0T.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "py.test"))))))) + (lambda _ (invoke "py.test")))))) (home-page "http://www.sqlalchemy.org") (synopsis "Database abstraction library") (description From 2be1b754ba9d460b7fd16f790922aed4b3d45037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:19:33 +0200 Subject: [PATCH 187/435] gnu: python-sqlalchemy: Update to 1.2.11. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.2.11. --- 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 0ac2905f55..2989881028 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2249,7 +2249,7 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.0.12") + (version "1.2.11") (source (origin (method url-fetch) @@ -2257,7 +2257,7 @@ Database API 2.0T.") "SQLAlchemy/SQLAlchemy-" version ".tar.gz")) (sha256 (base32 - "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6")))) + "094mmbs4igrxplfyqd59j90jb83ixpbbzqc0w49yw81m82nnjrgg")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ;for c extensions From cb5ba282ccbf75ec092030daab41dfb6ae19b7c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:26:24 +0200 Subject: [PATCH 188/435] gnu: python-pytz: Update to 2018.5. * gnu/packages/time.scm (python-pytz): Update to 2018.5. [source](uri): Update file extension. [native-inputs]: Remove. --- gnu/packages/time.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index fc831ab6cc..13eded4179 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -88,17 +88,15 @@ to a file.") (define-public python-pytz (package (name "python-pytz") - (version "2017.3") + (version "2018.5") (source (origin (method url-fetch) - (uri (pypi-uri "pytz" version ".zip")) + (uri (pypi-uri "pytz" version ".tar.gz")) (sha256 (base32 - "1dw5l527vcafvdqq4wadwl7ikhb2sssz0v0cssibh8890kyczr7s")))) + "0xzj5gkpdn2da8m6j47chlp6zrzcypv9m0fjv4236q3jw4fyzfgz")))) (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") (description "This library brings the Olson tz database into Python. It From b3a21b2cf92bfaa95e27072fb4bae57c39ff12eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:01 +0200 Subject: [PATCH 189/435] gnu: python-babel: Update to 2.6.0. * gnu/packages/python.scm (python-babel): Update to 2.6.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6284d0aca1..44488e700a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -617,14 +617,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (define-public python-babel (package (name "python-babel") - (version "2.3.4") + (version "2.6.0") (source (origin (method url-fetch) (uri (pypi-uri "Babel" version)) (sha256 (base32 - "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5")))) + "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))) (build-system python-build-system) (propagated-inputs `(("python-pytz" ,python-pytz))) From 88166588a0a4bea41e505ba908af391b855de5c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:30 +0200 Subject: [PATCH 190/435] gnu: python-babel: Run the tests. * gnu/packages/python.scm (python-babel)[native-inputs]: Add PYTHON-FREEZEGUN and PYTHON-PYTEST. [arguments]: Replace 'check' phase. Remove #:tests?. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 44488e700a..14bbe4a3c7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -626,9 +626,15 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (base32 "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))) (build-system python-build-system) + (native-inputs + `(("python-freezegun" ,python-freezegun) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-pytz" ,python-pytz))) - (arguments `(#:tests? #f)) ; no test target + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) (home-page "http://babel.pocoo.org/") (synopsis "Tools for internationalizing Python applications") From efada0946dd1a3241af58d9988566523debb06e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:44:39 +0200 Subject: [PATCH 191/435] gnu: python-jinja2: Update to 2.10. * gnu/packages/python.scm (python-jinja2): Update to 2.10. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 14bbe4a3c7..56a5131b62 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2223,14 +2223,14 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.9.6") + (version "2.10") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx")))) + "190l36hfw3wb2n3n68yacjabxyb1pnxwn7vjx96cmjj002xy2jzq")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) From 5f2707a255585dd7e8bd22eb05e43c72e8fec886 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:40:12 +0200 Subject: [PATCH 192/435] gnu: python-sphinxcontrib-websupport: Disable tests. * gnu/packages/python.scm (python-sphinxcontrib-websupport)[arguments]: New field. [native-inputs, inputs]: Remove. --- gnu/packages/python.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56a5131b62..7bb402db89 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2394,18 +2394,9 @@ reStructuredText.") (base32 "1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs")))) (build-system python-build-system) - (propagated-inputs - `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) - ("python-xapian-bindings" ,python-xapian-bindings))) - ;; Needed for running the test suite - (native-inputs - `(("python-six" ,python-six) - ("python-jinja2" ,python-jinja2) - ("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx) - ("python-sqlalchemy" ,python-sqlalchemy) - ("python-whoosh" ,python-whoosh))) + (arguments + ;; FIXME: Tests depend on Sphinx, which depends on this. + `(#:tests? #f)) (home-page "http://sphinx-doc.org/") (synopsis "Sphinx API for web applications") (description "This package provides a Python API to easily integrate From f65ef0055651b1bd554549d7d1d1fef7935320bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:45:08 +0200 Subject: [PATCH 193/435] gnu: python-sphinxcontrib-websupport: Update to 1.1.0. * gnu/packages/python.scm (python-sphinxcontrib-websupport): Update to 1.1.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7bb402db89..ad16ba0e92 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2386,13 +2386,13 @@ reStructuredText.") (define-public python-sphinxcontrib-websupport (package (name "python-sphinxcontrib-websupport") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "sphinxcontrib-websupport" version)) (sha256 (base32 - "1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs")))) + "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) (build-system python-build-system) (arguments ;; FIXME: Tests depend on Sphinx, which depends on this. From f70785a4c0e12eb2db0ee8e66a41d3a9952a1f63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:58:09 +0200 Subject: [PATCH 194/435] gnu: python-sphinxcontrib-websupport: Add a python2 variant. * gnu/packages/python.scm (python2-sphinxcontrib-websupport): New public variable. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ad16ba0e92..dbc79b3bf6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2404,6 +2404,9 @@ Sphinx documentation into your web application. It provides tools to integrate Sphinx documents in web templates and to handle searches.") (license license:bsd-3))) +(define-public python2-sphinxcontrib-websupport + (package-with-python2 python-sphinxcontrib-websupport)) + (define-public python-sphinx (package (name "python-sphinx") From 3bbfc451edcb9af438eb8e205d3016203e0ef8e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:41:29 +0200 Subject: [PATCH 195/435] gnu: python-sphinx: Update to 1.7.7. * gnu/packages/openstack.scm (python-mox3, python-openstackdocstheme, python-stevedore, python-oslo.config)[native-inputs]: Change PYTHON-SPHINX-1.6 to PYTHON-SPHINX. * gnu/packages/python.scm (python-sphinx): Update to 1.7.7. [arguments]: Incorporate changes from the 1.6 variant. Disable two tests. [propagated-inputs]: Add PYTHON-PACKAGING and PYTHON-SPHINXCONTRIB-WEBSUPPORT. [native-inputs]: Add IMAGEMAGICK and PYTHON-PYTEST. (python2-sphinx)[propagated-inputs]: Add PYTHON2-TYPING. (python-sphinx-1.6, python2-sphinx-1.6, python-sphinx-1.5.3): Remove variables. (python-matplotlib-documentation)[native-inputs]: Change from PYTHON-SPHINX-1.6 to PYTHON-SPHINX. --- gnu/packages/openstack.scm | 8 +-- gnu/packages/python.scm | 113 ++++++++++++------------------------- 2 files changed, 39 insertions(+), 82 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 64e05c4b0e..c07f011c9d 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -182,7 +182,7 @@ guidelines}.") ("python-pbr" ,python-pbr))) (native-inputs `(("python-openstackdocstheme" ,python-openstackdocstheme) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-subunit" ,python-subunit) ("python-testrepository" ,python-testrepository) ("python-testtools" ,python-testtools))) @@ -216,7 +216,7 @@ with mox as possible, but small enhancements have been made.") `(("python-dulwich" ,python-dulwich) ("python-pbr" ,python-pbr))) (native-inputs - `(("python-sphinx" ,python-sphinx-1.6))) + `(("python-sphinx" ,python-sphinx))) (home-page "https://docs.openstack.org/openstackdocstheme/latest/") (synopsis "OpenStack Docs Theme") (description @@ -313,7 +313,7 @@ to docs.openstack.org and developer.openstack.org.") ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository))) (home-page "https://github.com/dreamhost/stevedore") (synopsis "Manage dynamic plugins for Python applications") @@ -405,7 +405,7 @@ common features used in Tempest.") ("python-openstackdocstheme" ,python-openstackdocstheme) ("python-oslotest" ,python-oslotest) ("python-reno" ,python-reno) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dbc79b3bf6..3aa54e6c66 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2410,57 +2410,15 @@ integrate Sphinx documents in web templates and to handle searches.") (define-public python-sphinx (package (name "python-sphinx") - (version "1.5.1") + (version "1.7.7") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "1i8p9idnli4gr0y4x67yakbdk5w6a0xjzhrg6bg51y9d1fi7fslf")))) + "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Requires Internet access. - (delete-file "tests/test_build_linkcheck.py") - (zero? (system* "make" "test"))))))) - (propagated-inputs - `(("python-imagesize" ,python-imagesize) - ("python-sphinx-alabaster-theme" - ,python-sphinx-alabaster-theme) - ("python-babel" ,python-babel) - ("python-snowballstemmer" ,python-snowballstemmer) - ("python-docutils" ,python-docutils) - ("python-jinja2" ,python-jinja2) - ("python-pygments" ,python-pygments) - ("python-requests" ,python-requests) - ("python-six" ,python-six))) - (native-inputs - `(("graphviz" ,graphviz) - ("python-html5lib" ,python-html5lib) - ("python-mock" ,python-mock) - ("python-nose" ,python-nose))) - (home-page "http://sphinx-doc.org/") - (synopsis "Python documentation generator") - (description "Sphinx is a tool that makes it easy to create documentation -for Python projects or other documents consisting of multiple reStructuredText -sources.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -(define-public python-sphinx-1.6 - (package (inherit python-sphinx) - (name "python-sphinx") - (version "1.6.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0gjakw9fv5pwqb5yyclxycs36sapxizk1vx6mkcdizmzgzcfy0gi")))) (arguments `(#:phases (modify-phases %standard-phases @@ -2471,41 +2429,39 @@ sources.") (substitute* "tests/test_build_latex.py" (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") "@pytest.mark.skip()")) - (zero? (system* "make" "test"))))))) + (when (which "python") + ;; XXX: These tests are broken when using Python2: + ;; . + (delete-file "tests/test_api_translator.py") + (delete-file "tests/test_setup_command.py")) + (invoke "make" "test")))))) (propagated-inputs - `(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport) - ,@(package-propagated-inputs python-sphinx))) + `(("python-imagesize" ,python-imagesize) + ("python-sphinx-alabaster-theme" + ,python-sphinx-alabaster-theme) + ("python-babel" ,python-babel) + ("python-snowballstemmer" ,python-snowballstemmer) + ("python-docutils" ,python-docutils) + ("python-jinja2" ,python-jinja2) + ("python-packaging" ,python-packaging) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests) + ("python-six" ,python-six) + ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) (native-inputs - `(("python-pytest" ,python-pytest) - ("imagemagick" ,imagemagick) ; for "convert" - ,@(package-native-inputs python-sphinx))) - (properties `((python2-variant . ,(delay python2-sphinx-1.6)))))) - -(define-public python2-sphinx-1.6 - (let ((base (package-with-python2 (strip-python2-variant python-sphinx-1.6)))) - (package - (inherit base) - (propagated-inputs - `(("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base))) - (native-inputs `(("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base)))))) - -(define-public python-sphinx-1.5.3 - (package - (inherit python-sphinx) - (name "python-sphinx") - (version "1.5.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) - (native-inputs - `(("python-pytest" ,python-pytest) - ,@(package-native-inputs python-sphinx))))) + `(("graphviz" ,graphviz) + ("imagemagick" ,imagemagick) ;for "convert" + ("python-html5lib" ,python-html5lib) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (home-page "http://sphinx-doc.org/") + (synopsis "Python documentation generator") + (description "Sphinx is a tool that makes it easy to create documentation +for Python projects or other documents consisting of multiple reStructuredText +sources.") + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-sphinx)))))) (define-public python2-sphinx (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) @@ -2515,6 +2471,7 @@ sources.") ("python2-enum34" ,python2-enum34) ,@(package-native-inputs base))) (propagated-inputs `(("python2-pytz" ,python2-pytz) + ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) (define-public python-sphinx-gallery @@ -3502,7 +3459,7 @@ toolkits.") (native-inputs `(("python-matplotlib" ,python-matplotlib) ("python-colorspacious" ,python-colorspacious) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) From a8c9321368604df74269217ede5c8058009e3ba0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:13:20 +0200 Subject: [PATCH 196/435] gnu: cups-filters: Update to 1.21.0. * gnu/packages/cups.scm (cups-filters): Update to 1.21.0. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c2c1a01b73..b4034dfad8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,7 +53,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.4") + (version "1.21.0") (source(origin (method url-fetch) (uri @@ -61,7 +61,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k")) + "0fs90xx9i4h8gbpligf5kkh21llv4kf5g3bgfbx4z272xkm7bsfi")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From 7eab5e7377de82666d41a8e58e3d9f7e116df5ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 16:00:38 +0200 Subject: [PATCH 197/435] gnu: python-greenlet: Update to 0.4.14. * gnu/packages/python.scm (python-greenlet): Update to 0.4.14. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3aa54e6c66..e47da91306 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8837,13 +8837,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.11") + (version "0.4.14") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "1xhik26j4f3kc4qw9xmj0c567rb5h1zryb4ijwqnqwwjvfhbv59h")))) + "1bsij3bwdhz2chq4ar2v6jqbh69yc7k9ymh41jd8vrdd2n52dk7i")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") From 25febeedc6457b8c064aa4045394b39efc46d22c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:15:13 +0200 Subject: [PATCH 198/435] gnu: python-numpydoc: Update to 0.8.0. * gnu/packages/python.scm (python-numpydoc): Update to 0.8.0. [source](uri): Use PYPI-URI. [source](snippet): Remove. --- gnu/packages/python.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e47da91306..e574aec555 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3222,25 +3222,14 @@ that client code uses to construct the grammar directly in Python code.") (define-public python-numpydoc (package (name "python-numpydoc") - (version "0.5") + (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/n/numpydoc/numpydoc-" - version ".tar.gz")) + (uri (pypi-uri "numpydoc" version)) (sha256 (base32 - "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop a test requiring matplotlib, which we cannot add as an - ;; input since it would create a circular dependency: Extend the - ;; test for Python 3, where it is already dropped, to Python 2. - (substitute* "numpydoc/tests/test_plot_directive.py" - (("3") "2")) - #t)))) + "1zazxg3m8j4fksv3f7v7vpf4bj9qb1vj3r326am0vdip141vzx31")))) (build-system python-build-system) (propagated-inputs `(("python-sphinx" ,python-sphinx))) From fdb222033c7bf4580bea0158840e9bb7905a00bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:25:23 +0200 Subject: [PATCH 199/435] gnu: gdbm: Update to 1.18. * gnu/packages/databases.scm (gdbm): Update to 1.18. --- 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 2989881028..bf0484197b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.16") + (version "1.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) + "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") From 22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:52:45 +0200 Subject: [PATCH 200/435] gnu: mariadb: Propagate OpenSSL. * gnu/packages/databases.scm (mariadb)[inputs]: Move OPENSSL ... [propagated-inputs]: ... here. (r-rmysql)[inputs]: Remove OPENSSL. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ac2e5a19ab..3116c86377 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -792,11 +792,13 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) - ("openssl" ,openssl) ("pcre" ,pcre) ("snappy" ,snappy) ("xz" ,xz) ("zlib" ,zlib))) + (propagated-inputs + ;; mariadb.pc says -lssl -lcrypto, so propagate it. + `(("openssl" ,openssl))) ;; 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 @@ -2167,9 +2169,6 @@ 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))) From 43cec3fb1ea54dedee8a5f613c833958c76892f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:52:40 +0200 Subject: [PATCH 201/435] gnu: mariadb: Remove huge mysql_embedded executable. * gnu/packages/databases.scm (mariadb)[arguments]: Adjust deletion regex. --- 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 3116c86377..a87cea212a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -779,8 +779,8 @@ Language.") (for-each delete-file-recursively '("data" "mysql-test" "sql-bench" "share/man/man1/mysql-test-run.pl.1")) - ;; Delete huge mysqltest executables. - (for-each delete-file (find-files "bin" "test")) + ;; Delete huge and unnecessary executables. + (for-each delete-file (find-files "bin" "(test|embedded)")) ;; And static libraries. (for-each delete-file (find-files "lib" "\\.a$"))) #t)))))) From bf91e6835d21e3bd7b49bb85b40f61389604c6f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:22:36 +0200 Subject: [PATCH 202/435] build-system/meson: Strip RUNPATH and remove PatchELF traces. * guix/build-system/meson.scm (%meson-build-system-modules): Don't import (guix build rpath). * guix/build/meson-build-system.scm (fix-runpath): Rename to ... (shrink-runpath): ... this. Update docstring. Remove AUGMENT-RPATH calls and related code. (%standard-phases): Add 'shrink-runpath'. --- guix/build-system/meson.scm | 1 - guix/build/meson-build-system.scm | 52 +++++-------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index fddf899092..8d49020454 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -41,7 +41,6 @@ (define %meson-build-system-modules ;; Build-side modules imported by default. `((guix build meson-build-system) - (guix build rpath) ;; The modules from glib-or-gtk contains the modules from gnu-build-system, ;; so there is no need to import that too. ,@%glib-or-gtk-build-system-modules)) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index f6b8b49801..d0975fcab0 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -22,7 +22,6 @@ #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) #:use-module (guix build utils) - #:use-module (guix build rpath) #:use-module (guix build gremlin) #:use-module (guix elf) #:use-module (ice-9 match) @@ -78,42 +77,13 @@ (define* (install #:rest args) (invoke "ninja" "install")) -(define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec" - "bin" "sbin")) - outputs #:allow-other-keys) - "Try to make sure all ELF files in ELF-DIRECTORIES are able to find their -local dependencies in their RUNPATH, by searching for the needed libraries in -the directories of the package, and adding them to the RUNPATH if needed. -Also shrink the RUNPATH to what is needed, +(define* (shrink-runpath #:key (elf-directories '("lib" "lib64" "libexec" + "bin" "sbin")) + outputs #:allow-other-keys) + "Go through all ELF files from ELF-DIRECTORIES and shrink the RUNPATH since a lot of directories are left over from the build phase of meson, for example libraries only needed for the tests." - ;; Find the directories (if any) that contains DEP-NAME. The directories - ;; searched are the ones that ELF-FILES are in. - (define (find-deps dep-name elf-files) - (map dirname (filter (lambda (file) - (string=? dep-name (basename file))) - elf-files))) - - ;; Return a list of libraries that FILE needs. - (define (file-needed file) - (let* ((elf (call-with-input-file file - (compose parse-elf get-bytevector-all))) - (dyninfo (elf-dynamic-info elf))) - (if dyninfo - (elf-dynamic-info-needed dyninfo) - '()))) - - - ;; If FILE needs any libs that are part of ELF-FILES, the RUNPATH - ;; is modified accordingly. - (define (handle-file file elf-files) - (let* ((dep-dirs (concatenate (map (lambda (dep-name) - (find-deps dep-name elf-files)) - (file-needed file))))) - (unless (null? dep-dirs) - (augment-rpath file (string-join dep-dirs ":"))))) - (define handle-output (match-lambda ((output . directory) @@ -129,10 +99,7 @@ for example libraries only needed for the tests." (elf-list (concatenate (map (lambda (dir) (find-files dir elf-pred)) existing-elf-dirs)))) - (for-each (lambda (elf-file) - (strip-runpath elf-file) - (handle-file elf-file elf-list)) - elf-list))))) + (for-each strip-runpath elf-list))))) (for-each handle-output outputs) #t) @@ -144,13 +111,8 @@ for example libraries only needed for the tests." (replace 'configure configure) (replace 'build build) (replace 'check check) - ;; 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))) + (replace 'install install) + (add-after 'strip 'shrink-runpath shrink-runpath))) (define* (meson-build #:key inputs phases #:allow-other-keys #:rest args) From fb76ef8477f189d35c1e91bf026236f5627f3a27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:45:17 +0200 Subject: [PATCH 203/435] gnu: Remove GCC ICE workarounds. * gnu/packages/patches/doxygen-gcc-ice.patch, gnu/packages/patches/mariadb-gcc-ice.patch, gnu/packages/patches/perf-gcc-ice.patch: Delete files * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/databases.scm (mariadb)[source](patches): Likewise. * gnu/packages/linux.scm (perf)[source](patches): Likewise. * gnu/packages/documentation.scm (doxygen)[inputs, arguments]: Likewise. --- gnu/local.mk | 3 --- gnu/packages/databases.scm | 3 +-- gnu/packages/documentation.scm | 15 +------------ gnu/packages/linux.scm | 4 +--- gnu/packages/patches/doxygen-gcc-ice.patch | 25 ---------------------- gnu/packages/patches/mariadb-gcc-ice.patch | 24 --------------------- gnu/packages/patches/perf-gcc-ice.patch | 13 ----------- 7 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/doxygen-gcc-ice.patch delete mode 100644 gnu/packages/patches/mariadb-gcc-ice.patch delete mode 100644 gnu/packages/patches/perf-gcc-ice.patch diff --git a/gnu/local.mk b/gnu/local.mk index 341e1c4fdf..e4a7c3d141 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -641,7 +641,6 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ - %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ @@ -927,7 +926,6 @@ dist_patch_DATA = \ %D%/packages/patches/mailutils-uninitialized-memory.patch \ %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 \ @@ -1008,7 +1006,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/perf-gcc-ice.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bf0484197b..4c0a6d4c28 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,8 +636,7 @@ Language.") (sha256 (base32 "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) - (patches (search-patches "mariadb-gcc-ice.patch" - "mariadb-client-test-32bit.patch")) + (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index f533535f03..9425df707c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -139,23 +139,10 @@ markup) can be customized and extended by the user.") ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation (inputs - `(("bash" ,bash-minimal) - ,@(if (string-prefix? "armhf-" (%current-system)) - `(("gcc-ice-patch" ,@(search-patches "doxygen-gcc-ice.patch"))) - '()))) + `(("bash" ,bash-minimal))) (arguments `(#:test-target "tests" #:phases (modify-phases %standard-phases - ;; Work around an ICE that shows up on native compiles for - ;; armhf-linux. - ,@(if (string-prefix? "armhf-" (%current-system)) - `((add-after 'unpack 'apply-gcc-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch))))) - '()) - (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/portable.cpp" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7958ac470..cbb8f8f01f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2508,9 +2508,7 @@ in a digital read-out.") (package (name "perf") (version (package-version linux-libre)) - (source (origin - (inherit (package-source linux-libre)) - (patches (search-patches "perf-gcc-ice.patch")))) + (source (package-source linux-libre)) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/doxygen-gcc-ice.patch b/gnu/packages/patches/doxygen-gcc-ice.patch deleted file mode 100644 index fbfedcb7ab..0000000000 --- a/gnu/packages/patches/doxygen-gcc-ice.patch +++ /dev/null @@ -1,25 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - -Yes it's a terrible patch, but it does the job. - ---- doxygen-1.8.13/qtools/qutfcodec.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ doxygen-1.8.13/qtools/qutfcodec.cpp 2018-06-08 14:14:29.614009929 +0200 -@@ -189,7 +189,7 @@ int QUtf16Codec::heuristicContentMatch(c - } - - -- -+volatile const void *bomPointer = &QChar::byteOrderMark; - - class QUtf16Encoder : public QTextEncoder { - bool headerdone; -@@ -209,7 +209,7 @@ public: - headerdone = TRUE; - len_in_out = (1+uc.length())*(int)sizeof(QChar); - QCString d(len_in_out); -- memcpy(d.rawData(),&QChar::byteOrderMark,sizeof(QChar)); -+ memcpy(d.rawData(),(void *)bomPointer,sizeof(QChar)); - memcpy(d.rawData()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar)); - return d; - } diff --git a/gnu/packages/patches/mariadb-gcc-ice.patch b/gnu/packages/patches/mariadb-gcc-ice.patch deleted file mode 100644 index 59b188f45a..0000000000 --- a/gnu/packages/patches/mariadb-gcc-ice.patch +++ /dev/null @@ -1,24 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - ---- mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:13:12.604020250 +0200 -+++ mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:14:11.907753417 +0200 -@@ -847,6 +847,8 @@ - return function_exit(kWho, 0); - } - -+volatile const void *kSyncHeaderPtr = &ReplSemiSyncMaster::kSyncHeader; -+ - int ReplSemiSyncMaster::reserveSyncHeader(unsigned char *header, - unsigned long size) - { -@@ -873,7 +875,7 @@ - /* Set the magic number and the sync status. By default, no sync - * is required. - */ -- memcpy(header, kSyncHeader, sizeof(kSyncHeader)); -+ memcpy(header, (void *)kSyncHeaderPtr, sizeof(kSyncHeader)); - hlen= sizeof(kSyncHeader); - } - return function_exit(kWho, hlen); - diff --git a/gnu/packages/patches/perf-gcc-ice.patch b/gnu/packages/patches/perf-gcc-ice.patch deleted file mode 100644 index 58ab5359c2..0000000000 --- a/gnu/packages/patches/perf-gcc-ice.patch +++ /dev/null @@ -1,13 +0,0 @@ -Work around this GCC ICE: . - ---- linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:30:39.368146035 +0200 -+++ linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:34:04.667212378 +0200 -@@ -135,7 +135,7 @@ int do_write(struct feat_fd *ff, const v - int write_padded(struct feat_fd *ff, const void *bf, - size_t count, size_t count_aligned) - { -- static const char zero_buf[NAME_ALIGN]; -+ static const char zero_buf[NAME_ALIGN] = { 0 }; - int err = do_write(ff, bf, count); - - if (!err) From 00ffbfd39416e91e1d0e3ce1ee5337a7a2665dfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:10:32 +0200 Subject: [PATCH 204/435] gnu: python-idna: Update to 2.7. * gnu/packages/python.scm (python-idna): Update to 2.7. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e574aec555..8c5e0890c5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6322,14 +6322,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "13qaab6d0s15gknz8v3zbcfmbj6v86hn9pjxgkdf62ch13imssic")))) + "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") From 064732bd0c3bb43a07da30bdfc39e0ac255550b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:25:58 +0200 Subject: [PATCH 205/435] gnu: python-certifi: Update to 2018.8.13. * gnu/packages/python-crypto.scm (python-certifi): Update to 2018.8.13. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ed8aa836fd..267f769402 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -338,13 +338,13 @@ password storage.") (define-public python-certifi (package (name "python-certifi") - (version "2017.1.23") + (version "2018.8.13") (source (origin (method url-fetch) (uri (pypi-uri "certifi" version)) (sha256 (base32 - "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1")))) + "1x7jy10rz3100g9iw7c2czcw2z4lqfaalsd8yg991l4d82hnh7ac")))) (build-system python-build-system) (home-page "https://certifi.io/") (synopsis "Python CA certificate bundle") From a20016e15a8f1a02dcc77666603ad71538b5a2f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:41:30 +0200 Subject: [PATCH 206/435] gnu: python-urllib3: Update to 1.23. * gnu/packages/python-web.scm (python-urllib3): Update to 1.23. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2e98a95d4b..494fbe7999 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1286,14 +1286,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.18.1") + (version "1.23") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "1wb8aqnq53vzh2amrv8kc66f3h6fx217y0q62y6n30a64p2yqmam")))) + "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6")))) (build-system python-build-system) (arguments `(#:tests? #f)) (native-inputs From 22cf2f4abfa2b1ad5620d35644b6538b7041dbf1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 18:00:16 +0200 Subject: [PATCH 207/435] gnu: python-cffi: Update to 1.11.5. * gnu/packages/libffi.scm (python-cffi): Update to 1.11.5. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 7d3abaff18..d1b910bd07 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -82,13 +82,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.11.4") + (version "1.11.5") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "07fiy4wqg8g08x38r04ydjr8n6g0g74gb8si8b6jhymijalq746z")))) + (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs From bd65ecf4608152d586be610add0c9d2ab2b4ac25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 20:03:29 +0200 Subject: [PATCH 208/435] gnu: boost: Provide libboost_python compatibility symlink. * gnu/packages/boost.scm (boost)[arguments]: Add phase 'provide-libboost_python'. --- gnu/packages/boost.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index fbd0425c96..71b34ada1f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -100,7 +100,18 @@ make-flags))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "./b2" "install" make-flags)))))) + (apply invoke "./b2" "install" make-flags))) + (add-after 'install 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Boost can build support for both Python 2 and Python 3 since + ;; version 1.67.0, and suffixes each library with the Python + ;; version. Many consumers only check for libboost_python + ;; however, so we provide it here as suggested in + ;; . + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.so" "libboost_python.so")) + #t)))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") From 3ea66dadf6113f885ecc26484a535a0003bd2383 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 15:36:59 +0200 Subject: [PATCH 209/435] gnu: boost: Update to 1.68.0. * gnu/packages/boost.scm (boost): Update to 1.68.0. [arguments]: Remove /bin/sh substitution. --- gnu/packages/boost.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 71b34ada1f..aa4a4d3dd8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.67.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) + "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) @@ -78,7 +78,6 @@ (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" "tools/build/src/engine/execunix.c" "tools/build/src/engine/Jambase" "tools/build/src/engine/jambase.c") From e13b547407b0db6c0f8205154ea43d6f99e8b186 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 16:13:45 +0200 Subject: [PATCH 210/435] gnu: glibc: Update to 2.28. * gnu/packages/patches/glibc-2.28-git-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (glibc/linux): Update to 2.28. [source](patches): Add 'glibc-2.28-git-fixes.patch'. Remove 2.27 equivalent. (glibc-2.28): Remove variable. (glibc-2.27): New public variable --- gnu/local.mk | 1 + gnu/packages/base.scm | 28 +- .../patches/glibc-2.28-git-fixes.patch | 248 ++++++++++++++++++ 3 files changed, 263 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.28-git-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index e4a7c3d141..d1228b9261 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -740,6 +740,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ + %D%/packages/patches/glibc-2.28-git-fixes.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 572d64f53a..c073672473 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -561,13 +561,13 @@ store.") (name "glibc") ;; Note: Always use a dot after the minor version since various places rely ;; on "version-major+minor" to determine where locales are found. - (version "2.27") + (version "2.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji")) + "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -579,7 +579,7 @@ store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-2.27-git-fixes.patch" + "glibc-2.28-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" @@ -862,25 +862,25 @@ GLIBC/HURD for a Hurd host" (define-syntax glibc (identifier-syntax (glibc-for-target))) -;; The "next" libc. Useful for populating locale data before reconfiguring the -;; entire system on it. Will be the default in the next rebuild cycle. -(define-public glibc-2.28 +;; Below are old libc versions, which we use mostly to build locale data in +;; the old format (which the new libc cannot cope with.) + +(define-public glibc-2.27 (package (inherit glibc) - (version "2.28") + (version "2.27") (source (origin (inherit (package-source glibc)) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) - (patches (search-patches "glibc-allow-kernel-2.6.32.patch" - "glibc-ldd-x86_64.patch" + "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-2.27-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch")))))) - -;; Below are old libc versions, which we use mostly to build locale data in -;; the old format (which the new libc cannot cope with.) + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch")))))) (define-public glibc-2.26 (package diff --git a/gnu/packages/patches/glibc-2.28-git-fixes.patch b/gnu/packages/patches/glibc-2.28-git-fixes.patch new file mode 100644 index 0000000000..7e370ef0b1 --- /dev/null +++ b/gnu/packages/patches/glibc-2.28-git-fixes.patch @@ -0,0 +1,248 @@ +This file contains fixes from the "release/2.28/master" branch: +https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.28/master + +Currently we have these commits (sans tests and ChangeLog updates): +7f11842e7483da7aa9fa3031be122021978ef600 +726e1554ce4db5e35af41cb0110c54c5e1232054 +4b25485f03158959cff45379eecc1d73c7dcdd11 +d05b05d1570ba3ae354a2f5a3cfeefb373b09979 +bfcfa22589f2b4277a65e60c6b736b6bbfbd87d0 +2f498f3d140ab5152bd784df2be7af7d9c5e63ed + +diff --git a/htl/Versions b/htl/Versions +index 6a63a1b8a1..c5a616da10 100644 +--- a/htl/Versions ++++ b/htl/Versions +@@ -150,6 +150,8 @@ libpthread { + __cthread_keycreate; + __cthread_getspecific; + __cthread_setspecific; ++ __pthread_getspecific; ++ __pthread_setspecific; + __pthread_getattr_np; + __pthread_attr_getstack; + } + +diff --git a/sysdeps/htl/pt-getspecific.c b/sysdeps/htl/pt-getspecific.c +index a0227a67f6..64ddf9551a 100644 +--- a/sysdeps/htl/pt-getspecific.c ++++ b/sysdeps/htl/pt-getspecific.c +@@ -36,3 +36,4 @@ __pthread_getspecific (pthread_key_t key) + return self->thread_specifics[key]; + } + strong_alias (__pthread_getspecific, pthread_getspecific); ++hidden_def (__pthread_getspecific) +diff --git a/sysdeps/htl/pt-setspecific.c b/sysdeps/htl/pt-setspecific.c +index a46a12f157..02aff417ef 100644 +--- a/sysdeps/htl/pt-setspecific.c ++++ b/sysdeps/htl/pt-setspecific.c +@@ -48,3 +48,4 @@ __pthread_setspecific (pthread_key_t key, const void *value) + return 0; + } + strong_alias (__pthread_setspecific, pthread_setspecific); ++hidden_def (__pthread_setspecific) +diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h +index 132ac1718e..71c2fcd9c6 100644 +--- a/sysdeps/htl/pthreadP.h ++++ b/sysdeps/htl/pthreadP.h +@@ -68,6 +68,8 @@ struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attri + + #if IS_IN (libpthread) + hidden_proto (__pthread_key_create) ++hidden_proto (__pthread_getspecific) ++hidden_proto (__pthread_setspecific) + hidden_proto (_pthread_mutex_init) + #endif + +diff --git a/sysdeps/unix/sysv/linux/getdents64.c b/sysdeps/unix/sysv/linux/getdents64.c +index 3bde0cf4f0..bc140b5a7f 100644 +--- a/sysdeps/unix/sysv/linux/getdents64.c ++++ b/sysdeps/unix/sysv/linux/getdents64.c +@@ -33,41 +33,80 @@ strong_alias (__getdents64, __getdents) + # include + + # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) +-# include ++# include ++# include + +-/* kernel definition of as of 3.2. */ +-struct compat_linux_dirent ++static ssize_t ++handle_overflow (int fd, __off64_t offset, ssize_t count) + { +- /* Both d_ino and d_off are compat_ulong_t which are defined in all +- architectures as 'u32'. */ +- uint32_t d_ino; +- uint32_t d_off; +- unsigned short d_reclen; +- char d_name[1]; +-}; ++ /* If this is the first entry in the buffer, we can report the ++ error. */ ++ if (count == 0) ++ { ++ __set_errno (EOVERFLOW); ++ return -1; ++ } ++ ++ /* Otherwise, seek to the overflowing entry, so that the next call ++ will report the error, and return the data read so far.. */ ++ if (__lseek64 (fd, offset, SEEK_SET) != 0) ++ return -1; ++ return count; ++} + + ssize_t + __old_getdents64 (int fd, char *buf, size_t nbytes) + { +- ssize_t retval = INLINE_SYSCALL_CALL (getdents, fd, buf, nbytes); ++ /* We do not move the individual directory entries. This is only ++ possible if the target type (struct __old_dirent64) is smaller ++ than the source type. */ ++ _Static_assert (offsetof (struct __old_dirent64, d_name) ++ <= offsetof (struct dirent64, d_name), ++ "__old_dirent64 is larger than dirent64"); ++ _Static_assert (__alignof__ (struct __old_dirent64) ++ <= __alignof__ (struct dirent64), ++ "alignment of __old_dirent64 is larger than dirent64"); + +- /* The kernel added the d_type value after the name. Change this now. */ +- if (retval != -1) ++ ssize_t retval = INLINE_SYSCALL_CALL (getdents64, fd, buf, nbytes); ++ if (retval > 0) + { +- union +- { +- struct compat_linux_dirent k; +- struct dirent u; +- } *kbuf = (void *) buf; +- +- while ((char *) kbuf < buf + retval) ++ char *p = buf; ++ char *end = buf + retval; ++ while (p < end) + { +- char d_type = *((char *) kbuf + kbuf->k.d_reclen - 1); +- memmove (kbuf->u.d_name, kbuf->k.d_name, +- strlen (kbuf->k.d_name) + 1); +- kbuf->u.d_type = d_type; ++ struct dirent64 *source = (struct dirent64 *) p; ++ ++ /* Copy out the fixed-size data. */ ++ __ino_t ino = source->d_ino; ++ __off64_t offset = source->d_off; ++ unsigned int reclen = source->d_reclen; ++ unsigned char type = source->d_type; ++ ++ /* Check for ino_t overflow. */ ++ if (__glibc_unlikely (ino != source->d_ino)) ++ return handle_overflow (fd, offset, p - buf); ++ ++ /* Convert to the target layout. Use a separate struct and ++ memcpy to side-step aliasing issues. */ ++ struct __old_dirent64 result; ++ result.d_ino = ino; ++ result.d_off = offset; ++ result.d_reclen = reclen; ++ result.d_type = type; ++ ++ /* Write the fixed-sized part of the result to the ++ buffer. */ ++ size_t result_name_offset = offsetof (struct __old_dirent64, d_name); ++ memcpy (p, &result, result_name_offset); ++ ++ /* Adjust the position of the name if necessary. Copy ++ everything until the end of the record, including the ++ terminating NUL byte. */ ++ if (result_name_offset != offsetof (struct dirent64, d_name)) ++ memmove (p + result_name_offset, source->d_name, ++ reclen - offsetof (struct dirent64, d_name)); + +- kbuf = (void *) ((char *) kbuf + kbuf->k.d_reclen); ++ p += reclen; + } + } + return retval; + +diff --git a/misc/error.c b/misc/error.c +index b4e8b6c938..03378e2f2a 100644 +--- a/misc/error.c ++++ b/misc/error.c +@@ -319,6 +319,7 @@ error (int status, int errnum, const char *message, ...) + + va_start (args, message); + error_tail (status, errnum, message, args); ++ va_end (args); + + #ifdef _LIBC + _IO_funlockfile (stderr); +@@ -390,6 +391,7 @@ error_at_line (int status, int errnum, const char *file_name, + + va_start (args, message); + error_tail (status, errnum, message, args); ++ va_end (args); + + #ifdef _LIBC + _IO_funlockfile (stderr); + +diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c +index 265a02434d..7293b795b6 100644 +--- a/nscd/nscd_conf.c ++++ b/nscd/nscd_conf.c +@@ -190,7 +190,10 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb]) + if (!arg1) + error (0, 0, _("Must specify user name for server-user option")); + else +- server_user = xstrdup (arg1); ++ { ++ free ((char *) server_user); ++ server_user = xstrdup (arg1); ++ } + } + else if (strcmp (entry, "stat-user") == 0) + { +@@ -198,6 +201,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb]) + error (0, 0, _("Must specify user name for stat-user option")); + else + { ++ free ((char *) stat_user); + stat_user = xstrdup (arg1); + + struct passwd *pw = getpwnam (stat_user); + +diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c +index cfd34b66b9..35b0bfc5d2 100644 +--- a/nss/nss_files/files-alias.c ++++ b/nss/nss_files/files-alias.c +@@ -221,6 +221,13 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + { + while (! feof_unlocked (listfile)) + { ++ if (room_left < 2) ++ { ++ free (old_line); ++ fclose (listfile); ++ goto no_more_room; ++ } ++ + first_unused[room_left - 1] = '\xff'; + line = fgets_unlocked (first_unused, room_left, + listfile); +@@ -229,6 +236,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + if (first_unused[room_left - 1] != '\xff') + { + free (old_line); ++ fclose (listfile); + goto no_more_room; + } + +@@ -256,6 +264,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + + __alignof__ (char *))) + { + free (old_line); ++ fclose (listfile); + goto no_more_room; + } + room_left -= ((first_unused - cp) + From 1aef659e86242020c7ec813e9a1f6ad35431de9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 23:19:28 +0200 Subject: [PATCH 211/435] gnu: gcc: Fix build with glibc >= 2.28. * gnu/packages/patches/gcc-libsanitizer-ustat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gcc.scm (gcc-5)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 1 + .../patches/gcc-libsanitizer-ustat.patch | 41 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/gcc-libsanitizer-ustat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d1228b9261..9c79e843a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,6 +690,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ %D%/packages/patches/gcc-libsanitizer-fix.patch \ + %D%/packages/patches/gcc-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-strmov-store-file-names.patch \ %D%/packages/patches/gcc-4-compile-with-gcc-5.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 46b70ce497..2e2135ab51 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -431,6 +431,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k")) (patches (search-patches "gcc-arm-bug-71399.patch" + "gcc-libsanitizer-ustat.patch" "gcc-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch" "gcc-5-source-date-epoch-1.patch" diff --git a/gnu/packages/patches/gcc-libsanitizer-ustat.patch b/gnu/packages/patches/gcc-libsanitizer-ustat.patch new file mode 100644 index 0000000000..a4e0c6affa --- /dev/null +++ b/gnu/packages/patches/gcc-libsanitizer-ustat.patch @@ -0,0 +1,41 @@ +Remove use of deprecated ustat interface in glibc 2.28: + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835 + +Taken from upstream: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=260684 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 858bb2184505..de18e56d11cf 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -250,7 +249,19 @@ namespace __sanitizer { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID From 95895d53b06015fa74f07643cf98f86ae21551d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:32:29 +0200 Subject: [PATCH 212/435] gnu: m4: Fix FTBFS with glibc >= 2.28. * gnu/packages/patches/m4-gnulib-libio.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/m4.scm (m4)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/m4.scm | 1 + gnu/packages/patches/m4-gnulib-libio.patch | 128 +++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 gnu/packages/patches/m4-gnulib-libio.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9c79e843a8..ab21d6b28e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,6 +960,7 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/myrepos-CVE-2018-7032.patch \ + %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index b223ce91d1..090f5578e3 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -32,6 +32,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/m4/m4-" version ".tar.xz")) + (patches (search-patches "m4-gnulib-libio.patch")) (sha256 (base32 "01sfjd5a4waqw83bibvmn522g69qfqvwig9i2qlgy154l1nfihgj")))) diff --git a/gnu/packages/patches/m4-gnulib-libio.patch b/gnu/packages/patches/m4-gnulib-libio.patch new file mode 100644 index 0000000000..a26622ccf3 --- /dev/null +++ b/gnu/packages/patches/m4-gnulib-libio.patch @@ -0,0 +1,128 @@ +Adjust the bundled gnulib to cope with removal of libio interface in +glibc 2.28. + +Based on this upstream patch, without hunks that do not apply to m4: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e + +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0..a6edfa1 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/lib/fpending.c +index c84e3a5..789f50e 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c..3aedcc3 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/lib/freadahead.c +index c2ecb5b..23ec76e 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/lib/freading.c b/lib/freading.c +index 73c28ac..c24d0c8 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab5..193f4e8 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e..05c5752 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + From c7b87eeda272fcc6c9212452355ad5b4f780bb36 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:54:44 +0200 Subject: [PATCH 213/435] gnu: gzip: Fix FTBFS with glibc >= 2.28. * gnu/packages/compression.scm (gzip)[arguments]: Add phase 'patch-for-glibc-2.28'. --- gnu/packages/compression.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index bdae21ff64..95cf533327 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -225,6 +225,21 @@ adding and extracting files to/from a tar archive.") '(#:tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-glibc-2.28 + (lambda _ + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)) (add-after 'unpack 'use-absolute-name-of-gzip (lambda* (#:key outputs #:allow-other-keys) (substitute* "gunzip.in" From a8dcf6cec7c5ded4bd0967f00b9b502d7d66e5ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:14:07 +0200 Subject: [PATCH 214/435] gnu: coreutils: Update to 8.30. * gnu/packages/base.scm (coreutils): Update to 8.30. [arguments]: Add phase to skip broken test. --- gnu/packages/base.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c073672473..114413bafc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -326,14 +326,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.29") + (version "8.30") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j")))) + "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! @@ -364,7 +364,17 @@ used to apply commands with arbitrarily long arguments.") (substitute* (find-files "gnulib-tests" "\\.c$") (("/bin/sh") (which "sh"))) (substitute* (find-files "tests" "\\.sh$") - (("#!/bin/sh") (which "sh"))) + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) + (add-before 'check 'disable-broken-test + (lambda _ + ;; This test hits the 127 character shebang limit in the build + ;; environment due to the way "env -S" splits arguments into + ;; shebangs. Note that "env-S-script.sh" works around this + ;; specific issue, but "env-S.pl" is not adjusted for build + ;; environments with long prefixes (/tmp/guix-build-...). + (substitute* "Makefile" + (("^.*tests/misc/env-S.pl.*$") "")) #t))) ;; Work around a cross-compilation bug whereby libcoreutils.a would From 8c8ded2cc9201e69e87999bb40ef09c6c868deb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:37:50 +0200 Subject: [PATCH 215/435] gnu: grep: Work around test failure with glibc 2.28. * gnu/packages/base.scm (grep)[arguments]: Add phase 'disable-failing-tests'. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 114413bafc..1c652bcce4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -102,6 +102,15 @@ command-line arguments, multiple languages, and so on.") (arguments `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + ;; These tests are expected to fail due to a glibc bug which has + ;; been fixed in 2.28, so they are unexpectedly passing. They + ;; should be fixed for grep versions > 3.1. + (substitute* "tests/Makefile.in" + (("^[[:blank:]]+backref-alt[[:blank:]]+\\\\") "\\") + (("^[[:blank:]]+triple-backref[[:blank:]]+\\\\") "\\")) + #t)) (add-after 'install 'fix-egrep-and-fgrep ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; absolute file name instead of searching for it in $PATH. From 2fa4066c0a7c44ec5686a6197542e56c9e47fa45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 17:24:51 +0200 Subject: [PATCH 216/435] gnu: findutils: Fix build with glibc 2.28. * gnu/packages/patches/findutils-gnulib-libio.patch, gnu/packages/patches/findutils-makedev.patch: New files. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (findutils)[source](patches): Use them. --- gnu/local.mk | 2 + gnu/packages/base.scm | 2 + .../patches/findutils-gnulib-libio.patch | 114 ++++++++++++++++++ gnu/packages/patches/findutils-makedev.patch | 22 ++++ 4 files changed, 140 insertions(+) create mode 100644 gnu/packages/patches/findutils-gnulib-libio.patch create mode 100644 gnu/packages/patches/findutils-makedev.patch diff --git a/gnu/local.mk b/gnu/local.mk index ab21d6b28e..e98973be07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -671,7 +671,9 @@ dist_patch_DATA = \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ + %D%/packages/patches/findutils-gnulib-libio.patch \ %D%/packages/patches/findutils-localstatedir.patch \ + %D%/packages/patches/findutils-makedev.patch \ %D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flint-ldconfig.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1c652bcce4..3a1186673e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -298,7 +298,9 @@ interactive means to merge two files.") (base32 "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y")) (patches (search-patches + "findutils-gnulib-libio.patch" "findutils-localstatedir.patch" + "findutils-makedev.patch" "findutils-test-xargs.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/findutils-gnulib-libio.patch b/gnu/packages/patches/findutils-gnulib-libio.patch new file mode 100644 index 0000000000..79f9fd914d --- /dev/null +++ b/gnu/packages/patches/findutils-gnulib-libio.patch @@ -0,0 +1,114 @@ +Adjust to removal of libio interface in glibc 2.28. + +Based on this gnulib commit: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e + +diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c +index 5ae3e41..7a82470 100644 +--- a/gl/lib/fflush.c ++++ b/gl/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c +index f313b22..ecdf82d 100644 +--- a/gl/lib/fpurge.c ++++ b/gl/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c +index 094daab..3f8101e 100644 +--- a/gl/lib/freadahead.c ++++ b/gl/lib/freadahead.c +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/gl/lib/freading.c b/gl/lib/freading.c +index 0512b19..8c48fe4 100644 +--- a/gl/lib/freading.c ++++ b/gl/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c +index 1c65d2a..9026408 100644 +--- a/gl/lib/fseeko.c ++++ b/gl/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h +index 502d891..ea38ee2 100644 +--- a/gl/lib/stdio-impl.h ++++ b/gl/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/gnu/packages/patches/findutils-makedev.patch b/gnu/packages/patches/findutils-makedev.patch new file mode 100644 index 0000000000..2f16c625d8 --- /dev/null +++ b/gnu/packages/patches/findutils-makedev.patch @@ -0,0 +1,22 @@ +Include for "makedev". + +Taken from this gnulib commit: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4da63c5881f60f71999a943612da9112232b9161 + +diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c +index bb4e4ee21..cf4020e2a 100644 +--- a/gl/lib/mountlist.c ++++ b/gl/lib/mountlist.c +@@ -37,6 +37,12 @@ + # include + #endif + ++#if MAJOR_IN_MKDEV ++# include ++#elif MAJOR_IN_SYSMACROS ++# include ++#endif ++ + #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ + # if HAVE_SYS_UCRED_H + # include /* needed on OSF V4.0 for definition of NGROUPS, From 34f4c214b63c46ee609bbaa15b063e20bc739ce3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:34:59 +0200 Subject: [PATCH 217/435] gnu: flex: Update bison-for-tests to 3.0.5. * gnu/packages/flex.scm (flex)[inputs]: Make BISON-FOR-TESTS inherit source from BISON, and disable tests on it since they require flex. --- gnu/packages/flex.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 29c5c92766..e08b0c13db 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -45,22 +45,10 @@ (build-system gnu-build-system) (inputs (let ((bison-for-tests - ;; Work around an incompatibility with Bison 3.0: - ;; . (package (inherit bison) - (version "2.7.1") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnu/bison/" - "bison-" version ".tar.xz")) - (sha256 - (base32 - "1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl")))) - - ;; Unlike Bison 3.0, this version did not need Flex for its - ;; tests, so it allows us to break the cycle. + ;; Disable tests, since they require flex. + (arguments '(#:tests? #f)) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests) ("indent" ,indent)))) From cf59c62853c079938f3e415a2fb0c5821df7c607 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:37:35 +0200 Subject: [PATCH 218/435] gnu: Remove bison@2.7. * gnu/packages/bison.scm (bison-2.7): Remove variable. --- gnu/packages/bison.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 3e47a2a1b2..71de47762d 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -53,15 +53,3 @@ deterministic or generalized LR parser from an annotated, context-free grammar. It is versatile enough to have many applications, from parsers for simple tools through complex programming languages.") (license gpl3+))) - -(define-public bison-2.7 - (package (inherit bison) - (version "2.7") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/bison/bison-" - version ".tar.xz")) - (sha256 - (base32 - "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23")))))) From 27c1df05a866b639a61e16d48b3f2da8fa5eb767 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:27:46 +0200 Subject: [PATCH 219/435] gnu: linux-libre-headers: Update to 4.14.67. * gnu/packages/linux.scm (linux-libre-headers): Update to 4.14.67. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cbb8f8f01f..0dbbbe3f60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -163,13 +163,13 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define-public linux-libre-headers (package (name "linux-libre-headers") - (version "4.14.26") + (version "4.14.67") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1m2zr17wpasg5riysbaa4g5i492jzr93py2jm088ki818s4a9cm3")))) + "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments From 9b3b4c05a06bb8ef22350706b66043b5e93d8d66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 31 Jul 2018 23:19:28 +0200 Subject: [PATCH 220/435] gnu: mesa: Build against elfutils instead of libelf. * gnu/packages/gl.scm (mesa)[inputs]: Change from LIBELF to ELFUTILS. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 28e283640d..5592e5fe67 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -252,7 +252,7 @@ also known as DXTn or DXTC) for Mesa.") ("xorgproto" ,xorgproto))) (inputs `(("expat" ,expat) - ("libelf" ,libelf) ;required for r600 when using llvm + ("libelf" ,elfutils) ;required for r600 when using llvm ("libva" ,(force libva-without-mesa)) ("libxml2" ,libxml2) ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support From 030c912616c8ee1595218e304460041bcb4f1ceb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 12:44:46 +0200 Subject: [PATCH 221/435] gnu: libdrm: Update to 2.4.93. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.93. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c8dd470056..ffd9e252e8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -316,7 +316,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.92") + (version "2.4.93") (source (origin (method url-fetch) @@ -326,7 +326,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79")) + "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments From 65ba72d74954e85412144b4737fccfa914ff107b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:57:35 +0200 Subject: [PATCH 222/435] gnu: libx11: Remove graft for 1.6.6. * gnu/packages/xorg.scm (libx11): Update to 1.6.6. [replacement]: Remove field. (libx11-1.6.6): Remove variable. --- gnu/packages/xorg.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3875765d25..787a508ab5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5238,8 +5238,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.5") - (replacement libx11-1.6.6) + (version "1.6.6") (source (origin (method url-fetch) @@ -5249,7 +5248,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d")))) + "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5269,20 +5268,6 @@ draggable titlebars and borders.") (description "Xorg Core X11 protocol client library.") (license license:x11))) -;; Replacement package to fix multiple security bugs: -;; . -(define-public libx11-1.6.6 - (package - (inherit libx11) - (version "1.6.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/lib/libX11-" - version ".tar.bz2")) - (sha256 - (base32 - "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))))) - ;; packages of height 5 in the propagated-inputs tree (define-public libxcursor From c37e932764f42df90b77b97af4dd71e5b485800b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 19:23:35 +0200 Subject: [PATCH 223/435] gnu: gdb: Remove obsolete patch. * gnu/packages/patches/gdb-python-3.7.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gdb.scm (gdb)[source](patches): Remove field. --- gnu/local.mk | 1 - gnu/packages/gdb.scm | 1 - gnu/packages/patches/gdb-python-3.7.patch | 52 ----------------------- 3 files changed, 54 deletions(-) delete mode 100644 gnu/packages/patches/gdb-python-3.7.patch diff --git a/gnu/local.mk b/gnu/local.mk index aac3a66577..bacfc28c6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -716,7 +716,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2018-5711.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ - %D%/packages/patches/gdb-python-3.7.patch \ %D%/packages/patches/gdm-CVE-2018-14424.patch \ %D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index d7b194685c..f0c4c8b804 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -42,7 +42,6 @@ (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) - (patches (search-patches "gdb-python-3.7.patch")) (sha256 (base32 "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p")))) diff --git a/gnu/packages/patches/gdb-python-3.7.patch b/gnu/packages/patches/gdb-python-3.7.patch deleted file mode 100644 index c51442c8b2..0000000000 --- a/gnu/packages/patches/gdb-python-3.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure with Python 3.7 and newer. - -Taken from this upstream commit, sans ChangeLog update: - -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=aeab512851bf6ed623d1c6c4305b6ce05e51a10c - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index 1805c90..20fc674 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) - restore_active_ext_lang (previous_active); - } - -+#ifdef IS_PY3K -+/* This is called via the PyImport_AppendInittab mechanism called -+ during initialization, to make the built-in _gdb module known to -+ Python. */ -+PyMODINIT_FUNC -+init__gdb_module (void) -+{ -+ return PyModule_Create (&python_GdbModuleDef); -+} -+#endif -+ - static bool - do_start_initialization () - { -@@ -1707,6 +1718,9 @@ do_start_initialization () - remain alive for the duration of the program's execution, so - it is not freed after this call. */ - Py_SetProgramName (progname_copy); -+ -+ /* Define _gdb as a built-in module. */ -+ PyImport_AppendInittab ("_gdb", init__gdb_module); - #else - Py_SetProgramName (progname.release ()); - #endif -@@ -1716,9 +1730,7 @@ do_start_initialization () - PyEval_InitThreads (); - - #ifdef IS_PY3K -- gdb_module = PyModule_Create (&python_GdbModuleDef); -- /* Add _gdb module to the list of known built-in modules. */ -- _PyImport_FixupBuiltin (gdb_module, "_gdb"); -+ gdb_module = PyImport_ImportModule ("_gdb"); - #else - gdb_module = Py_InitModule ("_gdb", python_GdbMethods); - #endif --- -2.9.3 - From fa2146f769fd5323081561141073108964524062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 20:13:08 +0200 Subject: [PATCH 224/435] gnu: xkeyboard-config: Update to 2.24. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.24. --- 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 787a508ab5..5de3becf79 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3834,7 +3834,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.23.1") + (version "2.24") (source (origin (method url-fetch) @@ -3844,7 +3844,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra")))) + "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) From 8ad65841030759797bf3fd39261ca17a561ec51f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 01:04:45 +0200 Subject: [PATCH 225/435] gnu: mesa: Update to 18.1.7. * gnu/packages/gl.scm (mesa): Update to 18.1.7. --- 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 5592e5fe67..7c9e20e2ee 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.5") + (version "18.1.7") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) + "01kk42m2sjyc4k1nfw6k1lnzipjbbmp5js47drgdvp9vrqr3npk5")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) From 60ecc10f18117b5f1603d7e4d52add8a6427ab0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:17:31 +0200 Subject: [PATCH 226/435] gnu: xorg-server@1.19.3: Rename to "xorg-server-for-tests". ...and update to the latest xorg-server. * gnu/packages/gtk.scm (gtk+, gtkmm, girara): Change XORG-SERVER-1.19.3 references to XORG-SERVER-FOR-TESTS. * gnu/packages/pdf.scm (zathura)[native-inputs]: Likewise. * gnu/packages/xorg.scm (xorg-server-1.19.3): Rename to ... (xorg-server-for-tests): ... this. --- gnu/packages/gtk.scm | 10 +++++----- gnu/packages/pdf.scm | 2 +- gnu/packages/xorg.scm | 15 ++------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 38b65946b8..caa9e38a9e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -715,9 +715,9 @@ application suites.") ("python-wrapper" ,python-wrapper) ;; By using a special xorg-server for GTK+'s tests, we reduce the impact ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (arguments - `(#:disallowed-references (,xorg-server-1.19.3) + `(#:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" @@ -1081,7 +1081,7 @@ toolkit.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("pangomm" ,pangomm) ("cairomm" ,cairomm) @@ -1092,7 +1092,7 @@ toolkit.") `(;; XXX: Tests require C++14 or later. Remove this when the default ;; compiler is >= GCC6. #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:disallowed-references (,xorg-server-1.19.3) + #:disallowed-references (,xorg-server-for-tests) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) @@ -1376,7 +1376,7 @@ and routines to assist in editing internationalized text.") ("check" ,check) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) ;; Listed in 'Requires.private' of 'girara.pc'. (propagated-inputs `(("gtk+" ,gtk+))) (arguments diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index b82222c2fe..0feffec541 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -511,7 +511,7 @@ by using the poppler rendering engine.") ;; For tests. ("check" ,check) - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("sqlite" ,sqlite))) ;; Listed in 'Requires.private' of 'zathura.pc'. (propagated-inputs `(("cairo" ,cairo) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5de3becf79..6b99a3a8a8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5198,21 +5198,10 @@ draggable titlebars and borders.") ;; This package is intended to be used when building GTK+. ;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; packages with the same name and version. -(define-public xorg-server-1.19.3 +(define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server) - (name "xorg-server") - (version "1.19.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xserver/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"))))))) + (inherit xorg-server)))) (define-public xorg-server-xwayland (package From 8d48f358e965536f01a2d9b1e51f74d428091b90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:20:04 +0200 Subject: [PATCH 227/435] gnu: parted: Fix build with glibc >= 2.28. * gnu/packages/patches/parted-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/disk.scm (parted)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/disk.scm | 1 + gnu/packages/patches/parted-glibc-compat.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/parted-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index bacfc28c6e..0a593fac2c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,6 +1009,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ + %D%/packages/patches/parted-glibc-compat.patch \ %D%/packages/patches/patchelf-page-size.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f1b3f265fe..34709b73fc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -76,6 +76,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/parted/parted-" version ".tar.xz")) + (patches (search-patches "parted-glibc-compat.patch")) (sha256 (base32 "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5")))) diff --git a/gnu/packages/patches/parted-glibc-compat.patch b/gnu/packages/patches/parted-glibc-compat.patch new file mode 100644 index 0000000000..edf4afb0d1 --- /dev/null +++ b/gnu/packages/patches/parted-glibc-compat.patch @@ -0,0 +1,17 @@ +Include for "major" and "minor". + +Taken from upstream: +https://git.savannah.gnu.org/cgit/parted.git/commit/?id=ba5e0451b51c983e40afd123b6e0d3eddb55e610 + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 31b98ab..7e86b51 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include /* for uname() */ + #include + #include ++#include + #ifdef ENABLE_DEVICE_MAPPER + #include + #endif From 45c78bf92487fbc659593a9ae75f15281a1068b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:50:39 +0200 Subject: [PATCH 228/435] gnu: gcc: Include libsanitizer patch for versions 6 and 7. * gnu/packages/gcc.scm (gcc-6, gcc-7)[source](patches): Add "gcc-libsanitizer-ustat.patch". --- gnu/packages/gcc.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 2f4198fdea..e5b1433f92 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -469,6 +469,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5")) (patches (search-patches "gcc-libsanitizer-fix.patch" + "gcc-libsanitizer-ustat.patch" "gcc-strmov-store-file-names.patch" "gcc-6-source-date-epoch-1.patch" "gcc-6-source-date-epoch-2.patch" @@ -513,6 +514,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43")) (patches (search-patches "gcc-strmov-store-file-names.patch" + "gcc-libsanitizer-ustat.patch" "gcc-5.0-libvtv-runpath.patch")))) (description "GCC is the GNU Compiler Collection. It provides compiler front-ends From c0fdc5a53d8cc9df27a571834afee0467c2a04ca Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 27 Aug 2018 10:14:21 +0200 Subject: [PATCH 229/435] gnu: wayland: Update to 1.16.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.16.0. --- 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 c8758f7a52..5352ea221b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -437,14 +437,14 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb")))) + "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) From d7c82e8e030c777750aec790ef7255cf5afcf3af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:05:11 +0200 Subject: [PATCH 230/435] gnu: python-numpy: Update to 1.15.1. * gnu/packages/python.scm (python-numpy): Update to 1.15.1. [native-inputs]: Replace PYTHON-NOSE with PYTHON-PYTEST. [arguments]: Set PATH before running tests. Use INVOKE. --- gnu/packages/python.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 244faa273a..a761fcfc22 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2807,7 +2807,7 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.14.5") + (version "1.15.1") (source (origin (method url-fetch) @@ -2816,14 +2816,14 @@ between language specification and implementation aspects.") version "/numpy-" version ".tar.gz")) (sha256 (base32 - "0admjpkih63lm19zbbilq8ck4f6ny5kqi03dk3m6b2mnixsh4jhv")))) + "1yp75fkqk7abq3mrbqdf0pdmr2phkr2mnng0dbqqvvrmv7jwq71w")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs `(("python-cython" ,python-cython) - ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest) ("gfortran" ,gfortran))) (arguments `(#:phases @@ -2868,9 +2868,12 @@ include_dirs = ~a/include (lambda* (#:key outputs inputs #:allow-other-keys) ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) + ;; Make sure "f2py" etc is found. + (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" + ":" (getenv "PATH"))) (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" - "import numpy; numpy.test(verbose=2)")))))))) + (invoke "python" "-c" + "import numpy; numpy.test(verbose=2)"))))))) (home-page "http://www.numpy.org/") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing From e30fc54637c3e47a1e0ab30a5b5f9f35f4c70071 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:28:06 +0200 Subject: [PATCH 231/435] gnu: python-dateutil: Update to 2.7.3. * gnu/packages/time.scm (python-dateutil): Update to 2.7.3. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. [license]: Add ASL2.0. --- gnu/packages/time.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 13eded4179..e9bb6969e3 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -141,15 +141,17 @@ Pendulum instances.") (define-public python-dateutil (package (name "python-dateutil") - (version "2.6.1") + (version "2.7.3") (source (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) (sha256 (base32 - "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749")))) + "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://dateutil.readthedocs.io/en/stable/") @@ -157,7 +159,10 @@ Pendulum instances.") (description "The dateutil module provides powerful extensions to the standard datetime module, available in Python 2.3+.") - (license bsd-3))) + ;; The license was changed from the three-clause BSD license to a dual + ;; Apache 2.0/BSD-3 variant at 2017-12-01. Some code is only available as + ;; BSD-3 still; but all new code is dual licensed (the user can choose). + (license (list bsd-3 asl2.0)))) (define-public python2-dateutil (package-with-python2 python-dateutil)) From 74f3fdbdb3738e191b8723df9132f5d33d9dd11e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:30:02 +0200 Subject: [PATCH 232/435] gnu: python-pygobject: Update to 3.28.3. * gnu/packages/glib.scm (python-pygobject): Update to 3.28.3. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2687ece081..12ecb8ba65 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -598,7 +598,7 @@ useful for C++.") (define-public python-pygobject (package (name "python-pygobject") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) @@ -607,7 +607,7 @@ useful for C++.") "/pygobject-" version ".tar.xz")) (sha256 (base32 - "1jpjws4v17wv99lbhks0g0152w0f70mnwpdn8ibzzfgw2kykli5c")))) + "1c6h3brzlyvzbpdsammnd957azmp6cbzqrd65r400vnh2l8f5lrx")))) (build-system gnu-build-system) (arguments `(#:phases From b49e1e81db2234ea408b903d1cdf9c93434e237c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:33:48 +0200 Subject: [PATCH 233/435] gnu: python-pycairo: Update to 1.17.1. * gnu/packages/gtk.scm (python-pycairo): Update to 1.17.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index caa9e38a9e..1cf99f8db1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1173,7 +1173,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.16.3") + (version "1.17.1") (source (origin (method url-fetch) @@ -1181,7 +1181,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "1xq1bwhyi5imca5kvd28szh2rdzi8g0kaspwaqgsbczqskjj3csv")))) + "165n0g7gp2a0qi8558snvfans17x83jv2lv7bx4vr1rxjbn3a2hg")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 397334d9777592176608184adc5e59d2494719ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:49:05 +0200 Subject: [PATCH 234/435] gnu: python-pillow: Update to 5.2.0. * gnu/packages/patches/python-pillow-fix-failing-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/python.scm (python-pillow): Update to 5.2.0. [source](patches, patch-flags): Remove. [native-inputs]: Replace PYTHON-NOSE with PYTHON-PYTEST. [arguments]: Adjust custom check phase accordingly. --- gnu/local.mk | 1 - .../python-pillow-fix-failing-tests.patch | Bin 112373 -> 0 bytes gnu/packages/python.scm | 13 +++++-------- 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-fix-failing-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a593fac2c..0c74914a16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1074,7 +1074,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ - %D%/packages/patches/python-pillow-fix-failing-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-pillow-fix-failing-tests.patch b/gnu/packages/patches/python-pillow-fix-failing-tests.patch deleted file mode 100644 index 2575d6f612450b717f7577bce1d6f0e7e9f03309..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112373 zcmeFa3!GI~dB4B*<`ROKkc&Do2q!TrF+hg|ri2W?&{WK!$|C zVP?1wFu7^esHmxp8Y^mQqo#V4lwie_HnFAFnz7_()0Wz?rtMfU{GabW`#tR0%;n4( zZ2zB6XTh`A+H0@%u6MobU2EUYoU?RgbwjGIY)$#f6p4z;`s#I+6{)KF+EuBwbq#Ck zE6Y};%4=7xs$Mg4^3;lwX;)n}b>`%mI*1JazK)$yd#sTv1gr zy>fDSnkf) zr>bgKubF^FE0CR9TwWDsgqCO+nOfUWy?O;UudJ+DpDJ62Wy+Sgre zOxAFvgfv_^xwvsk@x%p77L{P}iIXSQAuSs=q^_%8ohnXEyf!suddZC9)bjP%x@+x) z3+B$hdCB}qYZ})?wJh2|VrJ@!Z0K5PCEZyxxg^%qsY+^cX34b4Q`Bst$?8>QD=HhV zTv@$h<+8Gd^6Khk&A?%& zOq@D7HTkOSE_o$Z|S;2hZQJNGCtkvoUX3gXld=Z4xoi5B)pXdmV+aPF0} zoEsfGKHMKVpf`s_+-#N#)SI`<8Nk2rnq{ zGW-Ie1n_o=G->_mN_@fUlz9E=H58x z78*RIc(mx|4$QxK?xK0BIoaL5?8Z=QH+RnBTyoLkJ8n@|+~T#%YdG^%)UGOHxzwsO zDV18nT38vL@hVq;xOV*{x9o=N=3PI3-m(QZU%$xBuc%(bnfM;gPpK8lE2>COo-}n5 zw!;t;Wx0u=wI*gQH1U>+S!+z3$k~BY-o%;H^?&X}7NJvTi^#UI{=4_yI%i(g;m|9+ zFlYcnM`z5#zyR}qbT~P};g0QT|K#sZ{)&P_RjSLOsD3ii1aL2|oO?ql zv_ZRbZ!Cs19N{`71$B^du4ps_u;00h94v-?(Ba&hOQ8+gxl$>HG#qhmObY5C(?1K*H#+5=Fv~!hH3~4yx+$AZfgN$>Rj)nmCJNH%xi(wyha4A&^ZP4!A z+lnC#N1S_m3hE%^+&e}?0Q;RA?_e?PgAV5|FNHQ}ckZ3VkcK19U6F!1$Z+8`8Uonw z+(ZY9VIOojH>nibpxwDEiy;k1oGVU29b}xFJQ@Pn&jp-=#jp=LoSRw-ZP4!Av|>oZ z5$C3-pbj$5%@_>Q$@nq7)vWpVO*LOg*b_hbr&{}8ALS3(#ktGo$aIgsg*;qL9*K*50NfG zgwo1W7zY=nvnVYaUL55SbsLJwO>%8ivJm}LReey~QzMjC-kAz!Bl(M^C0qM_1=(vI zY>Zeiz z%Qy5U$Bvyuo~8SWRrdECe&22UzU9k4|5I)BHC{S?rv0x!^CKVq&a|y0FQ0aQA7wQ5 z-Gw3P>@|G}2irmMIiP$CCu3>L>nU#MKwO4onQW`mA9+?s=L$PNbr)N?zTzPi5W_(- z?cAYs5qWlQCE07x`QOgnswZ@gvb17dOWc-mu0PjTR0)IZW<**4YmwQguUHCNnckF* zkKg&d73{~c*QdF=iJ=ay@fFxw7w|Tb&UM21f*+K#<}t|kiLg_7W=&g)4^h` zKLZIizf7KVOJc`l1C{SBXilnrypGw=VmqdCDxYsKU(_|P{6w+kdpTTrf+*k0@JUIgSg85H;ewhDgZ2KBt**rduWynopW2|y2-&@de z*;n(d2DINBec9D?Go93Lp?=F&=EDJLQHVT~rC749E%jUN_ZB=3s@_?k^W4RtdgT$) zN5|u^+hb7qfTM9%v)=&LchfN+{c`q;$uxP^PmA-BC;dzh>r;2@ij7NO{+H7axk){w zkL4-ON5Agmg>|X_7Vsi2$y1)|CdltZGW3+6ESKExsh;KcwqBY4+59)V2Q(tvYhUwE z$2DFm-=CoIPKNICl4Wc^MWS0h(pi0ydaHbIp}X-_zf6v;HIfle_arkeZ$+AG4$!rS zp=*#T2w-wL`y7g7k3nsk%%uOyZt}$>JqqK%22lIuF|@xi+KkaD^G3o7J9PZiuCE@s%z7+&|8SxC!X%fS5&6A zpnB%_`NVzM@7zq+bJq|WPf|{v(Dik1YZZrczHfEp%fkFT?(1d`)$1t)9Ow^y_1D_e zeW*}*TMI0h71kG#15S^1vgfy`fxPfv4>Lp_Fk^i%)U zZ|OGo0Nr0^|yvpOilYq>E5{`Pi?&^G$QIw~*{-Z~OV^m#nWk zhWc#8*NXn?XZ~!l%^hnyA9+cgq>t%l#|A1d-p6>lH~loeUWEK(c!cWf+A4m%6|mpe z`l4qb^0$0Z`M!e5GJULXrmOUh`*v^g)Si{kC+>7sGe7;60fH^Qb&&#lIQ9Cx?e$KXwMMKsVT0705m`1c1X?_l}Xam_?jH5 z^cidoP{CPX`^mVk^~xHuvDN-r>C?yDjw{x<81k)n2-rzdPM*%=HP8rlEvS6;xwp_; z-;#aRe!l&UxA}pno}J&4alC9k=`%6D@pj_#L-sPX=IU5~Lr?nI`Vt^8PG9o-S`Xwi zar%;{dvd)au=8Fr?yG+CxXsak14^4NvSV_-a=6=IYlq^E5Z|}-Md|D_!fplhk|{m9 zqtNx#WXV6wN8~3qUwToc+e0Q#aeQuQu1S7>gXEZArc>O<3y~Ms(b8r=kM`ni_9cHd zOb-L;|ey#>uv`NWFe z3jHr0vpz`$OZOG`rLNV_`79NJh%(}&ZUu%f8X5yzkB5-f z^@@!PyFCV#5obD>p0eSG;1*aM#oCYC*7Xv`aqJSxd!V&Q^@QDLXiY983{7X>=U+@^ zJ?E=|qfxAV<-b17r`4gqK{^TPEY3ub-wh;mHy#>?rEnX_rhWN~`gEp){N8l4_LX<0 zg3T-GZfVKRw=ZKTD}P9y7q69&0zy)r3gVrKLjyIb_ui7 zSzF&vY`lxK=2lO*eui@>Z}hWjLB-`qJ&jut$4WqP9IexZ1oIcOx#GCLY$`-3b#8>3 zNY=%~8jInXY^;5?q2nsoTS##*fK-}wnz$Z@!r5>EybTtC-qYsut~N!v0Fv@vN8W|$ zZ2lb5KAgpVU!jfy`b<-CI;&H+`f)5@{o-qgr4?(ebw1WQYS?;4_Gv+7RY!Fd6x%vz z^%ZNKitj7kT^K^9tpz$hP=%It3K$2_3ios4v4IzHTJ_Px=IuiL)`W zuVX6LU66dWBcE0nsJyuS&xAbLLRc86el~a2Zw2|bbnc6uuH%yS8>qab{RS#8ZohnG zNr#^L%b_sH$I2l-$CUmJB=b~G<+}^X^+k2>hV>Dvh{cKsJ>NF@uA7h?-}t<`7rzG3TI{F+I}dJO68`+Bu& zpIN9R&!{GC$d^>^S}28NNcv0CH@e&Jt-s0jpu76Xyx!y`{UuqqyZzqe>6lRHu5NdE zy~*pTzt)a?NT?r4$m%iZJZESvviCUgSou~)ac@EQ85e`qmwxL&zNfV1E7rd9`wB_l zkv_7Y2eTn=OMC7?ksd?RmIIZS^qqmqORhBol_x`(pC~;LdA3$bp3({fk(ZUwb$boF zH>I=pT6z|$d&3$*-b~{DhH+GozXil`l&51FKly~Mk0iSU`Mmj{4wwz(ck$~alczGh zg&`a?A5^)4%1ip+K;=oNxW5ckUebOVPwCtpvS(kxY-iUB1C^Jw-$3O_|G51IB5xkD zYM>-S>FYs$tM^&)wJ$y=IoxANt}i{k|25e?3W^RS$2aaTCPQ()`t>$H3Xzu_-+}6v zwBJDG$&7J-ITP~KXJJ9}Dn7T8$E{qSF>*rRqhRtnP<^--N};!4YpLe3LVQf)X?tIr zE!Fcj=`V2^@pQiOlKv8x5l`nUPnyTaH!dTd&R1S?{foZ{K7U;d$b#Env`nVzH|3_@^)-Ibs)WE zXWPAOwzahE%x>7Vulu^2)UI`GwkfY^6Px>0uB}DY!mq^A0qTakG@edtgZS;CF6qrX zcebWmw(Z=0UpmdfmaQl$HSW=YO_W1t6=AbGJlfdI(R9-`9YECm;ih@p&ZfSy3`hwu50xb!Dsc zW)$DOj@{6(p}cNWE!NsDN!gX#Jyj#Dmfh&+_Hd)d!@OO&RIFT>*Mht-FFR0Kb=BIs zQ$vek!?A1){XpZpD?8>Y7Y_W|Fi*Q1aFuLp8|dn`d+orU2K7Aar}Be)!%epPlxq$} zg)YT`bW0O1b*~0=17-^4?GF9w)JB@_?P=3?svk1MY30ymuN04OP&_o}X@z3~wr6d% zN2A|;xh}33`g3BF?Tqw0HCo*j=`JtSFLB`1ZYX(|EVM)VojMSv!lSJk?%guUt`=4+ z-KP>xW+S#9uS|yUYGxRh=4bIr4~8m0Y?~0V?*iu(2oNh9ZG{kp8`5K^f_SQhtlxSp8^dJ{df2c(7|D9 zd>D-n<5qbXjStiQbhrkt1sWelD-nqw!%+0F4j( zHvAdj{=;5?pTN)IU*W&tHJ(fkg>xz@tIF2a@H-u4^=|Fz>M7Ib&TtJY%PK0vy=lc) zMe*Dyo)^V)Tt(#yep!WvkrXYbjo_yvD6w zyJ~r5eM9w%)vltprUs)?O?6z^DpC#n&`7qhetV+^>+oIdt7|H&)?`!l{A2}1)n;|W zU7_uqeg>t?tz2KXvT}8#glniNYgp;-t*ozgwW}-LntN*9nw7G4Rqfh(SH+L1xQ6OR z*HF2RI+dZ&)zuU%udS(FP4=qlY)buiT?~MB{OkokE8)u46m%)NyuPgbuF5rGpO%x% zsv6~5|M*Rg^6L6>zF~juYJU8sp}e-fk|8KV??NtLC7oZxz>3SUc(@m9X-#zv?iwGj zirRZtyKq!;qg%eVo{=bD@780n<@L39Rj!t-27YWs#;B-f&>N~7uwdQ#tnAu)z8zn` zE`wcHtgWu8;g?vl-L9!!!EdnC;6gTR^_4655t`6%R+W|4OJH(#Foq3lLm#Wpj%9AI ztbFa7O1EmQT%-&m)vZkWVmZH7fV0ULa4I#T1=%tSVr3TO%FJK0(%qbGZc(=QqHOU+vEqxO0=ZhNSh}j~YSz0&SvR~jTlLm# z)mvj#Z_U-YBYSY^%G&zXZUsLe#GGAT)8J%!`DgZUS*&hZw%M|rh_cWOWz07-1Ea0V zmD$RbvC0fxWQOW&nd)qrXo7@xuFjRI#0;ym&DCa$*Jg{?#zfXe1#-12s@GLB1!}WK zSevc5Hd}FRtm4{SjrG}sYeFNe&t-Fa=6@j*icIk`Lpb?_4U{AI*i&h2M3qG}>SKI=-fSnCH^b{^OVMhnAx?g4y~NslY-$K~(%Sw!#$cD=i=W#va&X&^pahfkG@l`gzQQ}-Q zzf9Usff<&#o`koU&2lAHu=zY>C4O0{74UQ}%N-zTzYP=qkXDx;hq=*yR4e)slWu+> zX3_8W2VxfI@dGiF`N^jl-TgvL?1y1;KNfTSoVn4D*5o>uTEtJqaPD_=bH5%l*G_e* z@#UBE(@7=M_}!_iN@hksHnwCvXS7ufsRgS!d)L+0bNN&;DK)32CUuK0I2uy7RPvKm z{H)ug)M=7RB5L#JHYX048tLs*AnMBd7EKa)J3v)LwTFQ@!xl@|+19D}l zHT7JRt}3g)ORLAiYRnbNws3tY%2L0O2m9_P$YP4!tyS#z*lqI^dfnURM%jV6W z3%4P2nf+$a61RBCyK)UoG}GKNf8m^^3vQdg%zh4t-?NEwvcDbVuD^BR!mNMfYUd1_ z{RN%Szob|8huZ9CbQa})MrU%##K|T0GdhbWUR9!B(FsR);^fE!d-@q2d9(#?i+F^Y zT{>Pn$y{--oqScd6g;=QkSCXCS;2nBx(9v1Z`!+OcRIa!%Vu6^Y}u1;-mz`Zy3MV- zcsRRj=bp{Yd)t(1-JNdU+QNYyTlchV+Qz1N`}RGJO*{3}zhz5PbJO;1TQ@Y3N~gCY zrD+#WpSOhX9+W~9Pu6p(>~3q0F%xCvXe(EZ)_ZQ^ZKOY^ptJ!^Tkk2Q8tZu8C^q*`++nIyey z=gyYwQ7oC>$fkvI6xQzMy?esCY$PSUYnKYE#&%vHWaVw!5?XR+x=G@(foiBQH6)5% z4NqE<)7!U&`fb|~4(;ZxTX(iF0If}%vu5A5^ZusY8W{>>*qs{Ct-IH5ZriIjJKOf$ zN8fn!v`eF)p$!i-Z{MZQXreTAQ%@o1|`2E25fOTDET3)UsvsmZq&7 zJtePM;=@gPFRAqQ9XneX)d%RWHmzMZVV*`o!@Y%(et=Zh&9<%NZP#XpZL)5$cMo}O zd%NF+R%?<+Fx(F$Hw-t`t?pi>D*DQM!7beKeS)yyBJ%NceKjvIVl(?svEXJ&*Mk;JSa!U1@^>J8ecTkRNG2w zZwu2DdAoK!n4PfUtY8Gm+m5XmP}<$vLc80Q7tRmn^cH#c7G^gZY-wQzXeMvoxgBrc zwd28PM&T-3)n9EWvSTL#wzbd@tH4%?+S(NMl4^8I{beBwk7gS()yQKh*ota9x1P#t z-Wx3=n#p*3+uq3bq-aPU5lcPt5aQd~G*{JMrexUUR?X?HvAoutb>k_GpscG|p&o?` z)Rr`>z!sJ&C;kSYb-Jp-iaX)Z>fhKz+ij#;&592aZ!dg z=fK&iu@etdXQFAvz$?|dC0xf(6+Y!Eh)08+_+MJqMLgO+fR`|_NwL0!F1l5xovj+d zoSSJ1g=3CMm|NxtZF?hiQ6ubcn-tQZs9f$S6j~Ra2*O1_yV<^FQxmC8IuEkhPT?(_7uGi84C^@eq_;4; z_pEK&u|-n2zz9$DQQfT%tj(Sc9zU{*6bjokm8qus&lTuAuxwhyWzlGtU zT&uhjcWl1@glFAwWWv+~I=Z`=`GMqZTiU|)4;yR=^N>fXNwWvTZrR(XK!|`<60_vg~xR#x|~`GyQDPmyIEr&df-%wLE#dtnM*|U z3)iq*D!X=uXXp3=8ueF8Uz2*Cb>*;ch+;)zSqf(WJ*OWmRknh3m*Q-%a^ZC`eG6Bb zU9H`vqH^-=$l~$yd1!kr|JhMUq*NE5)UqCVB8y;FKYSz7uZNVi`=GotT=lw7A&-+o zIBwAhKA>~iZk@}zPf>%DNOPC76^6iSoFwcF#^vy4?ra{?=2U8{cDdW((@NUx%-M_-5TvaW>th`>1f!${gIaV-p+1bC;FdguCH}RbXd$ z>%puDFEF^L)V=5n(GBS|(j`y_Y0x904!Dea$=hKi?1xU!j~SQ1LRboS!ozR~PCzk_ z$SUAbI1G9=HVsz7WAH3=!iC)Yj)!@$0W#1D#ltBJ``{>y=0^BNNW;_60pocD7Qmx$ z1V)_ABQ@9nPr-4xOwXt8)aGGr4r?=%$8ED<4Lk#{YJU{PpaSaPQ8)sfQ2cuO4{dM= z^zf?$((p8NK+(Ch4J%A!aUdjPr)lN z^a9#~4e%@+2EAmz3}(S%xE)%d4IYOh&;g_0z+*#L3Xj3#@C^JEc(mY(U?HU8DL4+r zZ^AC{G@O7^-e|VKGce*J%0nBx2t_=3yc71p%P^j2lL0&qufT*c*b<(CPDt@;_I7v- z+TpUX*bAP7mto8}bcI%U7EVBMiZaj!hhgX?^c&W|6VMJtmtqHKfoI@VnDAD{5*~vW zVZ>$V2a91lWS|o!ybW3K4Cs%!OQ8;)h7OqZ4j#oq20Ed1Jp1qrbU?}Fl!vFG1IE7- z8^As|0!3HQCOiy>;KB*)!=rEniY8JXo`4RRHVOG~2rj%5`@-Y!Q@F60eRvpNgrSoe z4`_iSFlGv}U^`@B#8ldXN8uGHnZ|K=0y>~{I(CIapg*Q5fjW2s+F|@m%ENx>fD#sm zI(Py)VEk2#4Ll0%P;@or;ZZmOoltrW{eeR;Vix+qb~pkf-o-v_hZkY=wTwTs!cj=g zMn3F=qcEzJw8D!pW*+*%6VMKq&Bq_%F?bP1 zU5`B202%0n;v3K(_QNYM`bO3vsDmfq2n=0-Z6FPYfDZz?8zBvcK#$mOgftuiJ|yTC z!gly6q;A3o;b|CkGd6)ncoy_!6ANKG9D+_LUW{E}KXgLrdpQm-!suJ@dw2pmpkxW{ z!XePBfTi#lybNP*r7S!K$6>;4^c@bt==Wh8cnprfnA_Qh$Dti2+`-?uz#Z zJPF6)!VfTaU=2J8FTx2Zz7si+h9{sMiav-hK?&RlOCf+dSOaNjg*JE$o`9#|88{5> za2z^e#D{1XZiE0cU|t`Y<}c6VL%AchPS+ z0!1|(gU8_&7{3a+@FaA=tkviThhRi4J_L_KI~3KiZa^En2qW&sryvc_LMN2eBM^@&B%lO@G^{VVIQ7?<50YXIRlTwi*VsqWI`MK6jIyRhbN!| z=541vXovATXbUn>w3G3Kr-2XMy4ztNyb2|)l!N`y3B|h^3pfm^J=g=DfuVb;2aiEJ zT-L@hcnmtA!Zknr$Haun+MzB2o!yc^#W3G8H|SsPz=+c1ZF`g%!3p14ev;HsDU!0FS|oFzPYdgbnZ%9EZz3i5zHzXW&&h0mYv} zR|ud5o`81X!_Te+0@w~2=!D{Z=nnf}(gOVCz34-F{~XWV`UV#UZ*+dKl`o>WF^Y7Y z;p`h(seB%egqRU=G4a_@>Z30QQXYLfD+?|Xen;Gm#Cr84E+ehF=R+xU!U^)r8b6whW;E--s?c)VdbrkY$xJ6OApgYau~v}kF$w|^&vxA1dsxgEm<0ixD6!3 z>UEIT*vj5pV>FXKz%iqo^d=Y!lBxJyFu8F(O4`NsNI}kcJF-YQF@=fa;MQ z+CX-&Ix25<+Nsmdu{5!ep3lK+X-TJ@?YeO+{1`be)(H}WJ)^W`ehJ9` zB}cLL1CVWmg7g=vKL+X`6UEwR$;ge3`Y!!dMzVC==9lVQFul{`7&C;|wWEKAzW#~l z4t~;ezj)Mhlb(E_uk+=d#0fU-hUH)+5c~9P*n`Px7RLQ2Tbi=&_#q2Uf@G zneG|d?x4*Q=?U@iJ3zjW4bOt%kq(W-MfAZ?J>vxB&GxcoXiv%yiJ)5OyNcueQ(C&k zp-RrixdfS-J8?3UGY*h02l?=|5bB8VBKoQMcbK}z$=?7Q;g_KKtg#C}AFuIHdGZbE z7ALNw(p1gO8~JrnJNE3rXP6i@jZl-NiW7PjeqA+{HYa1-i-1Oi*|LQ6EE=ncQAHyM zW9S?$WYci`#?c=2MwKvr#n>=n2zep++F8hxkIRQT(bwj~806;WLv;K#j;mh=RdVLf zr@iL4@JTlOAZ!nropLJL?=mOY4}FGX;e4f$E_0B5^-t&=B>z7LnV|xPH1s{Jks($|w)z6ckehg)fG&R5*tU!gMkFX$*_dWk3Cvt=f^<0UBqP*6ei! z$Ik-OG1Q-92L$D+K<7?fb4oW{CbWX@d9O)h>uB)}L<0ViNQAKqGh6Ny^*@CVvlkYLg;4 z%1KMU#W4rBb?vFTS4ox&Rx$yhO);%?a4Qj_R_i@x0iG^4p82(dSrz``WbN@l}3de z8PdW+K*A^{9mm?RSn}mVbn`U5x$FtAjcYhI3$BH#h;rhj-jZqhTHKr7hpBMvE1EUp}XC{ZGnEcXo5+ z>z5ho1Tkd44Itm>%^q?6RZceVgbW-2>8~-6orP@NlP{az8du4(>wLvs>_=aZar`CF z+*dn7dF9Xm3{Uux@^Qp0@u55$n{tFVMBF#Txx3(bWFDlPuy(c9A7#G|N6K|Wj*p?<4h6b;uetzj9`0a!Ve84j|UXa_rHaui!R$x?Yk`$^Py$uQz_ zOqS#sCd=Zuyb{U<2~4i?Gtsf`bhfr+1C7~9&^RfWPT9Rvx>!F=7sYXX((H>4kUjqh z-cI_02tAYdA;^~UK|9B_BSiNg;r$KyYF|2^h+_3qey_hZ(Y4QSNz4B<#}1Re9;!fn zH~``G12S#=8_AQr*Fdt>zGAbnV(rI?ALCFisLw{c?@D*+2Zb8RlP!*-XDbEFKeYxu zO`eV&g9Gr7un{z0xf}|~V3T5$8j<3;;9L3gg?aqFbE$LZ3Gyai>fAq^haI^H&^4~E zja0u1)b<3>_0A+v7#DGrxCV4gZ7J5i-D}x3PlmkN5pi9fMVITO3;cYpbC+C#KIn4( zg5^$6FQ zc==*>4BaOiqp-8aX9LUt$+tGx4WGfxLdWmGr`b1_kzNEh!vwf22Brv~ZR+`^Az8wn zm05o^23i-StIngQb6f}2Q(tQ$G-g8fQIIW!jpb3&Dyx0Tmw%j#5c#0y&O!1Hph!85 zO{MW-8h&&b^9dm;t2xwd9m?CbwHKu+$VkxjsaD}^+SFd8k9(J8ZrW%f{4DJn>fm; zZWs!cf&Zj=&O8tqX%@#)Y42>vM1~&<5flZ`OU}M2VFJY0< zy_~LPb+0a8Y(AMqy7u>3)CT$*pHDWIGO~gEgV5u%qeut2fI(Jn9dzsrR7M6J0tqD) zs)yNcATs0@Otmm5Hk2R7>|n7}H*5`-5UZ~^USDaeYq8Z=Tmm(qP^b*mAE=Bj&uUP_ zo?*@=J)1?7En>*34l-=S=^yzA|!j!?+At#-<`Mb!19UI&AEf_c=+ylDr0hSF?z3`3t}|Ch`k z*|n3w(>;%-xQ)HygYX(`fbP!WJ&jj*t%=-|)I)5DjhB3_r}65mUO-*hEjeC&)jLWZ zpjTIZYEO0vKq24u`tp;W^bDdldh(MV>-8|N z%~yJ=*WJACtB&j;6f{qSf{kH@3+3>=D1-kf^Yk!r4a~yMt)O-HKFTL;YwNS(F5^M@ zW0Zdhv<@U~n{T~Lu55sYgP(bxTOXH;Edkk7d>g--`+LxxZ&u-)xcRp09*gOG3g zg|?TW4YgGip>)1&7E@N&Gnh0)=}-@BkWreD!4Cbsmu*x%2taKpm`VN^70YPv+Zk zzaGsot?lhmy+YgVX??NtXix2DXjdo{+O~YEJHP6!--Wgn&{hfP93_e~bq!xFiHFx^^UOsug)7&XUpQK+Gs!xVK z357y+38*U+3f7}QJE+YdqLerVqagz+2qK6I*G+Zte>*qYb34WH=O6iewr>`)s-z5o z>Nzymbibl!7=7NaP|Mh+3riF_`cXI1;QjXP8 z9IvBvyq@$`D70P76NY@-yOh$pXAQ5*hzo7^JnGu}1d=%$_0?akqei@KrQ>}_%F*$2 zz-*_q$srkrxV-+#vhos?ubkvqnvA6G$#O*~ZrHPRi^J<51Sp;XQ>pxG){kR!T>K)M_@f&5l-8$o&~1Tk!E zERNe$X}Wgmb5UgIv(iQMvlSh}XB!;f02|?#a1g!p%rpKuU9xj+mXc1vXo$C^c3P<` z9cw^qlyo;+m6JXYL6oa2IePBKW0$<^tFP8Kk~vwHCtVDgJ`P8rB1d(JL#`*+u#>S^xA>m=LLAZqSrD5qfO(Gmpq=N(*z zx&g=!6~g(5?0nDN{cTTe1QDggDbW1Ow_S?n&IKvbsw=-uUY{3g5BXaM@&ZuES1*l^ zkk4bj@Ne$+^Er?@96*0_VV|+F&xzQxxkB|+BO3p9L3{b?nW1a|jZgyZQkIax*$R38 z+L^6>+Pzgz&v3iFZ{Wg4e$=1$zJ1-t_SAm(Squg$7+}A3FMgE1*Yvahnctn|I`~Y8 zzRyITD>?`C8KdDmXdc4Lb-h0nXMxUxubpJ9po0bF1SgC=<(wPKc*i*V)O*Hbymvau z{#bozihA*Nq04g-{4l)Er|rJ}79&8E)&zzn4C?0w(AtE$U7$%d8&YU{RChr{DRBxk zxASe6qB))7=bhxbP^f-Y$Y%)pZI29f0+1~gIv7*k8|6OhPoAz(PJrfeIx?huKt8O` zTj;td0|DgZkhW(T8V~8FxtM_ifUAUZ1L6*_Yso^}SG$dH7!)KkpY{jRUO*c{K2QSr zwke;LzQXQ*G+*1prqGm8B<8cU(`zw)iD-G5oXlrO&!O7|wC zJ2{7`(+HBMP>7Dw)8VH@f(yM?Y|JtgqBgBBiYXFe*EBt~*GW0eh3@(zIqIwRH`$iv zkw~@`pqs}05XTha&pN`j7r_?W`Wwza1jYaE>ohqWxAVB3-5Cc+AETX@;CWEn3Wc^S znMcx zY`iV*b=)HvN3&w`Zr|EcZ0%UwYkRa)0yYQ2G&)$ndmDSr=P{tUB9uM?KSePQ7mJygMiG-Ughs3#(_8)S?mklYCt?T{hEPBG zcj}qvsP_`<-lO!lk@3Yy!z02vJ=E*K5E_p?d>&cP47H|&>k9Tc2Ae?Z$tWBlWCC)@ zuyt6mtw)NRA%4yuMaM$;eD7A;v9(w0mgJ*y_8dPh+wYvOAV)r-bHC7-(}mn&yZ%Y~ z{szhjjXA32o)bz&Co=V1M(bS~OhyUiFlktx?A+&^I@nPiYgckLCk`S@x)}$eI@c1L zZ<@ZUYsCG~^plQ;+BO2xMqH-S(m_bB#z(|un>@wVw&Hl1WcwTrgSDT$?~`J(Swl5r;VNy?N?{naZuK4(I&g+3d40GY=?^Ir44eFz&uhKVW^(&UMZU|t3heXTv+`CVL(cG~Z0{b@HnXg?z* z6b7h=Y$z1+)g!ziSA_!q7S8&S@8|5pb&hj(pWkydjs!y|M} zq4TB2nl6MKqdOXJopY1(DDU=ZPiq;izt8tG)UN|;Q)%Xr)z}P=P}=UIM{V}IJYBzAiLntKqb#D z1^Xd71kwW(3VqL|zRCsxD1`nyBzqm)+uuSY?cwnMG%p51sGo+6z)6CLzSiRm?FV3E z)lRxCqK>!&^0_t)1*l^hK!pO=MyGzn#ysCO(rIEub=7>Ke+y_bG7>___irgW(7BLz zAZkOl7bzGGdiQH~*SestX+7$M3>*Nh)monvZ0=ZHy(_Z&D9N?s7Hf#&NWMWbcT9TN zd#8Ba+2jk!uzHFye+X_F<`ddFEY+s+5t3sCSBHa{BN5#@j^Gai) z`^(n97@wU*v&nQQ9D6I4RHxr zn|2;KNuKJ6a*)61T25`LzOeU5I)5l+P(Xxf^16HGF`SCM-CK2Lt9QAtNb1(p{gvqv z|GtDm&uyBI3d#2y`RbxINGKGlgKR7m@@=E6G3*!}Q9{NA%OP)B}_`2Bv?!j_G5uuJOi! z-jhnN60l?1H>B_E2&HY^Na}9qgyeIDfI4;12}j{Ds80vsIgrjmYhbtzGDtOi|HpCo z1r3TSuy-dKz%*p26GTYwMyP?qAlX844YRNLh{{PPt5-$390D*qC>{=&R?UWJU+A1; zd5Tp=`KTJMh4%SUt&7UDdRA7pw|tXh^>s{nwjVDS|7@|#$K_wEZSFH(NnN~#Lu~L{Z!ZXB|~ip)5X3=$-V=~KIhffcPU9g8ZrVU zf{4D(ozkHl+9K+RJHY0DI|FxuefgyPu^cwRYEUQv*+yv21QA5J?}`mSqlP~Ee3Isc zWQXTi21C!wMff*c96L$9xQ#7sb~`S8C}-Cd!$}MIZ~Xf$^_*Jw-~DY{ddsgxp>0cs z)g6c)oiRE6?Z0%;c|_}ShByEP`A2{Meo}IDJu1JI9`aYsp9};bTPes_)L)H_`8Y%C z#6frsdXtsmxI$0w*YuvPx4-pMUqu+KVa4d9XEO4eJs@AnT?dgqMiKel&!Et@sp^7= zu*23q?d99HWSH*_L=XARKy=U;721A4-Au$$;yNfq7x{{85k%Awmq4L^1Ya5zc_#2HYqYu`feFN%<1{g%8=Z3xm^>t^nnhJ9Qsq?}l5@>odD_krq@ zL1qBbNuj^`6lw>x6}NM~{Z~ENa28a-K-zzl`kD*+p2YsNzmW3Rg03Y-GiLjtowP!s z`p6bRgw2KI=c)45QTCBMp=+BlkclAbSx5Sz>-*u9G0X=QORi9;gGSK)D3~3gwAHmZ zE~8yLgbe5ILjL~K{JkCFS}Xedcc>Y)4GM)m8;RS&(q@Ol*e`zlV%Ob@574GjXxq{| zh$yse$uR#27!RRPs7~@%p-`w!g|t0ay3=MR;wZ8FvJf4PQBO7rBGjJ}C`7Lz=%o;! zzlG>@AS=erBQ|{k(uR$p#qliy4aWx<}VO3RbSaG9*VRm~4%cLVsmRm!v+0%IZ$9f#@SW%N4O-{IDjd83f1MRHM9n7~n)|y7B z$(MTyAld_kww0q@##MGKOu+l1D?))&TzIWIhS=<9alHS9wxu?LhwYDr;jGuW#?Gm1oB-?#=J* zSX{31W=AM3zc+@E7A(7AUZL$$JvSHQdgj}%>YGjj(LwXs>?l1pMksBziQ7Q$(X_9i z^kTF>nJ)AmBjYwYyQejx2@>>J^*3@NC;5m_=*&hro5^;)*{ztiRi`4Vm-9#Rb^bg+z9^5d&z$J}wdRTDp62|c zU_L`KSML~U)olRPRXxp7t5;}yh{&x4(ogi&R=iHYP6jld3WfgtbrE&tuK_5OGx zN^gIEtp(eBN%abC-(&<5LdduMfcAw#p=}?fu29IgUFkben+LQf6!LAi&_1e-OhmqI zsg9k$tgiCH`Hkc2Ua1J%YyNBQw{xrmIziV#t+18jXMyHNK)z70wNT|``#LBA&Alo( z5Fyz@q0n|EUnu0;uJv1W;&WT;wRDq?>p<@tw0?{MrcCa-0n>EbU$rm02%Q(CS0kvs zq6o>+H4sI!bBjbEfrLW;E?)B0j@nev^`OX*4#3*CK5QaS6xtqDbH0;rTdHF=7)ZOF z$mvg;I@epfie&>mGt1}QEJZ_~jlXv?S&}n5!tAPH6dGG$*ShVb+al_S74n^@?UYT{ zH9zmKze%YyWCV%^5&3*}FhCE{0kXe*yj^x=|9N;0%0Yg$8WhY{E;5R(sWQw!fA24Y z`~ZqUApq$Xei=cA|UW#CNerhZGW02Bf!M7J~_WX)i!)DTG_oB_KPGiIHLvTLb; zbRoKBsHgGQ-!X=PI1L$5pl``$jc_cWTf~Gr$9Q97X}^IzUYUZ87c=L z9Tnp5^tCS==HqXwA3z2a&Xj&hpDR?q%uvP^+q6aYI#c>3{jN~`&Xhi~eGpNoE|MX; zi$Xu|B^mMwVLsH?Xa7{k+6@xlQC6rP$??fs7kni?-!#tx@)QcyB}3f+WD|t|q)&2f z@5@fAueupfI1{=h=UITcvooPvatsUAEm^P7al|w^-_}?(LUL{IYYZjBd_5lP znkx=Vxr-wgG)U%-nGEGA6e2_C8uXY zDa|*9H0g};2!-mDp>6;gAB6yV^XH!QRJ{zGN!`?M=@o!N0EOt5ypBo_8Mxj0JJ))$ zo9vZApJ0IFX!enfWV1%-X|DC83sp|}nkGi%Z_3X+hwWeDKK@bW48rsMo~^Kd)DI+t z(1FZ+zIQ7_+0d7;jY6UAoBw1&DfzeWE}(t>K(W-urNI6t&(C@Hzrgm?%^)J*wp2%R zO%(ckS2AR45x+m}?YXY%Si9zHwtf`)y=xACF`twCe7}b+plk*P+J4gC@@+r4Mitus zOyc@I-}Vb_50jl5cjikz-+9-i4mDBLNN0D9gjqKT&#rD247n3*{L(8l#YqZ=8?F-zw+kGpiIx44U zbo#qry}J?i% zd>?ZRXBJa=N%(6N{w<8F6-1}UPh zKC9G@t)*jkpUJo1IQu1a4^mF=UE+V6pvq(Uz}?ibXYpH5!`)Ple+q2;vhfg?R>uw? z;3R@(0T*IpVJeF0H>AW^=`UqfhT=wC)_2Qz{@VbxunL`+Kt@k}*np^w&|@F4L7K@P zBHbY)&?kuK^EtH)Y^Wa*;b*~OeNms(AN$^2i!EQrGE@&D%wHLv9(~)IrAW8InwJcj zzA7qZzM)<74INV%l~w4jOon_BKnkRzl^a3YWDO_HBO-MzM8hf+x=Uxs7XjFD$+oom zY3aD!cJfOAcMjW8to;BKtd8^<19gyzV(l~hVX$%;_Cx?F=m5zZ3w)(+*pAsTu1AJr zB7hWVZCANQI0PHO+Uu@fJIB?|wZJqF+tYpx#QQ#keUXW%B33)L+q3eZ%-4$+vo9HIFD{K|LIFkXn%3bZQ!NBigU}n2gH^*J)=JE$|^ZC8s z8{Ca+UJ{$L<^M zPu$b)o9lT{?h%G zd%?Zve(e6*{SB|O|JMD){hj-%`+L4V;U(AZe(wH(53{`N{vTf(^pEZp_fPJh-M{ds zbpOf{|8GozU%7vGzjm*>|KQ`<|HUh(-?;yFzvXq|?^vdoqy7hL-X-3p z-dnxPytjF8_uk=+_b&I|>0RMX@Fsebyeqw8Z?ZSVo9a#Trh7BInO=!^m3OswjW^4C zmv^n#b@*q8`=zGH&sfcuT!oz1zI^dAECac<=W<;N9tc(EE_L%nQ6SZ@E|QRd|(NmAArM z=~a6l_U`g(yj9+6uhy&c?)K_KnGKQTHQw4Vwa&Z8YxLH8_j>nv8@&6wY4?-{-K92q zo4mBQIjq;@HFv4s;%)J^dfUA1-VSf4x65nwc6)ogy@$R(9=6%Zhw72iH+Mn@0>wV69 z-1`IX^Bns_?+Nbp!b}2$oql!=iU#!!`_d)=e@u1j(C6R{gwBE_oDY>@2|bT@s4_b z>;1(0JMX97-+MpvUh>+#pL_q{9rIrH{-5^??;pKaynpik+4~poxc9H#FTH>BI=o+b z|L*nGF);r<-&U?)}$sZMazV8q5hx)_(;r?0v2>)z< z@9^L6f55-f|6rK+A%B@4_+|cbzdYQp@GJc)e}%u&uMYP=?BC_r_^ZP7YQNU6^Y0GR z^?rlD#$Owz*ZKGOjsAN7UjIISgMWXRx6$9^r~S=-liwWfxAwhlHd))s6|MUJI`cL>@@W1GP$$!%Svj0a>>96E!owDct)AGLRf9iRt>Mv2?sl&*|?ZYJAtv zbjkT%m%X0l3?BLarv<(rj^BZ36rU}4H2}xP@VsZ+ERPcM<`tmBPVjulzf#&bwHKoMEPL>W#&p+RTHy6CSD><4aGkO zNmF-BeYIj~m9g~CFon=@#nQlzSu8m^ZuOLw9*T{dNe>0ZadVmsi&aKx$^1ESeYCGS zmZ!K4EKmDF^)3SGVR@^f{Oi!$kUeCt?sz4#aPpXB#!>%7H~`&kq+D)vth8d2EG?|p z$ykmk%O&&U8YrDS9^aP&-L+wI6-yV@NygGs$9s!^Nf{mQu6|OU?S}?YglWdCTiXbvchFo{Gu=ld-AP zQ*0Ae@h_-v`_^>6vFQ+RN3vv!WGtCNWn~_jQ>Id0*wtKrt#y;2(n3>K&Ze4iDcV1+ zvI*%amOv9?vCOI&krS3nsDwI|%g80vh1`xc)~!Hw$K)t2wUZUBVoqW&36o{!kvvPw zDQsVQs~yEc8XLBH#ZN?*mrtxVtemxHedsARU99hY#XZSM=9^7(ChJSE9hc%Vh+-kZ zGE_2_aaFFTSf{M+uy%Tia|-v8NOo4TWcZ%qr0zZKo6&lTd(t_XpOkMaLtk;Sp6yE? zjX^S&?KMVf-^NIJs`oz`o6qzzWQ83{8n&l>GgLB`QM8U(EGPMIoc0eR$Ccvxwnlv$ ztb)y68BeILuoc2$D`&Bl|4`JP>ew;0WogBBHEGTuop0tFNneWE(!S7OYk^mN=_$0I zFY2?Piqqw{!f?>HOI`r_*2s6jB+$24mcl}~4a(rdz!$Ib#e&&yvuq~b0ej#<_y{}( zpMlTA7hykq1HKL4gCD{X_-l~u{t^Bej>9iO-(dOg@GAT#bb`j`1iS`L`h!k(!(jyQ z^?h^#&VkWzK3oVgP!YTt#=uy3CrpDmAmiT-8l(W0Lj_d9O879;z-p)iT?DUzbxAB4wXAAAYE0ndPb+V(K$hTv!L4{#hbSigg_7_1B6 z5|Cp}g==9xEQH%&In=>ASP#wcAbcD?4_}Ax!;j#{a11)&zu+|pr{j5e+{JJSTn4)T znFiOu4e(yL9hSjeuoiShkcMrr2R;s;fiJ;R@NM`$`~ZFo^6Fo}anQ}zYcLFNKM#uF zQWy_cz%;l9t^>`8+hG}0K|O4MG;D)C@CbYco`A2xHz5Ph!SnDFcp3f$eg(gUA;b7y zS2!Oof=l3XD2ACZ7Z$<$p%QAK0q%v(upRcoN8!`(dH6Cs4F}+d@B;hvqwq3x zzzG<^x2&HJ7eNZHfEn;EmL-=-D_d0DZ(B@)o-m1+N+Dz5v8g1rk^B!%MX!8MW%C)&mn+9#})23OQ zUD`aP%_p?^tTtcJ=BwI#Q=9K;^8;=EQk%ck=I7e{lQzH7<~Q1Se53IwcoU3+cfeGb z4GZB8sDcK#51L^YJOrPB&%u}A>+o$j06&Bm;P2oV{0saVehWi5*SrocfQ#X+a0Td# zz^{S1@E%wKAAm}zg?r)u>+a0sW4hiyew7NbQ;j_%MUp0&%svSv+e{+9h>}oi+|1le zu1w~RS+Y=TDP1(A)u2eJeJ$-5r4oBuTS^5f8m(5;lGqy5lHcdva}uNFx4nLU{q*&o z=bo8!p68tBJonslo|!Tg%m%q29~6MqU^Cbbc7tMY6#NLvz-3Sgs=*`R9nuVs2H*pH zfjHaS79fBuFa^v4xgZ}DfYo3#*ba(7F(?6NKsl%YRp1_| z0bVU(ANT-Y;15E99z=jRkN}2(WMBaT$O2QqERYNGK>=6|HiPY;2o!@7a0Zlv3Qz^^ zfg0e|3ig2y=mNTfV4w!QK^#Z`!$2~y00CryDPR`J1^J)=tOlFGc2ES0K?yhm%0UIF z0{1`-@M;bFzz6sOe-H}vAOggJ1TYLF0}Bv97MKENfn1Oe3czZx8Egkdpcs^ZGoTz) zfGThg)BrDR^jZKP;0ydgDA0ol5C;;#Fpvx^Kmb`_3YZ0QK|Uw|tHEZl9Tb6La2%9^ z3*dKf1N;ddgO^`nm}a0Y=nT4p5TFIUfe{PU41q-kHwWt!^h{ z5;8JaCN0OF#@R$|ykKUWR@RxuOyC>>BiJ~`l_fB)GzW*jPF!$1m{dNKW1M_86k1Gk9`k<(y828}DYVjK#sRFpJ)CP8W|_tc&^I{6*<04%U>;xuh|r z;F5HezFRv!6VID?hsmA6xNT;*#Uwa5^ngXb|2Ka%x~QF_79EUK^04IMt!DVcW4_En zmW`2SMf9{4Q^A=72YjVK5W)2R={9}fp1JjH-bh@SKb&$EN zE3qcGi(@j}Vu-MCl0A)vfj9z5r-?JeJ}bsTT`P1igLRtR7#&<&+dtZMn>gnVak|kY zjkTr{lk`nzT@Xl)iXsyeMfwp%CN9;=WiwI4wNZ86iE@a(j50DYwOulj#zxZE=+W3% z*D9XWi6?d9J?g~Q)iJu#n1RGx0;!%rswa39fCXuE|q-l~z z)1oaum~F8!M;db; zjWKmJw0Kg7Cw1rzBKeuGtHZ$!Heya7)df;r@K7nx3U#f_d?t@uKp;+VlZI~6(CyLC zUDqOqeCU##kW=?|6pdb%%BU0vmKcU5B1*6zoYEPV${3==L_~~-A(O{-j9GB8a1_=^ z)6>fs6D!^(CL#<(m}^T80jrZ4Hxh)A_JyO;NIJt2VSK8RdwOZ4J>;k~62%-5aUQ+1 zcwEO3l@=o6o~pAvy^NEVYdRi_XQ8i$rZkW1zT!HQCceazdE<$Qr{m$Nj3;J!BI0S! zc`DE0-hY=>N?odxWltBm~_EG#1K;5NyHEjcRD?; zht%Ho&f1G1q`8xbL{9@Q&q5-p;G*@!sBnodNhBuRL?qEMyQxefgLV^kzuBS4JN&}U#OoFs73DRql^y((BqPl1;sTWPvM@Q3g43RMkDpgdf zsigX2jI5HBh?-+J8eB{hSWdK*wXC{W8#g8K`{&wQr#I zjnux8+BZ`BMrz+k?HjdB9PzHj!^uW!-AJt)sdXc@Zlu2mqv+d>Qzm6G^Hr6hh)sfeFd zD&l9Aiu6#WA|q9)$VgQxGE$X_j8vr}BUP!WJ{8rcCL>p=iJw(!;%629#Wu;lmVU0K z`n9y3j(A9=ua)%kFxoE~-l{NaKaAQBqxQq8M4YmzJg?PZdoPv_8;VpDZiStPYY|Bk7u2Z)9A8O>i=` zw>&Aa*y3W}&9ma}6b+O{{EKx&Ns)V`A1S5o^*YF|n1E2(`YwXdZ1mDIkH z+9xpyyVSml+E-EgDr#Rv?W?GL6}3-dSZO3N3`y;i7)F`eCozmNwNGLgWjcNm!%8EG zVMuD9#4yU#zM9%sQ~PQy^hitL-of{{V}xvF|_|NR6lu+pg!$?4AoDbCrTsP3qewS2I^n37sC5g zAKCk$O#5q~{Uv)JyifI$y${N?|75SDG?KjzB-Ky$Iw;frW3MCmk?d~pKGjclHz-s6 zK&xi z9#ZlKq~u*l$s3Th`lM(VGh7M+M?%&Y|o5Gus1$Z*E!M#htTCkLg5Y?pN~K(u6g})gffa(p)aPvu9|ig?FX7Q{*^7 zgjxgv*>qkRW(&n^2_e!@1HEP5vM8$+9&-sY=`9)3?J~PN#mYO=II~PjKFeHboNP#Z ze_4W^v&mxNBw2qRLE+?N0SU4F17(>?xl$G&T7^-k$-&!QPPvn}$_0ld)Rf_@eJ|9` zS~$5q%^u<8U0gD6?rp<20X-l^HNmp1G~SdZW35&p%PGqd+%oh^OeY7+G6YN=Br+~C z-1JBlJNOi&CB&{}$oN#Lwv9uNU4q;@Nc>N!$W|#r;)f)Jg=xb>lybW%Rebwd47L67MJ%vuKr12(3 zi!xX*3ld+%V0mxQz_@1KvJT>R^pzJ|fL-5%pw{P6;QWV7Y%&v9>M#~Y#&vlrhO z`Ny{30vcWZOkGuT_-Kpyy$_{btyUcjAMLaJCBLmJ*6qDJv;EW^t0JerGkdS9p6z1) z4?jLRJom)FuZsh^wcow#7>XKI!x5P80K!H}^E?-ZFRdvhz>6 zGoikJ%xrhRp8m{*8Qvkw$IMHz57@k~bm`@mhNIm^t-tO3a?AeE4KLkKFE8)#r1yws z%j0duR(o={iCc%VyDw+^+3RIZf843wr(V}*Ww*7w-e;NmL+gpIolZB7A1@nbzLpr@ z^z!v>gMQ{d+)wBv&ovOgG*Mv*>BRoT<6#`Nki*5+)+LG zX3H_34PNPR)xTuSy1l;b!6p2|$cc-VOgYw~>y+@1m)r|F9`WWO-Kxj$n--k(4jHpI zbWg_d&Yd4!Y&={!Y43w0OTYaybZ4|F(3+>;pdC3m$&-#w@R0YyNdK z{D8){rdwpyj7aYTB)54?KA^!FFo2eDP0w)94N3cHTQ+IrF-! za^{_qQ-$Y}y6zCXLyq5Aa%VfMJAY$z*ui&xclk{0?E34}p%GrO^HlqqURhv0wzRM+ zv+&SoiNB0q_WP+<3g0P>j_efVoA%R=IsKb@hgima==kP4^^UiurEF_|?(MzT7k4|% z-7fy7Vt$+RNuwXUzaz5O!O*ciyEm=ObFAMne@SYWFXknzJ=d&#-1&oZ8+Q0L$hXby zQQwtJP&yuQ4X1iVT)Xhrw7LDP6DRFD{+=y&TG)49U51#X#8CU*tx&5z4g_B>~|F}T5sQ0&bat3|fvhBf=)xY>VnoS;?Ty>!| z^o^-$)w^rT0*t4s@`|pNx4N-s!hoGEs`!U9z2+W!vi(#+M8UfQFP5CF-aO4*UBd*l z+Aer4oq+H8@r}N5pkY(=*y;c24kri|YnSp$Tz8R{@}UzC^uV_17+uOoocr|p>y1_% z{|Wzp-{M&TKE{-j)%{ZsPPo!F^FZrXKXg%KJPM06oV!^xwPx~Xd&<39_Kpv-@3_~s zQ)}hN*R-c9PGyHw9=zVW=Cq-F_MO1e#Zk+D^S_mt6}MNovta6-QJ<{YIN6=Ec4OhX zfqxzhT~*aSV_)|hz4o`yZ+Efl_f3}`a*xPdG^^3CV-mI;@7-WSWa_9cg#jN-T-EOJ zzs7Z#A(S28xIz~>w&}>Dv)NH2yUiGS@yC13+bI4$DzC6>MXYJR!tztX?C6h6e$7;d zxw0x6|8aiT%guW|~nQ`>F*Cfd|5p~H{cC%)V3@U+11GNwOVwpZQB>%A7T zG0h+BSl{F3g~pSvHXUth>u&te=h2ft@>7q>E>)LAGz^`-;Nqd67KHRZ2=AG$a8M% z6|ktZUg`0*ubeIXE6w-9x2LKbb*fS1JZ^KYU-}niQ}=BAs-32?OUM9z?Bgc?-q7)j zlCsjbD({w7H=DS)t9^C%Wn0QV7+~Cg`Qe_SYt5HW56{2ebouU1eRtlUr&%;=<%Xb- z`|fO<-*sJEa|7R#>4|@=I?%VtvKcoouKDSFXGNQ7%q!bwNApu!L~aOG=U#jF^I2TN zAobbo4dpF*WYwP);rm+RYEA3uM^|h+yz=wn!&f=)pdN!3ah>|bX!Fy0O<_&Vnv^*yF%gtWZwX{Ln^3*%d zz>Oo?=9#+Ys17%oP|@zj(Ub4K)AVjsL))p+TysHw;DU+aWkrJ{)4MnO^ql#DBi`KS zo3mpSQ%h^2{2FxEUTJKd{ArJ*quqZkpZnI(CVBehZ;xmdmsR|A^6546>V4$*>aK)K zHwKsewQ<3MPfCl={`+U+2IH^0?o0l~rLfPg-1iPtR@x3s(B66waaeXdcU|hWs%dRiQ)*5Q zz4?c6_mXwn^Gi;?dj9>NLn4!B$;0{YcE}H|m5b@h>g7wlATte2Hw+af>T){_?9gBc?7` z@NoT~nXb+C_j(5{`eLkN+^LwtknaK#{R%dWTi{q!pF4iH=g@2EpD!xQ)dfu(Crde@ zKbJMVboEz3=P#~cEOANEL$=Ln6uWZbsN>G9{t1&K7aaOMV{_9-_s>6So6~m4$^G+t z6&B>jd^J4c@co`YeQj9OVN><7%cDPPv(mLgo>UP$XP|e`yN@!fAHBS|;T+!@x5YcC z#9aEzmM&^j(dsAlZw}jXH|s2y-D7?8gg>hTAMXC)LcxQCyCvp7vlN!1;#I3cQ-+_| z{fboPiu5}l9!kHpFD3QT?z5GJxBRSG<=L&a?GnCibnb$F%#0hA9YgnJ-kamY?s|CW zgD)>kx@5fX`?w!d>i6;6N&oHj@p-#*7Y={PW(S*gS<43N=U{2y?WMT=(Yyh_Mfx87?u~%Xv0UNlTiQLX z8~HCk(IjeA;l}oDleYHmCG6d_vHhHN!9UENgWuL)DJ$!kv%lW1O{22ryfQz?OV;sV z&l6X#t8VIkJ>RcYW}%}&|1a)0y)gRF&jS}9VQ2rGXqne%*=4WG(;PDrCbw(S-|&9R z4r>PLD=)pY=A*&aO|PC=pVxh7C;zvL!?tW)wxLIpne}9IhO}NfbbRcZVK+86?s2#I zFPleP53|jf^JOdDzSy@K{o*yTXMFhnrHdT@{W&Ga`Vbs<>kib?9Ec~lWSslt_ME!2 z`rkkB=JETgY+1O1Qzy!DM>lIBVuiPFZi6nRf)li>E`JIUP7*dP_%g8=Jx5L%&3id_)>&%}h{+i3eCe z?;vqZ&#U#E<1WskvJ7NjU_{gjJyrpSY{6kQ<0G+eDuviNyoRB7GBcMdbK*xh$)b$_ zCudC!?CCA5{gZ`cf=oaLAfUDj!7@KbieI3Nb;`)dkxTJtAT|`M!uB9jYAmi|Q9 zhYX_j%x?AD=8GqVs=v+_02y}nt8P*7)wr&S{tm=)y};%8@vq(Jl>ovnSOB$&=r+dph&g4N0E-u>@5TFQ_DWHk! zB$j%M<~*vuhFej*Z<58I*Rn38$B9OCK(A8jOgcqscvzU3V>N14qf1HAg{f6aPHj@A zDAb%ur(!v=k99W#pHbUGdEEd5lxjt=TI@;PnCj}kXiOd|#VRitkbeq(L6z?R%*g6g zON$TjwX_8JCrS&Xxxt zab*6;Eh+{V?kwySq-5UHH9-o(x{1Mx`Qlsp|4+!(P0Vv+M6Z=%MD~9lBz{tm&>M}0 ze_dbx^B{R%4)*^dK%U;y$g_*TR Date: Mon, 27 Aug 2018 17:13:07 +0200 Subject: [PATCH 235/435] gnu: python-beautifulsoup4: Update to 4.6.3. * gnu/packages/python.scm (python-beautifulsoup4): Update to 4.6.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6730dc3f1b..56dd71cb5f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4902,14 +4902,14 @@ libxml2 and libxslt.") (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.5.3") + (version "4.6.3") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j")))) + "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h")))) (build-system python-build-system) (arguments `(#:phases From b651a5ab35414da54887780d03ea786ad4c894f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 18:28:29 +0200 Subject: [PATCH 236/435] gnu: python-pandas: Update to 0.23.4. * gnu/packages/python.scm (python-pandas): Update to 0.23.4. [arguments]: Disable "--strict-data-files" pytest option. Delete one more test. Adjust pytest invocation to be more verbose and skip very slow tests. --- gnu/packages/python.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56dd71cb5f..673c3cdfe4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1153,13 +1153,13 @@ human-friendly syntax.") (define-public python-pandas (package (name "python-pandas") - (version "0.23.1") + (version "0.23.4") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "142nvwb01r2wv42y2cz40bx33hd8ffh6s6gynapg859fmzr2mdah")))) + (base32 "1x54pd7hr3y7qahx6b5bf2wzj54xvl8r3s1h4pl254pnmi3wl92v")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -1174,18 +1174,23 @@ human-friendly syntax.") (getcwd) "/build/" (car (scandir "build" (cut string-prefix? "lib." <>)))))) + ;; Disable the "strict data files" option which causes + ;; the build to error out if required data files are not + ;; available (as is the case with PyPI archives). + (substitute* "setup.cfg" + (("addopts = --strict-data-files") "addopts = ")) (with-directory-excursion build-directory ;; Delete tests that require "moto" which is not yet in Guix. (for-each delete-file '("pandas/tests/io/conftest.py" "pandas/tests/io/json/test_compression.py" + "pandas/tests/io/parser/test_network.py" "pandas/tests/io/test_excel.py" "pandas/tests/io/test_parquet.py")) - (invoke "pytest" "-v" "pandas" "-k" - (string-append - "not network and not disabled" - ;; XXX: Due to the deleted tests above. - " and not test_read_s3_jsonl"))))))))) + (invoke "pytest" "-vv" "pandas" "--skip-slow" + "--skip-network" "-k" + ;; XXX: Due to the deleted tests above. + "not test_read_s3_jsonl")))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-pytz" ,python-pytz) From cbc8a92011d3a439b25201039941aac803870ec2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 19:48:55 +0200 Subject: [PATCH 237/435] gnu: cairo: Fix undefined behaviour. This fixes which showed up in Guix as an infinite loop during cairocffi tests. * gnu/packages/patches/cairo-setjmp-wrapper.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gtk.scm (cairo)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 3 +- .../patches/cairo-setjmp-wrapper.patch | 78 +++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cairo-setjmp-wrapper.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0c74914a16..c62e6ea50e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -595,6 +595,7 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ + %D%/packages/patches/cairo-setjmp-wrapper.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1cf99f8db1..3322860d83 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -120,7 +120,8 @@ tools have full access to view and control running applications.") (sha256 (base32 "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c")) - (patches (search-patches "cairo-CVE-2016-9082.patch")))) + (patches (search-patches "cairo-CVE-2016-9082.patch" + "cairo-setjmp-wrapper.patch")))) (build-system gnu-build-system) (propagated-inputs `(("fontconfig" ,fontconfig) diff --git a/gnu/packages/patches/cairo-setjmp-wrapper.patch b/gnu/packages/patches/cairo-setjmp-wrapper.patch new file mode 100644 index 0000000000..bffac6e041 --- /dev/null +++ b/gnu/packages/patches/cairo-setjmp-wrapper.patch @@ -0,0 +1,78 @@ +Revert faulty commit to avoid undefined behaviour: +https://bugs.freedesktop.org/show_bug.cgi?id=104325 + +Taken from this upstream commit: +https://cgit.freedesktop.org/cairo/commit/?h=1.14&id=2acc4382c54bd8239361ceed14423412a343d311 + +diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c +index cb2e30c..5541bdc 100644 +--- a/src/cairo-bentley-ottmann-rectangular.c ++++ b/src/cairo-bentley-ottmann-rectangular.c +@@ -593,12 +593,6 @@ sweep_line_insert (sweep_line_t *sweep, rectangle_t *rectangle) + pqueue_push (sweep, rectangle); + } + +-static int +-sweep_line_setjmp (sweep_line_t *sweep_line) +-{ +- return setjmp (sweep_line->unwind); +-} +- + static cairo_status_t + _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, + int num_rectangles, +@@ -615,7 +609,7 @@ _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, + rectangles, num_rectangles, + fill_rule, + do_traps, container); +- if ((status = sweep_line_setjmp (&sweep_line))) ++ if ((status = setjmp (sweep_line.unwind))) + return status; + + rectangle = rectangle_pop_start (&sweep_line); +diff --git a/src/cairo-png.c b/src/cairo-png.c +index e64b14a..068617d 100644 +--- a/src/cairo-png.c ++++ b/src/cairo-png.c +@@ -158,14 +158,6 @@ png_simple_warning_callback (png_structp png, + */ + } + +-static int +-png_setjmp (png_struct *png) +-{ +-#ifdef PNG_SETJMP_SUPPORTED +- return setjmp (png_jmpbuf (png)); +-#endif +- return 0; +-} + + /* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn. + * Otherwise, we will segfault if we are writing to a stream. */ +@@ -237,8 +229,10 @@ write_png (cairo_surface_t *surface, + goto BAIL4; + } + +- if (png_setjmp (png)) ++#ifdef PNG_SETJMP_SUPPORTED ++ if (setjmp (png_jmpbuf (png))) + goto BAIL4; ++#endif + + png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn); + +@@ -577,11 +571,12 @@ read_png (struct png_read_closure_t *png_closure) + png_set_read_fn (png, png_closure, stream_read_func); + + status = CAIRO_STATUS_SUCCESS; +- +- if (png_setjmp (png)) { ++#ifdef PNG_SETJMP_SUPPORTED ++ if (setjmp (png_jmpbuf (png))) { + surface = _cairo_surface_create_in_error (status); + goto BAIL; + } ++#endif + + png_read_info (png, info); + From eb637c64fe059ba9c3c0456f4cb5dc55124e1e49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:31:06 +0200 Subject: [PATCH 238/435] gnu: poppler: Propagate Glib. * gnu/packages/pdf.scm (poppler)[inputs]: Move GLIB ... [propagated-inputs]: ... here. New field. --- gnu/packages/pdf.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0feffec541..e89dc29b9a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -104,8 +104,12 @@ ;; GLib. But of course, that Cairo must not depend on Poppler. ("cairo" ,(package (inherit cairo) (inputs (alist-delete "poppler" - (package-inputs cairo))))) - ("glib" ,glib))) + (package-inputs cairo))))))) + (propagated-inputs + ;; As per poppler-cairo and poppler-glib.pc. + ;; XXX: Ideally we'd propagate Cairo too, but that would require a + ;; different solution to the circular dependency mentioned above. + `(("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; glib-mkenums, etc. From 1abe0554a4a19966b029f09afb7545209f8faca6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:06:46 +0200 Subject: [PATCH 239/435] gnu: poppler: Update to 0.68.0. * gnu/packages/pdf.scm (poppler): Update to 0.68.0. [inputs]: Change LIBJPEG to LIBJPEG-TURBO. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e89dc29b9a..a28005a024 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -80,20 +80,20 @@ (define-public poppler (package (name "poppler") - (version "0.67.0") + (version "0.68.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3")))) + "0n0f7mv24lzv9p3dlzakpdhqg7ygcvl6l40grcz95xldzgq083gr")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("lcms" ,lcms) From a1d3874293fb210250cbd9b39e1b49b71b1c06b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:37:10 +0200 Subject: [PATCH 240/435] gnu: python-xcffib: Update to 0.6.0. * gnu/packages/python.scm (python-xcffib): Update to 0.6.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 673c3cdfe4..fc22ebfb2b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4032,14 +4032,14 @@ a front-end for C compilers or analysis tools.") (define-public python-xcffib (package (name "python-xcffib") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "xcffib" version)) (sha256 (base32 - "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60")))) + "04k91yxyb3pgc5lvxmivh8w71yjrap2g57yk3s73x4rm4nvjq51n")))) (build-system python-build-system) (inputs `(("libxcb" ,libxcb))) From 57dac1ee935edfab91e9b182c1f7c9ddae794656 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:15:08 +0200 Subject: [PATCH 241/435] gnu: python-cairocffi: Update to 0.9.0. * gnu/packages/python.scm (python-cairocffi): Update to 0.9.0. [source](uri): Use PYPI-URI. [native-inputs]: Add PYTHON-PYTEST-COV and PYTHON-PYTEST-RUNNER. [arguments]: Remove #:tests? and outdated comment. --- gnu/packages/python.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc22ebfb2b..15f6d33121 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4078,17 +4078,14 @@ support for Python 3 and PyPy. It is based on cffi.") (define-public python-cairocffi (package (name "python-cairocffi") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) - ;; The archive on pypi is missing the 'utils' directory! - (uri (string-append "https://github.com/Kozea/cairocffi/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "cairocffi" version)) (sha256 (base32 - "1rk2dvy3fxrga6bvvxc2fi5lbaynm5h4a0w0aaxyn3bc77rszjg9")) + "0dq3k4zhqd8cwsf3nyjqvjqm8wkvrjn1wjf44rl3v0h8kqx6qf0m")) (patches (search-patches "python-cairocffi-dlopen-path.patch")))) (build-system python-build-system) (outputs '("out" "doc")) @@ -4101,14 +4098,14 @@ support for Python 3 and PyPy. It is based on cffi.") (native-inputs `(("pkg-config" ,pkg-config) ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner) ("python-sphinx" ,python-sphinx) ("python-docutils" ,python-docutils))) (propagated-inputs `(("python-xcffib" ,python-xcffib))) ; used at run time (arguments - `(;; FIXME: Tests cannot find 'libcairo.so.2'. - #:tests? #t - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs outputs #:allow-other-keys) From 8f1022d0a85a1f42a156b2319513baf0e0d2e827 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 21:38:23 +0200 Subject: [PATCH 242/435] gnu: vala: Update to 0.40.9. * gnu/packages/gnome.scm (vala): Update to 0.40.9. --- 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 9e72c7ae39..659f5dd5d4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2035,7 +2035,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.40.7") + (version "0.40.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2043,7 +2043,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "1v0ak68lrnbb5lyd48j6sxa35vfrii86zmhxdhkdb85k1bv65rmy")))) + "0yvaijkpahzz26sa37cyzbj75a9vbcbgvxbqzzb7hbcvfy009zy7")))) (build-system gnu-build-system) (arguments '(#:phases From d9362003b6cbbc77d2cab838aa06514aef6ac4f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 00:39:11 +0200 Subject: [PATCH 243/435] gnu: GRUB: Adjust to recent binutils changes. * gnu/packages/patches/grub-binutils-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- .../patches/grub-binutils-compat.patch | 53 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-binutils-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c19d992874..e88709a13c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -771,6 +771,7 @@ dist_patch_DATA = \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ + %D%/packages/patches/grub-binutils-compat.patch \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e9abf399ab..c99d5d5895 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -86,7 +86,8 @@ (sha256 (base32 "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) - (patches (search-patches "grub-check-error-efibootmgr.patch")))) + (patches (search-patches "grub-check-error-efibootmgr.patch" + "grub-binutils-compat.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/grub-binutils-compat.patch b/gnu/packages/patches/grub-binutils-compat.patch new file mode 100644 index 0000000000..2107869314 --- /dev/null +++ b/gnu/packages/patches/grub-binutils-compat.patch @@ -0,0 +1,53 @@ +Fix a relocation issue that shows up with recent binutils. + +Patch taken from upstream: +https://git.sv.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa36700324cd3bde25875 + +diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c +index e49d0b6..18facf4 100644 +--- a/grub-core/efiemu/i386/loadcore64.c ++++ b/grub-core/efiemu/i386/loadcore64.c +@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + err = grub_efiemu_write_value (addr, + *addr32 + rel->r_addend + + sym.off +diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c +index 4406906..3a73e6e 100644 +--- a/grub-core/kern/x86_64/dl.c ++++ b/grub-core/kern/x86_64/dl.c +@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_int64_t value; + value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c +index a2bb054..39d7efb 100644 +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_uint32_t *t32 = (grub_uint32_t *) target; + *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) +diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c +index 9179285..a79271f 100644 +--- a/util/grub-module-verifier.c ++++ b/util/grub-module-verifier.c +@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { + -1 + }, (int[]){ + R_X86_64_PC32, ++ R_X86_64_PLT32, + -1 + } + }, From 16de7f15cb2e9111916542dd538286d50086f100 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Aug 2018 18:42:23 +0200 Subject: [PATCH 244/435] gnu: snappy: Optimise. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (snappy)[source]: Build with ‘-O2’. * gnu/package/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 17 ++++----- ...snappy-add-O2-flag-in-CmakeLists.txt.patch | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch diff --git a/gnu/local.mk b/gnu/local.mk index e88709a13c..76d6f69090 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1138,6 +1138,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ + %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f2ed53f036..e15f47ac3b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1187,14 +1187,15 @@ algorithm within the Numpy framework.") (package (name "snappy") (version "1.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/snappy/archive/" - version ".tar.gz")) - (file-name (string-append "snappy-" version ".tar.gz")) - (sha256 - (base32 - "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/google/snappy/archive/" + version ".tar.gz")) + (file-name (string-append "snappy-" version ".tar.gz")) + (sha256 + (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")) + (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) diff --git a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch new file mode 100644 index 0000000000..561763dabe --- /dev/null +++ b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch @@ -0,0 +1,36 @@ +From: Tobias Geerinckx-Rice +Date: Sun, 26 Aug 2018 17:24:42 +0200 +Subject: [PATCH] snappy: Add O2 flag in CmakeLists.txt. + +Use ‘-O2’ optimisation when building with CMake, as is already done when +using the Makefile. This patch was copied verbatim from the Snappy +mailing list[0]. + +[0]: + +From 903c72fb29b2db07b4abc38a5feb83d88f739d80 Mon Sep 17 00:00:00 2001 +From: huangwenjun +Date: Fri, 10 Aug 2018 17:17:35 +0800 +Subject: [PATCH] Add O2 optimize flag in CmakeLists.txt. + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ecd09..29e0cdc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") ++ + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make + # it prominent in the GUI. + option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) +-- +2.1.0 + From a446cf26d7f386a81b8667f5ec75fb5f6232d202 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:05:24 +0200 Subject: [PATCH 245/435] gnu: texinfo@5: Fix FTBFS with Perl >= 5.28. * gnu/packages/patches/texinfo-5-perl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/texinfo.scm (texinfo-5)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/texinfo-5-perl-compat.patch | 19 +++++++++++++++++++ gnu/packages/texinfo.scm | 1 + 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/texinfo-5-perl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6f69090..3309186d12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1158,6 +1158,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texinfo-perl-compat.patch \ + %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ diff --git a/gnu/packages/patches/texinfo-5-perl-compat.patch b/gnu/packages/patches/texinfo-5-perl-compat.patch new file mode 100644 index 0000000000..f16d6b4da8 --- /dev/null +++ b/gnu/packages/patches/texinfo-5-perl-compat.patch @@ -0,0 +1,19 @@ +Fix a deprecation warning with newer Perl that breaks some tests. + +--- a/tp/Texinfo/Parser.pm ++++ b/tp/Texinfo/Parser.pm +@@ -5438,12 +5438,12 @@ + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1 + unless(_ignore_global_commands($self)); + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 5fe7f1ec9c..fa98bd56b8 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -69,6 +69,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) + (patches (search-patches "texinfo-5-perl-compat.patch")) (sha256 (base32 "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) From 3469a5ea47ba7481bda9b2ff144bc13efd943c87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:40:40 +0200 Subject: [PATCH 246/435] gnu: gcc@4.9: Fix FTBFS with Glibc >= 2.28. * gnu/packages/commencement.scm (gcc-for-libstdc++): New variable. (libstdc++-boot0): Inherit from GCC-FOR-LIBSTDC++ instead of GCC-4.9. * gnu/packages/gcc.scm (gcc-4.9)[source](patches): Add "gcc-4.9-libsanitizer-ustat.patch". * gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 15 +++++++- gnu/packages/gcc.scm | 1 + .../patches/gcc-4.9-libsanitizer-ustat.patch | 37 +++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3309186d12..29c605006c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -700,6 +700,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ + %D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libsanitizer-fix.patch \ %D%/packages/patches/gcc-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 30a0ffcec9..0aa65fe638 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -186,12 +186,25 @@ ,cf))))) (inputs %boot0-inputs)))) +;; Use a "fixed" package source for this early libstdc++ variant so we can +;; update GCC 4.9 without triggering a full rebuild. +(define gcc-for-libstdc++ + (package + (inherit gcc-4.9) + (source (origin + (inherit (package-source gcc-4.9)) + (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" + "gcc-arm-bug-71399.patch" + "gcc-asan-missing-include.patch" + "gcc-libvtv-runpath.patch" + "gcc-fix-texi2pod.patch")))))) + (define libstdc++-boot0 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; C++14 features missing in some of our bootstrap compilers. - (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) + (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-for-libstdc++)))) (package (inherit lib) (name "libstdc++-boot0") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e5b1433f92..520f5cba0b 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -398,6 +398,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc")) (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" + "gcc-4.9-libsanitizer-ustat.patch" "gcc-arm-bug-71399.patch" "gcc-asan-missing-include.patch" "gcc-libvtv-runpath.patch" diff --git a/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch b/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch new file mode 100644 index 0000000000..795881ab9b --- /dev/null +++ b/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch @@ -0,0 +1,37 @@ +Remove use of deprecated ustat interface in glibc 2.28: +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835 + +Adapted to GCC 4 series from this upstream patch: +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=260684 + +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -81,7 +81,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -163,7 +162,19 @@ + unsigned struct_old_utsname_sz = sizeof(struct old_utsname); + unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID From 53b7c9716e59555477ed39c066463f1bb4e0e03b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:02:07 +0200 Subject: [PATCH 247/435] gnu: python-waf: Update to 2.0.10. * gnu/packages/python.scm (python-waf): Update to 2.0.10. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dd33ba8e0c..36c5b0ea93 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5406,14 +5406,14 @@ so it might be a tiny bit slower.") (define-public python-waf (package (name "python-waf") - (version "1.9.8") + (version "2.0.10") (source (origin (method url-fetch) (uri (string-append "https://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "0wl4cnmp06lfxqjxaan58bqxn27smhydz0sg5prrfbl3bsw4gv6q")))) + "1v832jljl5wwqyimz40zgksf5ws1w3d2niz3qxamyp5dnyvzjl35")))) (build-system python-build-system) (arguments '(#:phases From 279ed3efee9c71116d368163f805fe9494518687 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 12:48:08 +0200 Subject: [PATCH 248/435] gnu: qtbase: Fix build with glibc >= 2.28. * gnu/packages/patches/qtbase-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/qt.scm (qtbase)[source](patches): Use it. [arguments]: Remove "--no-feature-renameat2" from #:configure-flags. --- gnu/local.mk | 1 + .../patches/qtbase-glibc-compat.patch | 50 +++++++++++++++++++ gnu/packages/qt.scm | 4 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/qtbase-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29c605006c..806a5f3c2a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,6 +1097,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/qtbase-glibc-compat.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-glibc-compat.patch b/gnu/packages/patches/qtbase-glibc-compat.patch new file mode 100644 index 0000000000..15a2540b3a --- /dev/null +++ b/gnu/packages/patches/qtbase-glibc-compat.patch @@ -0,0 +1,50 @@ +Fix qmake build with glibc 2.28. + +Taken from upstream: +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 3469ebe5e6..c5585ea32a 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -98,10 +98,18 @@ + #define QT_NO_QOBJECT + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 +-#define QT_FEATURE_renameat2 -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++#endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 +-#define QT_FEATURE_statx -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_statx -1 ++#endif + #define QT_FEATURE_syslog -1 + #define QT_NO_SYSTEMLOCALE + #define QT_FEATURE_systemsemaphore -1 +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index 0c9cdb8667..deb4a9f220 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); + # include + # include + # include +-# include + + // in case linux/fs.h is too old and doesn't define it: + #ifndef FICLONE +@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp + # endif + + # if !QT_CONFIG(statx) && defined(SYS_statx) ++# include + static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) + { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } + # elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6eb2831fd..affba14e98 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -494,7 +494,8 @@ system, and the core design of Django is reused in Grantlee.") (base32 "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-glibc-compat.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -608,7 +609,6 @@ system, and the core design of Django is reused in Grantlee.") ;; kernels that the glibc supports, including the RHEL6 ;; (2.6.32) and RHEL7 (3.10) kernels. "-no-feature-getentropy" ; requires Linux 3.17 - "-no-feature-renameat2" ; requires Linux 3.16 ;; Do not build examples; if desired, these could go ;; into a separate output, but for the time being, we From 65a58f390704878e8adc8712786333ebd79c6a64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:42:42 +0200 Subject: [PATCH 249/435] gnu: ppp: Use OpenSSL for cryptography. * gnu/packages/samba.scm (ppp)[source](patches): Add upstream patch. [inputs]: Add OPENSSL. [arguments]: Add substitution for OpenSSL headers. --- gnu/packages/samba.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a6d6ee30cd..65d41a2b67 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -400,6 +400,18 @@ key-value pair databases and a real LDAP database.") (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ppp/ppp-" version ".tar.gz")) + (patches + (list (origin + ;; Use OpenSSL for cryptography instead of the obsolete glibc + ;; crypto functions that were removed in glibc 2.28. + (method url-fetch) + (uri (string-append "https://github.com/paulusmack/ppp/commit/" + "3c7b86229f7bd2600d74db14b1fe5b3896be3875" + ".patch")) + (file-name "ppp-use-openssl-crypto.patch") + (sha256 + (base32 + "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"))))) (sha256 (base32 "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02")))) @@ -412,15 +424,19 @@ key-value pair databases and a real LDAP database.") (add-before 'configure 'patch-Makefile (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) + (openssl (assoc-ref inputs "openssl")) (libpcap (assoc-ref inputs "libpcap"))) (substitute* "pppd/Makefile.linux" (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) + (("/usr/include/openssl") + (string-append openssl "/include/openssl")) (("/usr/include/pcap-bpf.h") (string-append libpcap "/include/pcap-bpf.h"))) #t)))))) (inputs - `(("libpcap" ,libpcap))) + `(("libpcap" ,libpcap) + ("openssl" ,(@ (gnu packages tls) openssl)))) (synopsis "Implementation of the Point-to-Point Protocol") (home-page "https://ppp.samba.org/") (description From b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Aug 2018 17:22:41 +0200 Subject: [PATCH 250/435] gnu: guile: Remove "share/guile/site" from GUILE_LOAD_COMPILED_PATH. .go files should always go to lib/guile/2.x/site-ccache, and in practice, we no longer have packages that don't do that. * gnu/packages/guile.scm (guile-2.2)[native-search-paths]: Remove "share/guile/site/2.2" from GUILE_LOAD_COMPILED_PATH spec. (guile-2.0)[native-search-paths]: Likewise. --- gnu/packages/guile.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5c9f4d499c..8c561b0210 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -212,8 +212,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.0"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.0/site-ccache" - "share/guile/site/2.0"))))) + (files '("lib/guile/2.0/site-ccache"))))) (synopsis "Scheme implementation intended especially for extensions") (description @@ -257,8 +256,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.2"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.2/site-ccache" - "share/guile/site/2.2"))))) + (files '("lib/guile/2.2/site-ccache"))))) (arguments (if (%current-target-system) From 842c44c9746f2acb132aab276338b1fac2143364 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:54:32 +0200 Subject: [PATCH 251/435] gnu: ghostscript: Remove graft for 9.24. * gnu/packages/patches/ghostscript-CVE-2018-10194.patch, gnu/packages/patches/ghostscript-runpath.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.24. (ghostscript/fixed): Remove variable. --- gnu/local.mk | 2 - gnu/packages/ghostscript.scm | 57 +++++-------------- .../patches/ghostscript-CVE-2018-10194.patch | 52 ----------------- .../patches/ghostscript-runpath.patch | 18 ------ 4 files changed, 13 insertions(+), 116 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2018-10194.patch delete mode 100644 gnu/packages/patches/ghostscript-runpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index c3cd1d4084..fbc9628227 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -728,13 +728,11 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ - %D%/packages/patches/ghostscript-CVE-2018-10194.patch \ %D%/packages/patches/ghostscript-CVE-2018-16509.patch \ %D%/packages/patches/ghostscript-bug-699708.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/ghostscript-runpath.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ %D%/packages/patches/glib-tests-timer.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 3808d81524..b46451d94e 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -135,8 +135,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (replacement ghostscript/fixed) - (version "9.23") + (version "9.24") (source (origin (method url-fetch) @@ -146,9 +145,9 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz")) - (patches (search-patches "ghostscript-runpath.patch" - "ghostscript-CVE-2018-10194.patch" + "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) + (patches (search-patches "ghostscript-CVE-2018-16509.patch" + "ghostscript-bug-699708.patch" "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -167,7 +166,9 @@ printing, and psresize, for adjusting page sizes.") (arguments `(#:disallowed-references ("doc") #:configure-flags - (list "--with-system-libtiff" + (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--with-system-libtiff" "LIBS=-lz" (string-append "ZLIBDIR=" (assoc-ref %build-inputs "zlib") "/include") @@ -185,6 +186,12 @@ printing, and psresize, for adjusting page sizes.") '())) #:phases (modify-phases %standard-phases + (add-before 'configure 'create-output-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; The configure script refuses to function if the directory + ;; specified as -rpath does not already exist. + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) + #t)) (add-after 'configure 'remove-doc-reference (lambda _ ;; Don't retain a reference to the 'doc' output in 'gs'. @@ -255,44 +262,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define-public ghostscript/fixed - (hidden-package - (package - (inherit ghostscript) - (version "9.24") - (source - (origin - (inherit (package-source ghostscript)) - (uri (string-append "https://github.com/ArtifexSoftware/" - "ghostpdl-downloads/releases/download/gs" - (string-delete #\. version) - "/ghostscript-" version ".tar.xz")) - (sha256 - (base32 - "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) - (patches (search-patches "ghostscript-CVE-2018-16509.patch" - "ghostscript-bug-699708.patch" - "ghostscript-no-header-creationdate.patch" - "ghostscript-no-header-id.patch" - "ghostscript-no-header-uuid.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments ghostscript) - ((#:configure-flags flags) - ;; Notice that we removed the 'ghostscript-runpath' patch above. - ;; The reason is that it conflicts with an upstream change that - ;; takes LDFLAGS into account. - `(cons (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'create-output-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Unfortunately the configure script refuses to function if - ;; the directory specified as -rpath does not already exist. - (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) - #t))))))))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) diff --git a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch b/gnu/packages/patches/ghostscript-CVE-2018-10194.patch deleted file mode 100644 index 242e57c27c..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix CVE-2018-10194: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10194 -https://bugs.ghostscript.com/show_bug.cgi?id=699255 - -Patch copied from upstream source repository: - -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=39b1e54b2968620723bf32e96764c88797714879 - -From 39b1e54b2968620723bf32e96764c88797714879 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Wed, 18 Apr 2018 15:46:32 +0100 -Subject: [PATCH] pdfwrite - Guard against trying to output an infinite number - -Bug #699255 " Buffer overflow on pprintg1 due to mishandle postscript file data to pdf" - -The file uses an enormous parameter to xyxhow, causing an overflow in -the calculation of text positioning (value > 1e39). - -Since this is basically a nonsense value, and PostScript only supports -real values up to 1e38, this patch follows the same approach as for -a degenerate CTM, and treats it as 0. - -Adobe Acrobat Distiller throws a limitcheck error, so we could do that -instead if this approach proves to be a problem. ---- - devices/vector/gdevpdts.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/devices/vector/gdevpdts.c b/devices/vector/gdevpdts.c -index 848ad781f..172fe6bc3 100644 ---- a/devices/vector/gdevpdts.c -+++ b/devices/vector/gdevpdts.c -@@ -103,9 +103,14 @@ append_text_move(pdf_text_state_t *pts, double dw) - static int - set_text_distance(gs_point *pdist, double dx, double dy, const gs_matrix *pmat) - { -- int code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ int code; - double rounded; - -+ if (dx > 1e38 || dy > 1e38) -+ code = gs_error_undefinedresult; -+ else -+ code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ - if (code == gs_error_undefinedresult) { - /* The CTM is degenerate. - Can't know the distance in user space. --- -2.18.0 - diff --git a/gnu/packages/patches/ghostscript-runpath.patch b/gnu/packages/patches/ghostscript-runpath.patch deleted file mode 100644 index 9f161e45b3..0000000000 --- a/gnu/packages/patches/ghostscript-runpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/base/unix-dll.mak b/base/unix-dll.mak -index 9d57a99..36ef1ff 100644 ---- a/base/unix-dll.mak -+++ b/base/unix-dll.mak -@@ -171,11 +171,11 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS) - # Build the small Ghostscript loaders, with Gtk+ and without - $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ -- -L$(BINDIR) -l$(GS_SO_BASE) -+ -L$(BINDIR) -l$(GS_SO_BASE) -Wl,-rpath=$(libdir) - - $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ -- -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) -+ -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) -Wl,-rpath=$(libdir) - - $(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE) From 16676fc3b1736781d085b0c047dbb6ae296ac4f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:55:33 +0200 Subject: [PATCH 252/435] gnu: curl: Remove graft for 7.61.1. * gnu/packages/curl.scm (curl): Update to 7.61.1. (curl-7.61.1): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index d4a620f1b3..b09afe328e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.61.0") - (replacement curl-7.61.1) + (version "7.61.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))) + "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -142,19 +141,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.1 - (package - (inherit curl) - (version "7.61.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))))) - (define-public kurly (package (name "kurly") From 0171019418435888afb6024d04702683482d0294 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:57:39 +0200 Subject: [PATCH 253/435] gnu: openssl: Update to 1.0.2p. * gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch, gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/tls.scm (openssl): Update to 1.0.2p. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../patches/openssl-1.0.2-CVE-2018-0495.patch | 215 ------------------ .../patches/openssl-1.0.2-CVE-2018-0732.patch | 50 ---- gnu/packages/tls.scm | 6 +- 4 files changed, 2 insertions(+), 271 deletions(-) delete mode 100644 gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch delete mode 100644 gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbc9628227..ce1f8cc173 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1010,8 +1010,6 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ - %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \ - %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ diff --git a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch b/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch deleted file mode 100644 index 2d54ed03b9..0000000000 --- a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch +++ /dev/null @@ -1,215 +0,0 @@ -Fix CVE-2018-0495: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0495 -https://www.nccgroup.trust/us/our-research/technical-advisory-return-of-the-hidden-number-problem/ - -Patch copied from upstream source repository: - -https://github.com/openssl/openssl/commit/949ff36623eafc3523a9f91784992965018ffb05 - -From 949ff36623eafc3523a9f91784992965018ffb05 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Fri, 25 May 2018 12:10:13 +0100 -Subject: [PATCH] Add blinding to an ECDSA signature - -Keegan Ryan (NCC Group) has demonstrated a side channel attack on an -ECDSA signature operation. During signing the signer calculates: - -s:= k^-1 * (m + r * priv_key) mod order - -The addition operation above provides a sufficient signal for a -flush+reload attack to derive the private key given sufficient signature -operations. - -As a mitigation (based on a suggestion from Keegan) we add blinding to -the operation so that: - -s := k^-1 * blind^-1 (blind * m + blind * r * priv_key) mod order - -Since this attack is a localhost side channel only no CVE is assigned. - -Reviewed-by: Rich Salz ---- - CHANGES | 4 ++ - crypto/ecdsa/ecdsatest.c | 9 ++++- - crypto/ecdsa/ecs_ossl.c | 82 ++++++++++++++++++++++++++++++++-------- - 3 files changed, 79 insertions(+), 16 deletions(-) - -diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c -index 0f301f86d9..a130fc9117 100644 ---- a/crypto/ecdsa/ecdsatest.c -+++ b/crypto/ecdsa/ecdsatest.c -@@ -137,7 +137,7 @@ int restore_rand(void) - return 1; - } - --static int fbytes_counter = 0; -+static int fbytes_counter = 0, use_fake = 0; - static const char *numbers[8] = { - "651056770906015076056810763456358567190100156695615665659", - "6140507067065001063065065565667405560006161556565665656654", -@@ -158,6 +158,11 @@ int fbytes(unsigned char *buf, int num) - int ret; - BIGNUM *tmp = NULL; - -+ if (use_fake == 0) -+ return old_rand->bytes(buf, num); -+ -+ use_fake = 0; -+ - if (fbytes_counter >= 8) - return 0; - tmp = BN_new(); -@@ -199,11 +204,13 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in) - /* create the key */ - if ((key = EC_KEY_new_by_curve_name(nid)) == NULL) - goto x962_int_err; -+ use_fake = 1; - if (!EC_KEY_generate_key(key)) - goto x962_int_err; - BIO_printf(out, "."); - (void)BIO_flush(out); - /* create the signature */ -+ use_fake = 1; - signature = ECDSA_do_sign(digest, 20, key); - if (signature == NULL) - goto x962_int_err; -diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c -index 16d4f59b9b..1d37551803 100644 ---- a/crypto/ecdsa/ecs_ossl.c -+++ b/crypto/ecdsa/ecs_ossl.c -@@ -252,6 +252,7 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - { - int ok = 0, i; - BIGNUM *kinv = NULL, *s, *m = NULL, *tmp = NULL, *order = NULL; -+ BIGNUM *blind = NULL, *blindm = NULL; - const BIGNUM *ckinv; - BN_CTX *ctx = NULL; - const EC_GROUP *group; -@@ -269,14 +270,25 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - } - - ret = ECDSA_SIG_new(); -- if (!ret) { -+ if (ret == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); - return NULL; - } - s = ret->s; - -- if ((ctx = BN_CTX_new()) == NULL || (order = BN_new()) == NULL || -- (tmp = BN_new()) == NULL || (m = BN_new()) == NULL) { -+ ctx = BN_CTX_new(); -+ if (ctx == NULL) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); -+ goto err; -+ } -+ -+ BN_CTX_start(ctx); -+ order = BN_CTX_get(ctx); -+ tmp = BN_CTX_get(ctx); -+ m = BN_CTX_get(ctx); -+ blind = BN_CTX_get(ctx); -+ blindm = BN_CTX_get(ctx); -+ if (blindm == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); - goto err; - } -@@ -315,26 +327,70 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - } - } - -- if (!BN_mod_mul(tmp, priv_key, ret->r, order, ctx)) { -+ /* -+ * The normal signature calculation is: -+ * -+ * s := k^-1 * (m + r * priv_key) mod order -+ * -+ * We will blind this to protect against side channel attacks -+ * -+ * s := k^-1 * blind^-1 * (blind * m + blind * r * priv_key) mod order -+ */ -+ -+ /* Generate a blinding value */ -+ do { -+ if (!BN_rand(blind, BN_num_bits(order) - 1, -1, 0)) -+ goto err; -+ } while (BN_is_zero(blind)); -+ BN_set_flags(blind, BN_FLG_CONSTTIME); -+ BN_set_flags(blindm, BN_FLG_CONSTTIME); -+ BN_set_flags(tmp, BN_FLG_CONSTTIME); -+ -+ /* tmp := blind * priv_key * r mod order */ -+ if (!BN_mod_mul(tmp, blind, priv_key, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ if (!BN_mod_mul(tmp, tmp, ret->r, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* blindm := blind * m mod order */ -+ if (!BN_mod_mul(blindm, blind, m, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* s : = (blind * priv_key * r) + (blind * m) mod order */ -+ if (!BN_mod_add_quick(s, tmp, blindm, order)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* s:= s * blind^-1 mod order */ -+ if (BN_mod_inverse(blind, blind, order, ctx) == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -- if (!BN_mod_add_quick(s, tmp, m, order)) { -+ if (!BN_mod_mul(s, s, blind, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -+ -+ /* s := s * k^-1 mod order */ - if (!BN_mod_mul(s, s, ckinv, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -+ - if (BN_is_zero(s)) { - /* - * if kinv and r have been supplied by the caller don't to - * generate new kinv and r values - */ - if (in_kinv != NULL && in_r != NULL) { -- ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, -- ECDSA_R_NEED_NEW_SETUP_VALUES); -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES); - goto err; - } - } else -@@ -349,15 +405,11 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - ECDSA_SIG_free(ret); - ret = NULL; - } -- if (ctx) -+ if (ctx != NULL) { -+ BN_CTX_end(ctx); - BN_CTX_free(ctx); -- if (m) -- BN_clear_free(m); -- if (tmp) -- BN_clear_free(tmp); -- if (order) -- BN_free(order); -- if (kinv) -+ } -+ if (kinv != NULL) - BN_clear_free(kinv); - return ret; - } --- -2.17.1 - diff --git a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch b/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch deleted file mode 100644 index 50b95306a5..0000000000 --- a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix CVE-2018-0732: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0732 - -Patch copied from upstream source repository: - -https://github.com/openssl/openssl/commit/3984ef0b72831da8b3ece4745cac4f8575b19098 - -From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001 -From: Guido Vranken -Date: Mon, 11 Jun 2018 19:38:54 +0200 -Subject: [PATCH] Reject excessively large primes in DH key generation. - -CVE-2018-0732 - -Signed-off-by: Guido Vranken - -(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) - -Reviewed-by: Tim Hudson -Reviewed-by: Matt Caswell -(Merged from https://github.com/openssl/openssl/pull/6457) ---- - crypto/dh/dh_key.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c -index 387558f146..f235e0d682 100644 ---- a/crypto/dh/dh_key.c -+++ b/crypto/dh/dh_key.c -@@ -130,10 +130,15 @@ static int generate_key(DH *dh) - int ok = 0; - int generate_new_key = 0; - unsigned l; -- BN_CTX *ctx; -+ BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; - BIGNUM *pub_key = NULL, *priv_key = NULL; - -+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { -+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); -+ return 0; -+ } -+ - ctx = BN_CTX_new(); - if (ctx == NULL) - goto err; --- -2.17.1 - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f638c6094c..6cb739eb1f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -262,7 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2o") + (version "1.0.2p") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -274,10 +274,8 @@ required structures.") "/" name "-" version ".tar.gz"))) (sha256 (base32 - "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc")) + "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah")) (patches (search-patches "openssl-runpath.patch" - "openssl-1.0.2-CVE-2018-0495.patch" - "openssl-1.0.2-CVE-2018-0732.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" From 6bbbdb1a34607690ca8413f29bb7bf5cacae2bcc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 16:11:59 +0200 Subject: [PATCH 254/435] gnu: oath-toolkit: Fix FTBFS with Glibc >= 2.28. * gnu/packages/patches/oath-toolkit-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/authentication.scm (oath-toolkit)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/authentication.scm | 2 + .../patches/oath-toolkit-glibc-compat.patch | 90 +++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 gnu/packages/patches/oath-toolkit-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce1f8cc173..39cd55f105 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,6 +994,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/nyx-show-header-stats-with-python3.patch \ + %D%/packages/patches/oath-toolkit-glibc-compat.patch \ %D%/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index a58eac9890..68a6459828 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages authentication) + #:use-module (gnu packages) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (guix build-system gnu) @@ -35,6 +36,7 @@ (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) + (patches (search-patches "oath-toolkit-glibc-compat.patch")) (sha256 (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/oath-toolkit-glibc-compat.patch b/gnu/packages/patches/oath-toolkit-glibc-compat.patch new file mode 100644 index 0000000000..22814599e5 --- /dev/null +++ b/gnu/packages/patches/oath-toolkit-glibc-compat.patch @@ -0,0 +1,90 @@ +Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28. + +Based on this upstream gnulib patch: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e + +--- a/liboath/gl/fflush.c ++++ b/liboath/gl/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +--- a/liboath/gl/fpurge.c ++++ b/liboath/gl/fpurge.c +@@ -62,7 +62,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +--- a/libaoth/gl/freading.c ++++ b/liboath/gl/freading.c +@@ -31,7 +31,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +--- a/liboath/gl/fseeko.c ++++ b/liboath/gl/fseeko.c +@@ -47,7 +47,7 @@ + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +--- a/liboath/gl/stdio-impl.h ++++ b/liboath/gl/stdio-impl.h +@@ -18,6 +18,11 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private, so define it here for now. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif ++ + /* BSD stdio derived implementations. */ + + #if defined __NetBSD__ /* NetBSD */ From 436969904cef613b2fa0809cfa453d3db7e18d52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:31:41 +0200 Subject: [PATCH 255/435] gnu: vigra: Fix FTBFS with Numpy >= 1.15. * gnu/packages/image.scm (vigra)[arguments]: Disable one more test. --- gnu/packages/image.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 03f08a614f..d3fad5d37a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -832,11 +832,15 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") `(#:test-target "check" #:phases (modify-phases %standard-phases - ;; See https://github.com/ukoethe/vigra/issues/432 - (add-after 'unpack 'disable-broken-test + (add-after 'unpack 'disable-broken-tests (lambda _ + ;; See https://github.com/ukoethe/vigra/issues/432 (substitute* "test/fourier/CMakeLists.txt" (("VIGRA_ADD_TEST.*") "")) + ;; This test fails with Numpy 1.15: + ;; . + (substitute* "vigranumpy/test/CMakeLists.txt" + (("test1\\.py") "")) #t))) #:configure-flags (list "-Wno-dev" ; suppress developer mode with lots of warnings From f6f8645cc9337309eeae21e0d036a3167c4a85bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:32:54 +0200 Subject: [PATCH 256/435] gnu: libcmis: Fix FTBFS with Boost >= 1.68.0. * gnu/packages/libreoffice.scm (libcmis)[arguments]: Add phase to substitute header file name. --- gnu/packages/libreoffice.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..690fa80512 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -316,7 +316,16 @@ working with graphics in the WPG (WordPerfect Graphics) format.") ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" - (assoc-ref %build-inputs "boost"))))) + (assoc-ref %build-inputs "boost"))) + #:phases (modify-phases %standard-phases + (add-before 'build 'fix-boost-include + (lambda _ + ;; This library moved in Boost and the compatibility + ;; redirect is no longer available since version 1.68.0. + (substitute* "src/libcmis/xml-utils.cxx" + (("boost/uuid/sha1.hpp") + "boost/uuid/detail/sha1.hpp")) + #t))))) (home-page "https://github.com/tdf/libcmis") (synopsis "CMIS client library") (description "LibCMIS is a C++ client library for the CMIS interface. It From 6cd715adef33e9ad6215e2183f5ab8e7ab0802d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 14:17:06 +0200 Subject: [PATCH 257/435] gnu: python-scipy: Update to 1.1.0. * gnu/packages/python.scm (python-scipy): Update to 1.1.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56176529c9..df98778c0f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3623,14 +3623,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "1fj0r7bg0cfk5clvl57ga06y9bfh05iwlv1dqqs1r6pd89wccfc7")))) + "1lfg686w6vv2m2dfs8v9d0bf2i18z7wz5vgzjnkgmpr4hi0550w7")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) From 529c36225a623aa1b89d3b10c589db7e5cae0f99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 14:28:46 +0200 Subject: [PATCH 258/435] gnu: fontconfig: Update to 2.13.1. * gnu/packages/fontutils.scm (fontconfig): Update to 2.13.1. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 69e35cda0e..2ea4ff049e 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -237,14 +237,14 @@ fonts to/from the WOFF2 format.") (define-public fontconfig (package (name "fontconfig") - (version "2.13.0") + (version "2.13.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/fontconfig/release/fontconfig-" version ".tar.bz2")) (sha256 (base32 - "1fgf28zgsqh7x6dw30n6zi9z679gx6dyfyahp55z7dsm454yipci")))) + "0hb700a68kk0ip51wdlnjjc682kvlrmb6q920mzajykdk0mdsmgn")))) (build-system gnu-build-system) ;; In Requires or Requires.private of fontconfig.pc. (propagated-inputs `(("expat" ,expat) From ad8ae693c8518c927ec119e2aabe05bdf86e2912 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:04 +0200 Subject: [PATCH 259/435] gnu: python-pytest: Update to 3.8.0. * gnu/packages/check.scm (python-pytest): Update to 3.8.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e3edff50a5..a2e156683e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.7.2") + (version "3.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "00jv750alrj62r586hcmvpqlmkqszqfm1x7n6qnqacjmmlis2n9l")))) + "17grcfvd6ggvvqmprwv5y8g319nayam70hr43ssjwj40ws27z858")))) (build-system python-build-system) (arguments `(#:phases From 5d948c0c5de68187ea7c9397641b2332a66ad2ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:26 +0200 Subject: [PATCH 260/435] gnu: python-hypothesis: Update to 3.70.3. * gnu/packages/check.scm (python-hypothesis): Update to 3.70.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index a2e156683e..1373f17865 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1415,13 +1415,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.68.2") + (version "3.70.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "15wlbdy148h3z0ckylf7zkszrfnnk254a6ld3qaf37lkf7hyp4r0")))) + "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) From 9bb8b563a895132f2345d415b5877accbc1cd0b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 18:48:50 +0200 Subject: [PATCH 261/435] gnu: meson: Update to 0.47.2. * gnu/packages/build-tools.scm (meson): Update to 0.47.2. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 1c9b41ef5b..8fcf128135 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -101,7 +101,7 @@ generate such a compilation database.") (define-public meson (package (name "meson") - (version "0.47.1") + (version "0.47.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -109,7 +109,7 @@ generate such a compilation database.") version ".tar.gz")) (sha256 (base32 - "19mdap2ncvczajx220bd73xmwhd8x906382y18cn9c5syxwxwwyn")))) + "1swmycf6p9p0ag6yiywyyri42ffkxxj38r2ic7in24km47cszn4j")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH From 9adaf1f4085e16667a034fc58984af847cab6b05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:04:05 +0200 Subject: [PATCH 262/435] gnu: OpenBLAS: Update to 0.3.3. * gnu/packages/maths.scm (openblas): Update to 0.3.3. --- 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 01bd03c600..84459d5bea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2842,7 +2842,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -2851,7 +2851,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0b20km2jv7m6qiylrlvhq2vnmkmilb633mr8rhqmgbn1wqrp58jq")))) + "0cvlixnpc3cdvvn3f30phfvsgnqljqix6wn72ps9rj7xdhvw06jg")))) (build-system gnu-build-system) (arguments `(#:test-target "test" From 589aca1c183ef1dfdef54d40fdd6a258bbcd39d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:19:32 +0200 Subject: [PATCH 263/435] gnu: Python: Delete broken test. * gnu/packages/python.scm (python-3.7)[source](snippet): Delete test which may crash some systems. --- gnu/packages/python.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index df98778c0f..a057e2a6a3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -342,9 +342,15 @@ data types.") (snippet '(begin (for-each delete-file - '("Lib/ctypes/test/test_win32.py" ; fails on aarch64 - "Lib/test/test_fcntl.py" ; fails on aarch64 - "Lib/test/test_posix.py")) ; fails on aarch64 + '(;; This test may hang and eventually run out of + ;; memory on some systems: + ;; + "Lib/test/test_socket.py" + + ;; These tests fail on AArch64. + "Lib/ctypes/test/test_win32.py" + "Lib/test/test_fcntl.py" + "Lib/test/test_posix.py")) #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) From 2246c19218ca2d55f1126c15e82c666685af8540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:28:22 +0200 Subject: [PATCH 264/435] gnu: mesa: Update to 18.1.8. * gnu/packages/gl.scm (mesa): Update to 18.1.8. --- 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 7c9e20e2ee..067b41b476 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.7") + (version "18.1.8") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "01kk42m2sjyc4k1nfw6k1lnzipjbbmp5js47drgdvp9vrqr3npk5")) + "06y28hpynb8w1qagznr85ml48hf8264w4ji6cmvm2fy7x5zyc6xx")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) From 7b1ad8b1d979b68313d6070134dcc449fe6f2626 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:54:21 +0200 Subject: [PATCH 265/435] gnu: gtk+: Update to 3.24.0. * gnu/packages/gtk.scm (gtk+): Update to 3.24.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7a70239684..111b6159d1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -672,7 +672,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.22.30") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -680,7 +680,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951")) + "1a1jbsh9fg5ykmwrcl3svy7xfvx0b87d314qsx9n483pj8w93s82")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) From a34ce3308e8ac6cd515bf027ed191e722fb48e8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 22:26:44 +0200 Subject: [PATCH 266/435] gnu: gdk-pixbuf: Update to 2.38.0. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.38.0. [build-system]: Switch to MESON-BUILD-SYSTEM. [arguments]: Don't explicitly enable x11 in #:configure-flags. Prevent tests from getting installed. Adjust test substitutions. Add phase to fix install. [native-inputs]: Add GETTEXT-MINIMAL. (gdk-pixbuf+svg)[arguments]: Adjust accordingly. --- gnu/packages/gtk.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 111b6159d1..b1a65a14c7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -443,7 +443,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.12") + (version "2.38.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -451,26 +451,35 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z")))) - (build-system gnu-build-system) + "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x")))) + (build-system meson-build-system) (arguments - '(#:configure-flags '("--with-x11") + '(#:configure-flags '("-Dinstalled-tests=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "tests/Makefile.in" + (substitute* "tests/meson.build" ;; XXX FIXME: This test fails on armhf machines with: ;; SKIP Not enough memory to load bitmap image ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2) - (("cve-2015-4491\\$\\(EXEEXT\\) ") "") + ((".*'cve-2015-4491'.*") "") ;; XXX FIXME: This test fails with: ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; assertion failed (error == NULL): Data differ ;; (gdk-pixbuf-error-quark, 0) - (("pixbuf-jpeg\\$\\(EXEEXT\\) ") "")) - #t))))) + ((".*'pixbuf-jpeg'.*") "")) + #t)) + (add-before 'configure 'aid-install-script + (lambda* (#:key outputs #:allow-other-keys) + ;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders` + ;; for updating loader.cache, but it's not on PATH. Make it use + ;; the one we're installing. XXX: Won't work when cross-compiling. + (substitute* "build-aux/post-install.sh" + (("gdk-pixbuf-query-loaders" match) + (string-append (assoc-ref outputs "out") "/bin/" match))) + #t))))) (propagated-inputs `(;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) @@ -483,6 +492,7 @@ highlighting and other features typical of a source code editor.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME image loading and manipulation library") @@ -502,7 +512,7 @@ in the GNOME project.") `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) (arguments - '(#:configure-flags '("--with-x11") + '(#:configure-flags '("-Dinstalled-tests=false") #:tests? #f ; tested by the gdk-pixbuf package already #:phases (modify-phases %standard-phases From 334bd08c425efe9827d6baed415e7651a957e497 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 07:07:32 +0200 Subject: [PATCH 267/435] gnu: cmake: Update to 3.12.2. * gnu/packages/cmake.scm (cmake): Update to 3.12.2. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 03bce8b68d..5abf087557 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.12.1") + (version "3.12.2") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5")) + "19410mxgcyvk5q42phaclb1hz6rl08z4yj8iriq706p5k5bli5qg")) (modules '((guix build utils))) (snippet '(begin From de781c05e7dafde6468d371a8e34502b6930fe0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 11:58:45 +0200 Subject: [PATCH 268/435] gnu: util-linux: Remove static library reference from '.la' files. * gnu/packages/linux.scm (util-linux)[arguments]: Substitute all '.la' files. --- gnu/packages/linux.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fc071a1338..dad5ba97b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -645,7 +645,14 @@ providing the system administrator with some help in common tasks.") (rename-file file (string-append static "/" file))) - (find-files "lib" "\\.a$"))) + (find-files "lib" "\\.a$")) + + ;; Remove references to the static library from the '.la' + ;; files so that Libtool does the right thing when both + ;; the shared and static library is available. + (substitute* (find-files "lib" "\\.la$") + (("old_library=.*") "old_library=''\n"))) + #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses) From 5e537222498d7f47ddda666de54ab5e0b3828462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 12:59:11 +0200 Subject: [PATCH 269/435] gnu: jbig2dec: Don't build libjbig2dec.a. * gnu/packages/image.scm (jbig2dec)[arguments]: New field. --- gnu/packages/image.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d3fad5d37a..451e7b14a1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -497,6 +497,7 @@ arithmetic ops.") (base32 "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11")) (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) (synopsis "Decoder of the JBIG2 image compression format") (description "JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit From 1d957c79b698241df612fc64b57a1c55cc7b55be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:19:50 +0200 Subject: [PATCH 270/435] gnu: mariadb: Update to 10.1.36. * gnu/packages/databases.scm (mariadb): Update to 10.1.36. [arguments]: Disable one new test. --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c652f39b12..e01ab88c2c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -621,7 +621,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.35") + (version "10.1.36") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -629,7 +629,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) + "0n5aj76mn9rxc21l2kjmfrg10bmsyy4cic68khjr94iby262wx5d")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -707,6 +707,7 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" + "main.stat_tables_innodb" "roles.acl_statistics" ;; FIXME: This test fails on i686: From 4333d48a825c2327c22464de631cf81d05dd2719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:22:43 +0200 Subject: [PATCH 271/435] gnu: mariadb: Move unbundle substitutions to source snippet. * gnu/packages/databases.scm (mariadb)[source](snippet): Add two substitutions from ... [arguments]: The 'unbundle' phase here. Rename to 'fix-pcre-detection. --- gnu/packages/databases.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e01ab88c2c..ff33088cb4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,6 +636,13 @@ Language.") '(begin ;; Delete bundled snappy and xz. (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. + (("^include\\(TokuThirdParty\\)") "")) + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Don't attempt to use the procedures we just removed. + ((" build_lzma build_snappy") "")) ;; Preserve CMakeLists.txt for these. (for-each (lambda (file) @@ -679,7 +686,7 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases - (add-after 'unpack 'unbundle + (add-after 'unpack 'fix-pcre-detection (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed ;; in version 8.34. Unfortunately the upstream patch behaves @@ -688,16 +695,6 @@ Language.") ;; 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 _ From 18784d8f11f62a3ebeb4050ff2d8be5e3623dbbf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 00:54:03 +0200 Subject: [PATCH 272/435] gnu: OpenSSL: Remove obsolete workaround. * gnu/packages/tls.scm (openssl)[arguments]: Remove workaround that is not needed for GCC version 5.3 and later. --- gnu/packages/tls.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6cb739eb1f..22fcf6e96b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -317,15 +317,7 @@ required structures.") (string-append "--openssldir=" out "/share/openssl-" ,version) - (string-append "--prefix=" out) - - ;; XXX FIXME: Work around a code generation bug in GCC - ;; 4.9.3 on ARM when compiled with -mfpu=neon. See: - ;; - ,@(if (and (not (%current-target-system)) - (string-prefix? "armhf" (%current-system))) - '("-mfpu=vfpv3") - '()))))) + (string-append "--prefix=" out))))) (add-after 'install 'make-libraries-writable (lambda* (#:key outputs #:allow-other-keys) From fb94354a69cacbeed1a24d30c46ba7f056186b65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:00:26 +0200 Subject: [PATCH 273/435] gnu: jbig2dec: Remove graft for 0.15. * gnu/packages/image.scm (jbig2dec): Update to 0.15. [source]: Reindent. (jbig2dec-0.15): Remove variable. --- gnu/packages/image.scm | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 451e7b14a1..62fc26ab91 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -485,17 +485,16 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.14") - (replacement jbig2dec-0.15) - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ArtifexSoftware/ghostpdl-downloads/" - "releases/download/gs922/" name "-" version ".tar.gz")) - (sha256 - (base32 "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11")) - (patches (search-patches "jbig2dec-ignore-testtest.patch")))) + (version "0.15") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ArtifexSoftware" + "/ghostpdl-downloads/releases/download" + "/gs924/" name "-" version ".tar.gz")) + (sha256 + (base32 + "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")) + (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) (synopsis "Decoder of the JBIG2 image compression format") @@ -512,21 +511,6 @@ work.") (home-page "https://jbig2dec.com") (license license:gpl2+))) -;; This is a bugfix release from an ongoing Ghostscript security audit. -;; It was released alongside Ghostscript 9.24. -(define-public jbig2dec-0.15 - (package - (inherit jbig2dec) - (version "0.15") - (source (origin - (inherit (package-source jbig2dec)) - (uri (string-append "https://github.com/ArtifexSoftware" - "/ghostpdl-downloads/releases/download/gs924/" - "jbig2dec-" version ".tar.gz")) - (sha256 - (base32 - "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")))))) - (define-public openjpeg (package (name "openjpeg") From 68a08dfbe53301fb5c15470b52185e0578b5293e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:30:06 +0200 Subject: [PATCH 274/435] gnu: libgd: Incorporate grafted changes. * gnu/packages/gd.scm (gd)[replacement]: Remove field. [source](patches): Add "gd-CVE-2018-5711.patch" and "gd-CVE-2018-1000222.patch". (gd/fixed): Remove variable. * gnu/packages/php.scm (gd-for-php): Remove variable. (php)[inputs]: Change GD-FOR-PHP to GD. --- gnu/packages/gd.scm | 16 ++++------------ gnu/packages/php.scm | 12 +----------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 327a1f1545..1fe69577fd 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,7 +39,6 @@ (define-public gd (package (name "gd") - (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -52,7 +51,10 @@ (sha256 (base32 "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c")) - (patches (search-patches "gd-fix-tests-on-i686.patch" + + (patches (search-patches "gd-CVE-2018-5711.patch" + "gd-CVE-2018-1000222.patch" + "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch")))) (build-system gnu-build-system) (arguments @@ -92,16 +94,6 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) -(define-public gd/fixed - (hidden-package - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (append (origin-patches (package-source gd)) - (search-patches "gd-CVE-2018-5711.patch" - "gd-CVE-2018-1000222.patch")))))))) - (define-public perl-gd (package (name "perl-gd") diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 4981c60554..0efbec8057 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -50,16 +50,6 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) -(define gd-for-php - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (search-patches "gd-fix-tests-on-i686.patch" - "gd-freetype-test-failure.patch" - "gd-CVE-2018-5711.patch" - "gd-CVE-2018-1000222.patch")))))) - (define-public php (package (name "php") @@ -312,7 +302,7 @@ ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("freetype" ,freetype) - ("gd" ,gd-for-php) + ("gd" ,gd) ("gdbm" ,gdbm) ("glibc" ,glibc) ("gmp" ,gmp) From 2bdc73fb26fda3a212a8efd358a6f3fd2adae9c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:17:50 +0200 Subject: [PATCH 275/435] gnu: double-conversion: Don't use unstable tarball. * gnu/packages/maths.scm (double-conversion)[source]: Use GIT-FETCH. --- gnu/packages/maths.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 84459d5bea..1288cdc2c3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -279,12 +279,13 @@ enough to be used effectively as a scientific calculator.") (version "3.0.0") (home-page "https://github.com/google/double-conversion") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "059r1czs28ljjd388pn6l3njg1ghbf1cv3q9nkxv3dj2a8siabqm")))) + "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz")))) (build-system cmake-build-system) (arguments '(#:test-target "test" From 02107081daaa4086744ee11870ce7a3529de4410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:19:17 +0200 Subject: [PATCH 276/435] gnu: double-conversion: Update to 3.1.0. * gnu/packages/maths.scm (double-conversion): Update to 3.1.0. --- gnu/packages/maths.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1288cdc2c3..4ac07dd98c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -276,16 +276,15 @@ enough to be used effectively as a scientific calculator.") (define-public double-conversion (package (name "double-conversion") - (version "3.0.0") + (version "3.1.0") (home-page "https://github.com/google/double-conversion") (source (origin (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz")))) + "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx")))) (build-system cmake-build-system) (arguments '(#:test-target "test" From e5eef324459291a7d48661e5d80954d6160f2a55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:13:36 +0200 Subject: [PATCH 277/435] gnu: perl-module-runtime: Update to 0.016. * gnu/packages/perl.scm (perl-module-runtime): Update to 0.016. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4792b6fb49..46c1ce8010 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5224,7 +5224,7 @@ examine the contents, and perform some simple tasks. It can also load the (define-public perl-module-runtime (package (name "perl-module-runtime") - (version "0.014") + (version "0.016") (source (origin (method url-fetch) @@ -5232,7 +5232,7 @@ examine the contents, and perform some simple tasks. It can also load the "Module-Runtime-" version ".tar.gz")) (sha256 (base32 - "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c")))) + "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/Module-Runtime") From d4c04e509bb58e34ae14f76f05c54f1d7c1334d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:24:34 +0200 Subject: [PATCH 278/435] gnu: Remove python-contextlib2. This package is part of the Python standard library since version 3.2. * gnu/packages/python.scm (python-contextlib2): Rename to ... (python2-contextlib2): ... this. Remove previous incarnation. [arguments]: Set #:python. --- gnu/packages/python.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a057e2a6a3..344de73603 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7159,9 +7159,9 @@ be set via config files and/or environment variables.") @code{ArgumentParser} object.") (license license:asl2.0))) -(define-public python-contextlib2 +(define-public python2-contextlib2 (package - (name "python-contextlib2") + (name "python2-contextlib2") (version "0.4.0") (source (origin @@ -7172,7 +7172,8 @@ be set via config files and/or environment variables.") "0cmp131dlh0d0zvw0aza1zd13glvngzk8lb4avks0hm7yxwdr9am")))) (build-system python-build-system) (arguments - `(#:phases + `(#:python ,python-2 + #:phases (modify-phases %standard-phases (replace 'check (lambda _ (zero? @@ -7187,9 +7188,6 @@ managers. It also contains additional features that are not part of the standard library.") (license license:psfl))) -(define-public python2-contextlib2 - (package-with-python2 python-contextlib2)) - (define-public python-texttable (package (name "python-texttable") From d06940882dad48607a99b1cb42f41a8609fac924 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:25:25 +0200 Subject: [PATCH 279/435] gnu: python2-contextlib2: Update to 0.5.5. * gnu/packages/python.scm (python2-contextlib2): Update to 0.5.5. [native-inputs]: Add PYTHON2-UNITTEST2. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 344de73603..6c94c070a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7162,14 +7162,14 @@ be set via config files and/or environment variables.") (define-public python2-contextlib2 (package (name "python2-contextlib2") - (version "0.4.0") + (version "0.5.5") (source (origin (method url-fetch) (uri (pypi-uri "contextlib2" version)) (sha256 (base32 - "0cmp131dlh0d0zvw0aza1zd13glvngzk8lb4avks0hm7yxwdr9am")))) + "0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -7179,6 +7179,8 @@ be set via config files and/or environment variables.") (lambda _ (zero? (system* "python" "test_contextlib2.py" "-v"))))))) + (native-inputs + `(("python2-unittest2" ,python2-unittest2))) (home-page "http://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") (description "This module is primarily a backport of the Python From 073705e7253d59cfc2b3c629566027edd25308f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:28:42 +0200 Subject: [PATCH 280/435] gnu: python2-contextlib2: Use 'invoke' instead of 'system*'. * gnu/packages/python.scm (python2-contextlib2)[arguments]: Use INVOKE. --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6c94c070a7..7f208c01a2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7176,9 +7176,7 @@ be set via config files and/or environment variables.") #:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? - (system* - "python" "test_contextlib2.py" "-v"))))))) + (lambda _ (invoke "python" "test_contextlib2.py" "-v")))))) (native-inputs `(("python2-unittest2" ,python2-unittest2))) (home-page "http://contextlib2.readthedocs.org/") From 4d19a14e777a2f53700453844504fedb7fb51946 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:29:40 +0200 Subject: [PATCH 281/435] gnu: python-llfuse: Update to 1.3.5. * gnu/packages/python.scm (python-llfuse): Update to 1.3.5. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7f208c01a2..8165e47349 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5983,13 +5983,13 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.3.3") + (version "1.3.5") (source (origin (method url-fetch) (uri (pypi-uri "llfuse" version ".tar.bz2")) (sha256 (base32 - "1rqww632y2zz71xmr6ch7yq80kvza9mhqr2z773k0d8l1lwzl575")))) + "1n7a90jww3ly49fm7x27m3xw3la3qfrnykcakga654g6kcyjlhbf")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) From f2d4944086e16e2e60d47b64189d2f04c1a3fb75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:49:46 +0200 Subject: [PATCH 282/435] gnu: guile-xcb: Install compiled files to "lib" instead of "share". This follows up commit b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 which removes the previous install location from Guiles search path. * gnu/packages/guile-wm.scm (guile-xcb)[arguments]: Amend #:configure-flags. --- gnu/packages/guile-wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 364477be72..3755282403 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -56,7 +56,7 @@ (string-append "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.2")))) + "/lib/guile/2.2/site-ccache")))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) From 9fc445b1a563b95347154523bcca489124141daf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 18:52:01 +0200 Subject: [PATCH 283/435] gnu: python-pexpect: Update to 4.6.0. * gnu/packages/python.scm (python-pexpect): Update to 4.6.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8165e47349..4da26c5d30 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4340,13 +4340,13 @@ displayed.") (define-public python-pexpect (package (name "python-pexpect") - (version "4.2.1") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "pexpect" version)) (sha256 - (base32 "14ls7k99pwvl21zqv65kzrhccv50j89m5ij1hf0slmsvlxjj84rx")))) + (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia")))) (build-system python-build-system) (arguments `(#:phases From b8d165b18a310ddc8462cdbde41db273d5d2a27f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:02:17 +0200 Subject: [PATCH 284/435] gnu: python-traitlets: Update to 4.3.2. * gnu/packages/python.scm (python-traitlets): Update to 4.3.2. [native-inputs]: Remove PYTHON-NOSE and PYTHON-MOCK. Add PYTHON-PYTEST. [arguments]: Adjust check phase accordingly. [properties]: New field. (python2-traitlets)[propagated-inputs]: Add PYTHON2-ENUM34. --- gnu/packages/python.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4da26c5d30..25ce14cca4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4518,25 +4518,25 @@ away.") (define-public python-traitlets (package (name "python-traitlets") - (version "4.2.0") + (version "4.3.2") (source (origin (method url-fetch) (uri (pypi-uri "traitlets" version)) (sha256 (base32 - "1afy08sa5n9gnkvh3da49c16zkyv598vchv0p1hp7zzjy8895hz4")))) + "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (zero? (system* "nosetests"))))))) + (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) (propagated-inputs `(("python-ipython-genutils" ,python-ipython-genutils) - ("python-decorator" ,python-decorator))) + ("python-decorator" ,python-decorator))) ;not needed for >4.3.2 (native-inputs - `(("python-mock" ,python-mock) - ("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) + (properties `((python2-variant . ,(delay python2-traitlets)))) (home-page "https://ipython.org") (synopsis "Configuration system for Python applications") (description @@ -4549,7 +4549,12 @@ without using the configuration machinery.") (license license:bsd-3))) (define-public python2-traitlets - (package-with-python2 python-traitlets)) + (let ((traitlets (package-with-python2 (strip-python2-variant python-traitlets)))) + (package + (inherit traitlets) + (propagated-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-propagated-inputs traitlets)))))) (define-public python-jupyter-core (package From 242f2711bd3b3944eefc4065d685324b22369116 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:15:38 +0200 Subject: [PATCH 285/435] gnu: python-pyzmq: Update to 17.1.2. * gnu/packages/python.scm (python-pyzmq): Update to 17.1.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 25ce14cca4..f00848a9c0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5466,13 +5466,13 @@ applications.") (define-public python-pyzmq (package (name "python-pyzmq") - (version "15.1.0") + (version "17.1.2") (source (origin (method url-fetch) (uri (pypi-uri "pyzmq" version)) (sha256 - (base32 "13fhwnlvsvxv72kfhqbpn6qi7msh8mc8377mpabv32skk2cjfnxx")))) + (base32 "1pyxxrz60f88ffm0y6vpbx3q8jcr9ybz8fcilihwzwhh36n84ax7")))) (build-system python-build-system) (arguments `(#:configure-flags From f659e5e379dc3ec43be27a8e3169fe2ed197bb93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 13:19:47 +0200 Subject: [PATCH 286/435] gnu: python-waf: Update to 2.0.11. * gnu/packages/python.scm (python-waf): Update to 2.0.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f00848a9c0..5a1f3ed229 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5431,14 +5431,14 @@ so it might be a tiny bit slower.") (define-public python-waf (package (name "python-waf") - (version "2.0.10") + (version "2.0.11") (source (origin (method url-fetch) (uri (string-append "https://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "1v832jljl5wwqyimz40zgksf5ws1w3d2niz3qxamyp5dnyvzjl35")))) + "13zrniwkmfqgsgzi9v5m1367fppp9yzrz6z2ny6hy8dmpb8mj4z4")))) (build-system python-build-system) (arguments '(#:phases From 36e8185667c41740786d9b2eb3672a0f8b902ed8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 14:00:20 +0200 Subject: [PATCH 287/435] gnu: lv2: Use Python 2 for building. * gnu/packages/audio.scm (lv2)[arguments]: Set #:python. --- gnu/packages/audio.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3b898c024a..8ce9af6af1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1777,6 +1777,8 @@ significantly faster and have minimal dependencies.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + ;; XXX: The bundled waf does not work with Python 3.7. + #:python ,python-2 #:configure-flags '("--no-plugins"))) (inputs ;; Leaving off cairo and gtk+-2.0 which are needed for example plugins From ecd13016517f0113016fef090782b725fd5e80ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 18:23:29 -0400 Subject: [PATCH 288/435] gnu: libinput: Update to 1.12.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.12.0. --- 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 ce67b6858b..c6bccd452d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.11.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) + "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) From 985d542e028517b2888fa61831233a2b60dc7d48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 14:00:02 +0200 Subject: [PATCH 289/435] gnu: gstreamer: Update to 1.14.3. * 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.3. --- 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 f556861857..21acd9f150 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.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb")))) + "0mh4755an4gk0z3ygqhjpdjk0r2cwswbpwfgl0x6qmnln4757bhk")))) (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.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -158,7 +158,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4")))) + "0lkr1fm3bz21nqq9vi5v74mlxw6dd6i7piw00fhc5zz0dg1ikczh")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -209,7 +209,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -218,7 +218,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0")))) + "0pgzgfqbfp8lz2ns68797xfxdr0cr5rpi93wd1h2grhbmzkbq4ji")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -268,14 +268,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil")))) + "1mczcna91f3kkk3yv5fkfa8nmqdr9d93aq9z4d8sv18vkiflw8mj")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -344,7 +344,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -352,7 +352,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m")))) + "01i31g5rvw36rjlyi9w24n0g1xa6053d14vaiba6vqpas727z123")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -382,7 +382,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append @@ -390,7 +390,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")) + "0xxnb80yhfa42x4wx1928zydaal35b2mcj0zdcdsv1apnjdm40wv")) (modules '((guix build utils))) (snippet '(begin @@ -418,7 +418,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append @@ -426,7 +426,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w")))) + "01w3mpimbm8drifhrkvpns79h15kd9h9v0dynr7yb12kjrnfghsg")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. From ffec356a29a58d97ec34e1152aa3136e78471dc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 14:45:34 +0200 Subject: [PATCH 290/435] gnu: node: Build against libuv@1.19. * gnu/packages/libevent.scm (libuv-1.19): New public variable. * gnu/packages/node.scm (node)[inputs]: Change LIBUV to LIBUV-1.19. --- gnu/packages/libevent.scm | 13 +++++++++++++ gnu/packages/node.scm | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bc7f6c670d..2de29707ca 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -152,6 +152,19 @@ resolution, asynchronous file system operations, and threading primitives.") ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) +;; This version is required for Node versions < 10. +(define-public libuv-1.19 + (package + (inherit libuv) + (version "1.19.2") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w")))))) + (define-public perl-anyevent (package (name "perl-anyevent") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index b525804bdb..a0221601dd 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -184,7 +184,7 @@ `(("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) - ("libuv" ,libuv) + ("libuv" ,libuv-1.19) ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) From 944a3a8b8e36e1e1b9632a774c9ae4e63647d21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Oct 2018 15:22:44 +0200 Subject: [PATCH 291/435] gnu: recutils: Adjust Gnulib to libc 2.28. Fixes . * gnu/packages/databases.scm (recutils)[modules, snippet]: New fields. --- gnu/packages/databases.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b6e5012677..fecf661833 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -923,7 +923,23 @@ organized in a hash table or B+ tree.") version ".tar.gz")) (sha256 (base32 - "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93")))) + "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) ;; Running tests in parallel leads to test failures and crashes in From e65b2181e8b436278e3dd0b405602a400fbd0a75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 19:05:39 +0200 Subject: [PATCH 292/435] gnu: icu4c: Skip tests on i686. * gnu/packages/icu4c.scm (icu4c)[arguments]: On i686-linux, set #:tests? #f. --- gnu/packages/icu4c.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index cbba9aa42a..2d28107e81 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -55,6 +55,12 @@ (string-prefix? "mips" s))) '("--with-data-packaging=archive") '())) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + ;; FIXME: Some tests are failing on i686: + ;; . + '(#:tests? #f) + '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source From 0a3e9bf62171b051656f24b81094064b479ebf2e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Oct 2018 21:08:38 -0400 Subject: [PATCH 293/435] gnu: Go 1.9: Fix test failure with binutils >= 2.31. * gnu/packages/golang.scm (go-1.9)[arguments]: Add a substitution to the prebuild phase. --- gnu/packages/golang.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7f26fbdab6..1ce06a47b6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -273,6 +273,15 @@ in the style of communicating sequential processes (@dfn{CSP}).") (string-append "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + ;; XXX Commit 65fa2b615b72c1fa61a7 in the Go repo. We do this + ;; without a patch because ((guix packages) patch-and-repack) + ;; resets file mtimes, and parts of Go's test suite rely on + ;; those timestamps. + ;; + (substitute* "cmd/internal/objfile/elf.go" + (("PT_LOAD") + "PT_LOAD && p.Flags&elf.PF_X != 0")) + ;; Disable failing tests: these tests attempt to access ;; commands or network resources which are neither available ;; nor necessary for the build to succeed. From fd15eb286e9b2effaf19a65e17e9e0e6d19b2111 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Oct 2018 20:44:56 +0300 Subject: [PATCH 294/435] gnu: python-more-itertools: Fix building on 32-bit architectures. * gnu/packages/python.scm (python-more-itertools)[arguments]: Add a custom phase to prevent overflowing on 32-bit architectures. --- gnu/packages/python.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d63e263e3c..1667f4801b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -142,7 +142,8 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (guix build-system trivial) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public python-2.7 (package @@ -13550,6 +13551,20 @@ file system events on Linux.") (base32 "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) (build-system python-build-system) + (arguments + `(,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("armhf" "i686")) + '(#:phases + (modify-phases %standard-phases + ;; This is required for 32-bit hardware. + ;; TODO: Try to remove this when upgrading. + (add-after 'unpack 'patch-test + (lambda _ + (substitute* "more_itertools/tests/test_more.py" + (("10 \\*\\* 10") "9 ** 9")) + #t)))) + '()))) (propagated-inputs `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") From 0ea6af996b06ba453b803f2d4b014ffa709db4b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Oct 2018 22:33:59 +0300 Subject: [PATCH 295/435] gnu: python-testtools: Fix regression in test suite. * gnu/packages/check.scm (python-testtools)[source]: Add patch. * gnu/packages/patches/python-testtools.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/check.scm | 3 +- gnu/packages/patches/python-testtools.patch | 57 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-testtools.patch diff --git a/gnu/local.mk b/gnu/local.mk index 15c8159460..e5745ba9e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1087,6 +1087,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ + %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2868f72cf9..1ae6355a93 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -879,7 +879,8 @@ subprocess and see the output as well as any file modifications.") (uri (pypi-uri "testtools" version)) (sha256 (base32 - "0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq")))) + "0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq")) + (patches (search-patches "python-testtools.patch")))) (build-system python-build-system) (arguments '(#:tests? #f)) (propagated-inputs diff --git a/gnu/packages/patches/python-testtools.patch b/gnu/packages/patches/python-testtools.patch new file mode 100644 index 0000000000..42536e50f9 --- /dev/null +++ b/gnu/packages/patches/python-testtools.patch @@ -0,0 +1,57 @@ +https://github.com/testing-cabal/testtools/commit/29004731f9c480b7c44a9c2605513d50d372898f.patch +Should be fixed in the next release + +From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 17 May 2018 17:52:26 +0200 +Subject: [PATCH] Fix the tests on Python 3.7 + +Exception's repr got changed not to include trailing comma + +Fixes https://github.com/testing-cabal/testtools/issues/270 +--- + .travis.yml | 1 + + testtools/tests/matchers/test_exception.py | 11 +++++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 7f1f4db7..784608e0 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -5,6 +5,7 @@ python: + - "3.4" + - "3.5" + - "3.6" ++ - "3.7-dev" + - "pypy" + + install: +diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py +index 6cd80af1..acd39252 100644 +--- a/testtools/tests/matchers/test_exception.py ++++ b/testtools/tests/matchers/test_exception.py +@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface): + matches_matches = [error_foo] + matches_mismatches = [error_bar, error_base_foo] + ++ if sys.version_info >= (3, 7): ++ # exception's repr has changed ++ _e = '' ++ else: ++ _e = ',' ++ + str_examples = [ +- ("MatchesException(Exception('foo',))", ++ ("MatchesException(Exception('foo'%s))" % _e, + MatchesException(Exception('foo'))) + ] + describe_examples = [ + ("%r is not a %r" % (Exception, ValueError), + error_base_foo, + MatchesException(ValueError("foo"))), +- ("ValueError('bar',) has different arguments to ValueError('foo',).", ++ ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)." ++ % (_e, _e), + error_bar, + MatchesException(ValueError("foo"))), + ] From c2397a869549b6786b801ab816acdba68555494a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Oct 2018 11:04:13 +0300 Subject: [PATCH 296/435] gnu: gdk-pixbuf: Increase test timeout. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Increase test timeout. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ccedec6398..cec10504c5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -469,7 +469,11 @@ highlighting and other features typical of a source code editor.") ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; assertion failed (error == NULL): Data differ ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "")) + ((".*'pixbuf-jpeg'.*") "") + ;; Extend the timeout of the test suite. + ;; TODO: Check upstreaming effort: + ;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/21 + (("300") "1800")) #t)) (add-before 'configure 'aid-install-script (lambda* (#:key outputs #:allow-other-keys) From f1a9c6e581e3b90713d11801dbab9a611f6fe63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Oct 2018 10:31:24 +0200 Subject: [PATCH 297/435] gnu: lsof: Fix builds on glibc 2.28. * gnu/packages/lsof.scm (lsof)[arguments]: In 'disable-failing-tests', add 'substitute*' use for "tests/LTlib.c". --- gnu/packages/lsof.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index 8b3ebe2945..311e244608 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,12 @@ #t)) (add-before 'check 'disable-failing-tests (lambda _ + ;; In libc 2.28, the 'major' and 'minor' macros are provided by + ;; only so include it. + (substitute* "tests/LTlib.c" + (("#ifndef lint") + "#include \n\n#ifndef lint")) + (substitute* "tests/Makefile" ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. (("(STDTST=.*) LTsock" _ prefix) prefix) From 68b0226b2abc7aa9bf029800699338762e2a2e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Oct 2018 10:39:45 +0200 Subject: [PATCH 298/435] gnu: gcal: Apply Gnulib fixes. * gnu/packages/gcal.scm (gcal)[modules, snippet]: New fields. --- gnu/packages/gcal.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcal.scm b/gnu/packages/gcal.scm index 425fa1f9a8..32d3849faa 100644 --- a/gnu/packages/gcal.scm +++ b/gnu/packages/gcal.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +32,23 @@ version ".tar.xz")) (sha256 (base32 - "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")))) + "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/gcal/") (synopsis "Calculating and printing a wide variety of calendars") From 0627f93db6a57e7411cb332b7509f35753b149e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 21:45:08 +0300 Subject: [PATCH 299/435] gnu: clang-runtime: Adapt for glibc@2.28. * gnu/packages/llvm.scm (clang-runtime@3.7, clang-runtime@3.8, clang-runtime@3.9)[patches]: Add patch to work around removed ustat.h. * gnu/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 10 ++-- .../clang-3.5-libsantitizer-ustat-fix.patch | 46 +++++++++++++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e5745ba9e6..0c40d6c0b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -613,6 +613,7 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ + %D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ %D%/packages/patches/clang-6.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d0791d00cc..aef24b3bac 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -270,7 +271,8 @@ code analysis tools.") llvm-3.9.1 "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk" '("clang-runtime-asan-build-fixes.patch" - "clang-runtime-esan-build-fixes.patch"))) + "clang-runtime-esan-build-fixes.patch" + "clang-3.5-libsantitizer-ustat-fix.patch"))) (define-public clang-3.9.1 (clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1 @@ -294,7 +296,8 @@ code analysis tools.") (clang-runtime-from-llvm llvm-3.8 "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d" - '("clang-runtime-asan-build-fixes.patch"))) + '("clang-runtime-asan-build-fixes.patch" + "clang-3.5-libsantitizer-ustat-fix.patch"))) (define-public clang-3.8 (clang-from-llvm llvm-3.8 clang-runtime-3.8 @@ -317,7 +320,8 @@ code analysis tools.") (clang-runtime-from-llvm llvm-3.7 "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx" - '("clang-runtime-asan-build-fixes.patch"))) + '("clang-runtime-asan-build-fixes.patch" + "clang-3.5-libsantitizer-ustat-fix.patch"))) (define-public clang-3.7 (clang-from-llvm llvm-3.7 clang-runtime-3.7 diff --git a/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch b/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch new file mode 100644 index 0000000000..cfb09a8ce3 --- /dev/null +++ b/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch @@ -0,0 +1,46 @@ +From d9d97cac3702b99a00cd113de98c41eb535d47ed Mon Sep 17 00:00:00 2001 +From: Efraim Flashner +Date: Sun, 14 Oct 2018 12:11:30 +0300 +Subject: [PATCH] patch modified from the gcc patch series, also dealing with + ustat. + +--- + .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 29fea6e..570b9a5 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -129,7 +129,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -222,7 +221,19 @@ namespace __sanitizer { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID +-- +2.19.1 + From 1a2d8d06b53c3c8cf8f94920c6e8734c71b8369b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Oct 2018 21:51:23 +0300 Subject: [PATCH 300/435] * gnu: clang-runtime: Fix typo in patch name. This is a follow-up to 0627f93db6a57e7411cb332b7509f35753b149e4. * gnu/packages/patches/libsantitizer-ustat-fix.patch: Rename to gnu/packages/patches/libsanitizer-ustat-fix.patch. * gnu/packages/llvm.scm (clang-runtime@3.7, clang-runtime@3.8, clang-runtime@3.9)[patches]: Fix patch name. --- gnu/packages/llvm.scm | 6 +++--- ...tat-fix.patch => clang-3.5-libsanitizer-ustat-fix.patch} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename gnu/packages/patches/{clang-3.5-libsantitizer-ustat-fix.patch => clang-3.5-libsanitizer-ustat-fix.patch} (100%) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index aef24b3bac..54a17be8f4 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -272,7 +272,7 @@ code analysis tools.") "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk" '("clang-runtime-asan-build-fixes.patch" "clang-runtime-esan-build-fixes.patch" - "clang-3.5-libsantitizer-ustat-fix.patch"))) + "clang-3.5-libsanitizer-ustat-fix.patch"))) (define-public clang-3.9.1 (clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1 @@ -297,7 +297,7 @@ code analysis tools.") llvm-3.8 "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d" '("clang-runtime-asan-build-fixes.patch" - "clang-3.5-libsantitizer-ustat-fix.patch"))) + "clang-3.5-libsanitizer-ustat-fix.patch"))) (define-public clang-3.8 (clang-from-llvm llvm-3.8 clang-runtime-3.8 @@ -321,7 +321,7 @@ code analysis tools.") llvm-3.7 "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx" '("clang-runtime-asan-build-fixes.patch" - "clang-3.5-libsantitizer-ustat-fix.patch"))) + "clang-3.5-libsanitizer-ustat-fix.patch"))) (define-public clang-3.7 (clang-from-llvm llvm-3.7 clang-runtime-3.7 diff --git a/gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch b/gnu/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch similarity index 100% rename from gnu/packages/patches/clang-3.5-libsantitizer-ustat-fix.patch rename to gnu/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch From 08f535eb2d438e52c1e84cefc1c270b9ad50620d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:20:11 +0200 Subject: [PATCH 301/435] gnu: chez: Adjust to zlib static output. * gnu/packages/chez.scm (chez-scheme)[inputs]: Add ZLIB:STATIC. [arguments]: Reference libz.a from that instead of ZLIB. --- gnu/packages/chez.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index c8e76b8ab4..929e50ee9b 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -85,6 +85,7 @@ ("xorg-rgb" ,xorg-rgb) ("nanopass" ,nanopass) ("zlib" ,zlib) + ("zlib:static" ,zlib "static") ("stex" ,stex))) (native-inputs `(("texlive" ,texlive) @@ -128,6 +129,7 @@ (nanopass (assoc-ref inputs "nanopass")) (stex (assoc-ref inputs "stex")) (zlib (assoc-ref inputs "zlib")) + (zlib-static (assoc-ref inputs "zlib:static")) (unpack (assoc-ref %standard-phases 'unpack)) (patch-source-shebangs (assoc-ref %standard-phases 'patch-source-shebangs))) @@ -148,7 +150,7 @@ (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a") "${Kernel}: ${kernelobj}") (("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args) - (string-append "ld " args " " zlib "/lib/libz.a")) + (string-append "ld " args " " zlib-static "/lib/libz.a")) (("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))") (which "true"))) (substitute* (find-files "mats" "Mf-.*") From 29e53b446ccb8959db8a96161c04d98e873e2371 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:30:45 +0200 Subject: [PATCH 302/435] gnu: libinput: Update to 1.12.1. * gnu/packages/freedesktop.scm (libinput): Update to 1.12.1. --- 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 cf8047e5fe..8853ce1ceb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.12.0") + (version "1.12.1") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) + "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) From 56112a577ce445646aaddb9701f4af6b5626fb70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Oct 2018 16:44:31 +0200 Subject: [PATCH 303/435] gnu: perl-unicode-utf8: Disable tests on 32-bit systems. * gnu/packages/perl.scm (perl-unicode-utf8)[arguments]: New field. --- gnu/packages/perl.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ac71eaf07b..cadef602e4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages base) @@ -8998,6 +8999,9 @@ defined by Annex #11 is used to determine breaking positions.") (base32 "1xnhazbdvpyfpnxd90krzhxkvabf8fa2ji6xzlrf75j6nz8251zs")))) (build-system perl-build-system) + ;; FIXME: Tests fail on 32-bit architectures: + ;; . + (arguments `(#:tests? ,(target-64bit?))) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) ("perl-test-leaktrace" ,perl-test-leaktrace) From da39ff58987d7ed082233ab9ac3ae8d6d0f50b5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 10:54:58 +0300 Subject: [PATCH 304/435] gnu: boost-for-mysql: Remove unnecessary phase. * gnu/packages/boost.scm (boost-for-mysql)[arguments]: Remove custom 'provide-libboost_python phase. Add removed '/bin/sh' substitution. --- gnu/packages/boost.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d1b359b2cb..897987f71c 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages boost) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -134,6 +136,15 @@ across a broad spectrum of applications.") (sha256 (base32 "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj")))) + (arguments (substitute-keyword-arguments (package-arguments boost) + ((#:phases phases) + `(modify-phases ,phases + ;; This was removed after boost-1.67. + (add-before 'configure 'more-bin-sh-patching + (lambda _ + (substitute* "tools/build/doc/bjam.qbk" + (("/bin/sh") (which "sh"))))) + (delete 'provide-libboost_python))))) (properties '((hidden? . #t))))) (define-public boost-sync From fb3ff265cd8c6b4c6160f94240dc8932097e637b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 11:17:26 +0300 Subject: [PATCH 305/435] gnu: python-icalendar: Update to 4.0.3. * gnu/packages/python.scm (python-icalendar): Update to 4.0.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1667f4801b..2e88b0bc51 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7475,13 +7475,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.1") + (version "4.0.3") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) + "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) From 16f14f63db7a370d3917cf9c7d7e3735b0f59855 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Oct 2018 20:53:24 +0200 Subject: [PATCH 306/435] gnu: Python: Adjust grafts for core-updates merge. This adjust the grafts from a55ebe2e3a7b438b4eec06c594440d3a0fb06a25 and 90aeaee861845142843a0f988fa4ff016c723cdb to apply to Python 2.7.15 and 3.7.0. * gnu/packages/patches/python2-CVE-2018-1060.patch, gnu/packages/patches/python2-CVE-2018-1061.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/python.scm (python-2/fixed): Remove patches that are already present in 2.7.15. (python-3/fixed): Remove obsolete phase. --- gnu/local.mk | 2 -- .../patches/python2-CVE-2018-1060.patch | 20 ------------------- .../patches/python2-CVE-2018-1061.patch | 20 ------------------- gnu/packages/python.scm | 16 ++------------- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/python2-CVE-2018-1060.patch delete mode 100644 gnu/packages/patches/python2-CVE-2018-1061.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1181210da5..8d4d0d26ea 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,8 +1068,6 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ - %D%/packages/patches/python2-CVE-2018-1060.patch \ - %D%/packages/patches/python2-CVE-2018-1061.patch \ %D%/packages/patches/python2-CVE-2018-14647.patch \ %D%/packages/patches/python2-CVE-2018-1000802.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1060.patch b/gnu/packages/patches/python2-CVE-2018-1060.patch deleted file mode 100644 index 5eb7ccfbc9..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1060.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix CVE-2018-1060: -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1060 - -Taken from upstream commit (sans test and NEWS): -https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 - -diff --git a/Lib/poplib.py b/Lib/poplib.py -index b91e5f72d2ca..a238510b38fc 100644 ---- a/Lib/poplib.py -+++ b/Lib/poplib.py -@@ -274,7 +274,7 @@ def rpop(self, user): - return self._shortcmd('RPOP %s' % user) - - -- timestamp = re.compile(r'\+OK.*(<[^>]+>)') -+ timestamp = re.compile(br'\+OK.[^<]*(<.*>)') - - def apop(self, user, secret): - """Authorisation - diff --git a/gnu/packages/patches/python2-CVE-2018-1061.patch b/gnu/packages/patches/python2-CVE-2018-1061.patch deleted file mode 100644 index 6caab24b4d..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1061.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix CVE-2018-1061: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1061 - -Taken from upstream commit (sans test and NEWS): -https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2 - -diff --git a/Lib/difflib.py b/Lib/difflib.py -index 1c6fbdbedcb7..788a92df3f89 100644 ---- a/Lib/difflib.py -+++ b/Lib/difflib.py -@@ -1103,7 +1103,7 @@ def _qformat(self, aline, bline, atags, btags): - - import re - --def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match): -+def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match): - r""" - Return 1 for ignorable line: iff `line` is blank or contains a single '#'. - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 39ec96fd66..63cf440014 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -323,9 +323,7 @@ data types.") (inherit (package-source python-2)) (patches (append (origin-patches (package-source python-2)) - (search-patches "python2-CVE-2018-1060.patch" - "python2-CVE-2018-1061.patch" - "python2-CVE-2018-14647.patch" + (search-patches "python2-CVE-2018-14647.patch" "python2-CVE-2018-1000802.patch"))))))) (define-public python2-called-python @@ -419,17 +417,7 @@ data types.") (source (origin (inherit (package-source python-3)) (patches (append (origin-patches (package-source python-3)) - (search-patches "python-CVE-2018-14647.patch"))))) - (arguments - (substitute-keyword-arguments (package-arguments python-3) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'delete-broken-test - (lambda _ - ;; Delete test which fails on recent kernels: - ;; . - (delete-file "Lib/test/test_socket.py") - #t)))))))) + (search-patches "python-CVE-2018-14647.patch"))))))) ;; Current major version. (define-public python python-3) From e8ef3cc4d62d573db5e7338a0342ef20df5f8b4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Oct 2018 19:13:13 +0200 Subject: [PATCH 307/435] gnu: swig: Fix build on i686. * gnu/packages/patches/swig-guile-gc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/swig.scm (swig)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/patches/swig-guile-gc.patch | 76 ++++++++++++++++++++++++ gnu/packages/swig.scm | 2 + 3 files changed, 79 insertions(+) create mode 100644 gnu/packages/patches/swig-guile-gc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d4d0d26ea..4b8c4c3d69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1154,6 +1154,7 @@ dist_patch_DATA = \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ + %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-format-security.patch \ %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \ diff --git a/gnu/packages/patches/swig-guile-gc.patch b/gnu/packages/patches/swig-guile-gc.patch new file mode 100644 index 0000000000..0e745a6247 --- /dev/null +++ b/gnu/packages/patches/swig-guile-gc.patch @@ -0,0 +1,76 @@ +Fix garbage collection for Guile versions >= 2.0.12. This issue showed +up when running the tests on i686-linux. + +Taken from this upstream commit: +https://github.com/swig/swig/commit/38f2ab0c30e369e63bbd0a6152108488d0de68e1 + +diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg +index 274f197158..0d04cb7c62 100644 +--- a/Lib/guile/guile_scm_run.swg ++++ b/Lib/guile/guile_scm_run.swg +@@ -99,6 +99,7 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) { + static int swig_initialized = 0; + static scm_t_bits swig_tag = 0; + static scm_t_bits swig_collectable_tag = 0; ++static scm_t_bits swig_finalized_tag = 0; + static scm_t_bits swig_destroyed_tag = 0; + static scm_t_bits swig_member_function_tag = 0; + static SCM swig_make_func = SCM_EOL; +@@ -163,7 +164,19 @@ SWIG_Guile_PointerType(SCM object) + } + else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object); + } +- ++ ++SWIGINTERN int ++SWIG_Guile_IsValidSmob(SCM smob) ++{ ++ /* We do not accept smobs representing destroyed pointers, but we have to ++ allow finalized smobs because Guile >= 2.0.12 sets all smob instances ++ to the 'finalized' type before calling their 'free' function. This change ++ was introduced to Guile in commit 8dff3af087c6eaa83ae0d72aa8b22aef5c65d65d */ ++ return SCM_SMOB_PREDICATE(swig_tag, smob) ++ || SCM_SMOB_PREDICATE(swig_collectable_tag, smob) ++ || SCM_SMOB_PREDICATE(swig_finalized_tag, smob); ++} ++ + SWIGINTERN int + SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) + { +@@ -179,8 +192,7 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) + *result = SCM_POINTER_VALUE(s); + return SWIG_OK; + #endif /* if SCM_MAJOR_VERSION >= 2 */ +- } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { +- /* we do not accept smobs representing destroyed pointers */ ++ } else if (SWIG_Guile_IsValidSmob(smob)) { + from = (swig_type_info *) SCM_CELL_WORD_2(smob); + if (!from) return SWIG_ERROR; + if (type) { +@@ -239,7 +251,7 @@ SWIG_Guile_MarkPointerNoncollectable(SCM s) + { + SCM smob = SWIG_Guile_GetSmob(s); + if (!SCM_NULLP(smob)) { +- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { ++ if (SWIG_Guile_IsValidSmob(smob)) { + SCM_SET_CELL_TYPE(smob, swig_tag); + } + else scm_wrong_type_arg(NULL, 0, s); +@@ -252,7 +264,7 @@ SWIG_Guile_MarkPointerDestroyed(SCM s) + { + SCM smob = SWIG_Guile_GetSmob(s); + if (!SCM_NULLP(smob)) { +- if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { ++ if (SWIG_Guile_IsValidSmob(smob)) { + SCM_SET_CELL_TYPE(smob, swig_destroyed_tag); + } + else scm_wrong_type_arg(NULL, 0, s); +@@ -419,6 +431,8 @@ SWIG_Guile_Init () + scm_set_smob_print(swig_collectable_tag, print_collectable_swig); + scm_set_smob_equalp(swig_collectable_tag, equalp_swig); + scm_set_smob_free(swig_collectable_tag, free_swig); ++ /* For Guile >= 2.0.12. See libguile/smob.c:clear_smobnum */ ++ swig_finalized_tag = swig_collectable_tag & ~0xff00; + } + if (ensure_smob_tag(swig_module, &swig_destroyed_tag, + "destroyed-swig-pointer", "destroyed-swig-pointer-tag")) { diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index b931db412b..61f6a8ccfe 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -22,6 +22,7 @@ #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages pcre) #:use-module (gnu packages guile) #:use-module (gnu packages boost) @@ -37,6 +38,7 @@ (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.gz")) + (patches (search-patches "swig-guile-gc.patch")) (sha256 (base32 "0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw")))) From 5fb543b3f7bf79208178429d38f2da047fc744c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:12:05 +0300 Subject: [PATCH 308/435] gnu: python-fonttools: Update to 3.30.0. * gnu/packages/python.scm (python-fonttools): Update to 3.30.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 63cf440014..56923c31c2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6072,13 +6072,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) + "1i6229ylm12klljqfg643rikzpcslqrj56qf4cydr0w1n4cnbs4m")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) From 1febc93f9b13155be7a212fcaf93d5dd181c8aea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:21:14 +0300 Subject: [PATCH 309/435] Revert "gnu: python-fonttools: Update to 3.30.0." This reverts commit 5fb543b3f7bf79208178429d38f2da047fc744c0. python2-fonttools has 2700 dependants, only the python3 version is failing. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56923c31c2..63cf440014 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6072,13 +6072,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.30.0") + (version "3.28.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "1i6229ylm12klljqfg643rikzpcslqrj56qf4cydr0w1n4cnbs4m")))) + "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) From f793b4ef96d53c548494b4b15b99a31d05c449a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:30:44 +0300 Subject: [PATCH 310/435] gnu: squashfs-tools: Fix building with glibc@2.28. * gnu/packages/compression.scm (squashfs-tools)[arguments]: Add substitution to include missing import. Return #t from all phases. --- gnu/packages/compression.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6ec08136d5..4137dca8bb 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice @@ -875,8 +875,16 @@ the LZ4 frame format.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda _ - (chdir "squashfs-tools")))))) + (lambda _ + (chdir "squashfs-tools") + #t)) + (add-after 'unpack 'fix-glibc-compatability + (lambda _ + (substitute* '("squashfs-tools/mksquashfs.c" + "squashfs-tools/unsquashfs.c") + (("") + "\n#include ")) + #t))))) (inputs `(("lz4" ,lz4) ("lzo" ,lzo) From b50d58b3445a85bf4395e2b767da10c2e3438902 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Oct 2018 21:46:09 +0300 Subject: [PATCH 311/435] gnu: sharutils: Fix bundled gnulib. * gnu/packages/compression.scm (sharutils)[source]: Add snippet to fix bundled gnulib. --- gnu/packages/compression.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4137dca8bb..44d1fd4bb5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -584,7 +584,23 @@ decompressors when faced with corrupted input.") (patches (search-patches "sharutils-CVE-2018-1000097.patch")) (sha256 (base32 - "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b")))) + "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) (inputs `(("which" ,which))) From 1d7fb035fcff87bea1caf229df576b0e29e0ea04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2018 10:25:04 +0200 Subject: [PATCH 312/435] gnu: guile-commonmark: Update to 0.1.1. * gnu/packages/guile.scm (guile-commonmark): Update to 0.1.1. [source](modules, snippet): Remove. [native-inputs]: New field. --- gnu/packages/guile.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2d4d8c3218..bf2f2a14a4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1618,7 +1618,7 @@ you send to a FIFO file.") (define-public guile-commonmark (package (name "guile-commonmark") - (version "0.1") + (version "0.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/OrangeShark/" name @@ -1626,24 +1626,12 @@ you send to a FIFO file.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "12cb5fqvvgc87f5xp0ih5az305wnjia89l5jba83d0r2p8bfy0b0")) - (modules '((guix build utils))) - (snippet - ;; Use the real effective version of Guile in directory names - ;; instead of a hard-coded "/2.0". - '(begin - (substitute* "configure" - (("ac_subst_vars='") - "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) - (substitute* "Makefile.in" - (("moddir =.*") - "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") - (("godir =.*") - "godir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) - #t)))) + "0kzclwkfijj8xka3g9kfj53y67c34ndfy84swdbw3j7y962ndxq6")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2))) + (native-inputs + `(("pkg-config" ,pkg-config))) (synopsis "CommonMark parser for Guile") (description "guile-commonmark is a library for parsing CommonMark, a fully specified From be200ef316478585059041a33d8f4287017dea5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 18:51:46 +0200 Subject: [PATCH 313/435] gnu: texlive-bin: Fix FTBFS on i686-linux. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add phase 'disable-failing-test'. --- gnu/packages/tex.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c62512b8d0..ccbdfc6f61 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -194,6 +194,14 @@ (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28: + ;; . + (substitute* "texk/web2c/omegafonts/check.test" + (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck || exit 1") + "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77")) + #t)) (add-after 'install 'postint (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let* ((out (assoc-ref outputs "out")) From 58352f269e46942c34d7ee4e29f91144576ca661 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 18 Oct 2018 02:53:32 +0800 Subject: [PATCH 314/435] build-system/haskell: Use 'strip-store-file-name'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See the discussion at . * guix/build/haskell-build-system.scm (package-name-version): Remove it. (configure): Use 'strip-store-file-name' instead of 'package-name-version'. (setup-compiler): Likewise. (make-ghc-package-database): Likewise. (register): Likewise. * gnu/packages/haskell.scm (ghc-cairo)[arguments]: Likewise. * gnu/packages/agda.scm (agda)[arguments]: Likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/agda.scm | 5 +++-- gnu/packages/haskell.scm | 4 ++-- guix/build/haskell-build-system.scm | 20 +++++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 6bb38aac4d..d2113555eb 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex ter Weele ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,6 +86,7 @@ (lambda* (#:key outputs inputs tests? (configure-flags '()) #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (name-version (strip-store-file-name out)) (input-dirs (match inputs (((_ . dir) ...) dir) @@ -95,8 +97,7 @@ `(,(string-append "--bindir=" out "/bin")) `(,(string-append "--docdir=" out - "/share/doc/" ((@@ (guix build haskell-build-system) - package-name-version) out))) + "/share/doc/" name-version)) '("--libsubdir=$compiler/$pkg-$version") '("--package-db=../package.conf.d") '("--global") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0a90ac523c..57435dca07 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10619,6 +10619,7 @@ expose it from another module in the hierarchy. (lambda* (#:key outputs inputs tests? (configure-flags '()) #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (name-version (strip-store-file-name out)) (input-dirs (match inputs (((_ . dir) ...) dir) @@ -10629,8 +10630,7 @@ expose it from another module in the hierarchy. `(,(string-append "--bindir=" out "/bin")) `(,(string-append "--docdir=" out - "/share/doc/" ((@@ (guix build haskell-build-system) - package-name-version) out))) + "/share/doc/" name-version)) '("--libsubdir=$compiler/$pkg-$version") '("--package-db=../package.conf.d") '("--global") diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 72714a29ad..7b556f6431 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +79,7 @@ and parameters ~s~%" (doc (assoc-ref outputs "doc")) (lib (assoc-ref outputs "lib")) (bin (assoc-ref outputs "bin")) + (name-version (strip-store-file-name out)) (input-dirs (match inputs (((_ . dir) ...) dir) @@ -88,7 +90,7 @@ and parameters ~s~%" `(,(string-append "--bindir=" (or bin out) "/bin")) `(,(string-append "--docdir=" (or doc out) - "/share/doc/" (package-name-version out))) + "/share/doc/" name-version)) '("--libsubdir=$compiler/$pkg-$version") `(,(string-append "--package-db=" %tmp-db-dir)) '("--global") @@ -127,12 +129,6 @@ and parameters ~s~%" "Install a given Haskell package." (run-setuphs "copy" '())) -(define (package-name-version store-dir) - "Given a store directory STORE-DIR return 'name-version' of the package." - (let* ((base (basename store-dir))) - (string-drop base - (+ 1 (string-index base #\-))))) - (define (grep rx port) "Given a regular-expression RX including a group, read from PORT until the first match and return the content of the group." @@ -147,7 +143,7 @@ first match and return the content of the group." (define* (setup-compiler #:key system inputs outputs #:allow-other-keys) "Setup the compiler environment." (let* ((haskell (assoc-ref inputs "haskell")) - (name-version (package-name-version haskell))) + (name-version (strip-store-file-name haskell))) (cond ((string-match "ghc" name-version) (make-ghc-package-database system inputs outputs)) @@ -164,6 +160,7 @@ first match and return the content of the group." (define (make-ghc-package-database system inputs outputs) "Generate the GHC package database." (let* ((haskell (assoc-ref inputs "haskell")) + (name-version (strip-store-file-name haskell)) (input-dirs (match inputs (((_ . dir) ...) dir) @@ -171,7 +168,7 @@ first match and return the content of the group." ;; Silence 'find-files' (see 'evaluate-search-paths') (conf-dirs (with-null-error-port (search-path-as-list - `(,(string-append "lib/" (package-name-version haskell))) + `(,(string-append "lib/" name-version)) input-dirs #:pattern ".*\\.conf.d$"))) (conf-files (append-map (cut find-files <> "\\.conf$") conf-dirs))) (mkdir-p %tmp-db-dir) @@ -231,9 +228,10 @@ given Haskell package." (let* ((out (assoc-ref outputs "out")) (haskell (assoc-ref inputs "haskell")) + (name-verion (strip-store-file-name haskell)) (lib (string-append out "/lib")) - (config-dir (string-append lib "/" - (package-name-version haskell) + (config-dir (string-append lib + "/" name-verion "/" name ".conf.d")) (id-rx (make-regexp "^id: *(.*)$")) (config-file (string-append out "/" name ".conf")) From 418f1b241486ef7f98fdce1e6f8e53f2e7863fd9 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 18 Oct 2018 03:08:31 +0800 Subject: [PATCH 315/435] java-utils: Use 'strip-store-file-name'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See the discussion at . * guix/build/java-utils.scm (package-name-version): Remove it. (install-javadoc): Use 'strip-store-file-name' instead of 'package-name-version'. Signed-off-by: Ludovic Courtès --- guix/build/java-utils.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 128be1edeb..8200638bee 100644 --- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,12 +24,6 @@ install-jars install-javadoc)) -;; Copied from haskell-build-system.scm -(define (package-name-version store-dir) - "Given a store directory STORE-DIR return 'name-version' of the package." - (let* ((base (basename store-dir))) - (string-drop base (+ 1 (string-index base #\-))))) - (define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) #:allow-other-keys) (apply invoke `("ant" ,target ,@make-flags))) @@ -48,8 +43,9 @@ is used in case the build.xml does not include an install target." install javadocs when this is not done by the install target." (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (name-version (strip-store-file-name out)) (docs (string-append (or (assoc-ref outputs "doc") out) - "/share/doc/" (package-name-version out) "/"))) + "/share/doc/" name-version "/"))) (mkdir-p docs) (copy-recursively apidoc-directory docs) #t))) From ecc604baf0357fa32e5e0c983193573eab3cd9d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 19:17:54 +0200 Subject: [PATCH 316/435] gnu: klick: Use scons-python2 for building. * gnu/packages/music.scm (klick)[arguments]: Add #:scons. --- gnu/packages/music.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 13a6ecc36f..1bd9972862 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -718,6 +718,7 @@ audio and video).") (build-system scons-build-system) (arguments `(#:scons-flags (list (string-append "PREFIX=" %output)) + #:scons ,scons-python2 #:tests? #f)) ;no "check" target (inputs `(("boost" ,boost) From e381ae317c054a8ac52037c3f0df72ca3c96b91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Oct 2018 21:29:51 +0200 Subject: [PATCH 317/435] gnu: python2-bz2file: Inherit arguments from python-bzfile. * gnu/packages/python.scm (python-bz2file)[properties]: Remove field. (python2-bz2file): Use PACKAGE-WITH-PYTHON2. --- gnu/packages/python.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 63cf440014..c2987207f4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8806,23 +8806,10 @@ LDFLAGS and parse the output to build extensions with setup.py.") files. It contains a drop-in replacement for the I/O interface in the standard library's @code{bz2} module, including features from the latest development version of CPython that are not available in older releases.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-bz2file)))))) + (license license:asl2.0))) (define-public python2-bz2file - (let ((base (package-with-python2 - (strip-python2-variant python-bz2file)))) - (package - (inherit base) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - ;; 'python setup.py test' does not work as of 0.98. - ;; There is only the one test file, so we run it directly. - (replace 'check - (lambda _ (zero? (system* "python" - "test_bz2file.py")))))))))) + (package-with-python2 python-bz2file)) (define-public python-future (package From 3a23036a0a8fb51b56ec88a06c64bf546f97032b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:30:04 +0200 Subject: [PATCH 318/435] gnu: python-datrie: Fix FTBFS with Python 3.7. * gnu/packages/python.scm (python-datrie)[arguments]: Add phase 'cythonize'. --- gnu/packages/python.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 99b214f3bc..a1718c73b1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5203,6 +5203,14 @@ of the structure, dynamics, and functions of complex networks.") (base32 "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'build 'cythonize + (lambda _ + ;; Regenerate Cython classes to solve ABI issues with Python + ;; 3.7.0. See . + (invoke "cython" "src/datrie.pyx" "src/cdatrie.pxd" + "src/stdio_ext.pxd" "-a")))))) (native-inputs `(("python-cython" ,python-cython) ("python-hypothesis" ,python-hypothesis) From 4cdbffdc2fa5f90b7c0231d7d68de8f2d4a4dbed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Oct 2018 19:37:01 +0200 Subject: [PATCH 319/435] gnu: python-stem: Update to 1.7.0. * gnu/packages/python.scm (python-stem): Update to 1.7.0. [arguments]: Remove obsolete phase. [native-inputs]: Change PYTHON-PEP8 to PYTHON-PYCODESTYLE. --- gnu/packages/python.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1718c73b1..66d587cc52 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9763,32 +9763,25 @@ etc.") (define-public python-stem (package (name "python-stem") - (version "1.6.0") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "stem" version)) (sha256 (base32 - "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp")))) + "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'fix-test-environment - (lambda _ - ;; Fixes: FileNotFoundError: [Errno 2] No such file or directory: - ;; '/tmp/guix-build-python-stem-1.6.0.drv-0/stem-1.6.0/.gitignore'. - (with-output-to-file ".gitignore" - (lambda _ (format #t "%"))) - #t)) (replace 'check (lambda _ (invoke "./run_tests.py" "--unit") #t))))) (native-inputs `(("python-mock" ,python-mock) - ("python-pep8" ,python-pep8) + ("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes))) (home-page "https://stem.torproject.org/") (synopsis From 22ce8b56f25b90b40ded1d29ea488d2f1336f24c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 01:32:47 +0200 Subject: [PATCH 320/435] gnu: ganv: Use python2 for building. * gnu/packages/gtk.scm (ganv)[arguments]: Set #:python. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cec10504c5..b553fa19cd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -304,6 +304,7 @@ functions which were removed.") (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))) + #:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0. #:tests? #f)) ; no check target (inputs `(("gtk" ,gtk+-2) From 78da6977c738824d730803cb918137d5fe6cbbce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 01:35:34 +0200 Subject: [PATCH 321/435] gnu: suil: Use python2 for building. * gnu/packages/audio.scm (suil)[arguments]: Set #:python. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b664712f7a..4185923a81 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2360,6 +2360,7 @@ the Turtle syntax.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + #:python ,python-2 ;XXX: The bundled waf does not work with Python 3.7.0. #:configure-flags '("CXXFLAGS=-std=gnu++11"))) (inputs From 5176795d22860c18015e36b7a9d3b8729b6729f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 13:56:42 +0200 Subject: [PATCH 322/435] gnu: Add python-pympler. * gnu/packages/python.scm (python-pympler, python2-pympler): New public variables. --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 66d587cc52..42097b889c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2177,6 +2177,42 @@ easier to build concurrent applications.") (define-public python2-pykka (package-with-python2 python-pykka)) +(define-public python-pympler + (package + (name "python-pympler") + (home-page "https://pythonhosted.org/Pympler/") + (version "0.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "Pympler" version)) + (sha256 + (base32 + "03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "python" "setup.py" "test")))))) + (synopsis "Measure, monitor and analyze memory behavior") + (description + "Pympler is a development tool to measure, monitor and analyze +the memory behavior of Python objects in a running Python application. + +By pympling a Python application, detailed insight in the size and the +lifetime of Python objects can be obtained. Undesirable or unexpected +runtime behavior like memory bloat and other @samp{pymples} can easily +be identified. + +A web profiling frontend exposes process statistics, garbage +visualisation and class tracker statistics.") + (license license:asl2.0))) + +(define-public python2-pympler + (package-with-python2 python-pympler)) + (define-public python-itsdangerous (package (name "python-itsdangerous") From 0c8e255549760e83c4acf08747047449ec952113 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Oct 2018 16:56:57 +0200 Subject: [PATCH 323/435] gnu: python-attrs: Update to 18.2.0. * gnu/packages/python.scm (python-attrs): Update to 18.2.0. [arguments]: New field. [native-inputs]: Add PYTHON-PYMPLER. (python-attrs-bootstrap): Stay on version 17.4.0. --- gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 42097b889c..59ef5c2ca3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11122,17 +11122,36 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "17.4.0") + (version "18.2.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w")))) + "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh")))) (build-system python-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append + cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) + (invoke "python" "-m" "pytest"))))))) (native-inputs `(("python-coverage" ,python-coverage) ("python-hypothesis" ,python-hypothesis) + ("python-pympler" ,python-pympler) ("python-pytest" ,python-pytest) ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) @@ -11151,6 +11170,15 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") + ;; Keep this on a fixed version so python-attrs can be updated without + ;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle. + (version "17.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "attrs" version)) + (sha256 + (base32 + "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w")))) (native-inputs `()) (arguments `(#:tests? #f)))) From 545da9fd5f6c5b55f1bdc1f735ebdf6ba71495a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Oct 2018 16:34:23 +0200 Subject: [PATCH 324/435] gnu: python-flake8: Update to 3.6.0. * gnu/packages/check.scm (python-hypothesis)[native-inputs]: Change PYTHON-FLAKE8 to PYTHON-FLAKE8-3.5. * gnu/packages/python.scm (python-flake8, python2-flake8): Rename to ... (python-flake8-3.5, python2-flake8-3.5): ... this. (python-flake8, python2-flake8): New public variables. --- gnu/packages/check.scm | 3 ++- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1ae6355a93..fc45c0551a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1425,7 +1425,8 @@ normally the case.") "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b")))) (build-system python-build-system) (native-inputs - `(("python-flake8" ,python-flake8) + `(;; FIXME: Change to python-flake8 in the next rebuild cycle. + ("python-flake8" ,python-flake8-3.5) ("python-pytest" ,python-pytest-bootstrap))) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 59ef5c2ca3..a0c4669040 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5826,7 +5826,9 @@ complexity of Python source code.") (define-public python2-pyflakes-0.8.1 (package-with-python2 python-pyflakes-0.8.1)) -(define-public python-flake8 +;; This package is used by hypothesis which has thousands of dependent packages. +;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle. +(define-public python-flake8-3.5 (package (name "python-flake8") (version "3.5.0") @@ -5872,17 +5874,45 @@ PEP8_PLUGIN('break_before_binary_operator'),")) "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") - (properties `((python2-variant . ,(delay python2-flake8)))) + (properties `((python2-variant . ,(delay python2-flake8-3.5)))) (license license:expat))) -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) +(define-public python2-flake8-3.5 + (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5)))) (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) +;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need +;; this newer version. Keep it as a separate variable for now to avoid +;; rebuilding "python-hypothesis"; this should be removed in the next +;; rebuild cycle. +(define-public python-flake8 + (package + (inherit python-flake8-3.5) + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) + (arguments + (substitute-keyword-arguments (package-arguments python-flake8-3.5) + ((#:phases phases) + `(modify-phases ,phases + (delete 'delete-broken-test) + (delete 'fix-problem-with-pycodestyle))))) + (properties `((python2-variant . ,(delay python2-flake8)))))) + +(define-public python2-flake8 + (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) + (package (inherit base) + (propagated-inputs + (package-propagated-inputs python2-flake8-3.5))))) + ;; python-hacking requires flake8 <2.6.0. (define-public python-flake8-2.5 (package From dd741059251ea10993e1e8b8d5f443c752a5c9ce Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 10 Oct 2018 22:26:39 +0200 Subject: [PATCH 325/435] gnu: Add openjdk9. * gnu/packages/java.scm (openjdk9): New variable. --- gnu/packages/java.scm | 136 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f6d72edeea..e846465b2c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages cpio) #:use-module (gnu packages cups) #:use-module (gnu packages compression) + #:use-module (gnu packages elf) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -1672,6 +1673,141 @@ new Date();")) '("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop" "jdk-drop" "langtools-drop" "hotspot-drop"))))))) +(define-public openjdk9 + (package + (name "openjdk") + (version "9.181") + (source (origin + (method url-fetch) + (uri "https://hg.openjdk.java.net/jdk/jdk/archive/3cc80be736f2.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.bin$")) + (for-each delete-file (find-files "." ".*.exe$")) + (for-each delete-file (find-files "." ".*.jar$")) + #t)))) + (build-system gnu-build-system) + (outputs '("out" "jdk" "doc")) + (arguments + `(#:tests? #f; require jtreg + #:imported-modules + ((guix build syscalls) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'fix-java-shebangs + (lambda _ + ;; This file was "fixed" by patch-source-shebangs, but it requires + ;; this exact first line. + (substitute* "jdk/make/data/blacklistedcertsconverter/blacklisted.certs.pem" + (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; TODO: unbundle libpng and lcms + (invoke "bash" "./configure" + (string-append "--with-freetype=" (assoc-ref inputs "freetype")) + "--disable-freetype-bundling" + "--disable-warnings-as-errors" + "--disable-hotspot-gtest" + "--with-giflib=system" + "--with-libjpeg=system" + (string-append "--prefix=" (assoc-ref outputs "out"))) + #t)) + (replace 'build + (lambda _ + (with-output-to-file ".src-rev" + (lambda _ + (display ,version))) + (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") + (invoke "make" "all") + #t)) + ;; Some of the libraries in the lib/ folder link to libjvm.so. + ;; But that shared object is located in the server/ folder, so it + ;; cannot be found. This phase creates a symbolic link in the + ;; lib/ folder so that the other libraries can find it. + ;; + ;; See: + ;; https://lists.gnu.org/archive/html/guix-devel/2017-10/msg00169.html + ;; + ;; FIXME: Find the bug in the build system, so that this symlink is + ;; not needed. + (add-after 'install 'install-libjvm + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((lib-out (string-append (assoc-ref outputs "out") + "/lib")) + (lib-jdk (string-append (assoc-ref outputs "jdk") + "/lib"))) + (symlink (string-append lib-jdk "/server/libjvm.so") + (string-append lib-jdk "/libjvm.so")) + (symlink (string-append lib-out "/server/libjvm.so") + (string-append lib-out "/libjvm.so"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (jdk (assoc-ref outputs "jdk")) + (doc (assoc-ref outputs "doc")) + (images (car (find-files "build" ".*-server-release" + #:directories? #t)))) + (copy-recursively (string-append images "/images/jdk") jdk) + (copy-recursively (string-append images "/images/jre") out) + (copy-recursively (string-append images "/images/docs") doc)) + #t)) + (add-after 'install 'strip-zip-timestamps + (lambda* (#:key outputs #:allow-other-keys) + (use-modules (guix build syscalls)) + (for-each (lambda (zip) + (let ((dir (mkdtemp! "zip-contents.XXXXXX"))) + (with-directory-excursion dir + (invoke "unzip" zip)) + (delete-file zip) + (for-each (lambda (file) + (let ((s (lstat file))) + (unless (eq? (stat:type s) 'symlink) + (format #t "reset ~a~%" file) + (utime file 0 0 0 0)))) + (find-files dir #:directories? #t)) + (with-directory-excursion dir + (let ((files (find-files "." ".*" #:directories? #t))) + (apply invoke "zip" "-0" "-X" zip files))))) + (find-files (assoc-ref outputs "doc") ".*.zip$")) + #t))))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libelf" ,libelf) + ("libjpeg" ,libjpeg) + ("libice" ,libice) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("icedtea-8" ,icedtea-8) + ("icedtea-8:jdk" ,icedtea-8 "jdk") + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk9/") + (synopsis "Java development kit") + (description + "This package provides the Java development kit OpenJDK.") + (license license:gpl2+))) + (define-public icedtea icedtea-8) From 16b89ecc1f2f1f9651d119518c0e752b01f0f07b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 10 Oct 2018 22:29:50 +0200 Subject: [PATCH 326/435] gnu: Add openjdk10. * gnu/packages/java.scm (openjdk10): New variable. --- gnu/packages/java.scm | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e846465b2c..51baade8fd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1808,6 +1808,55 @@ new Date();")) "This package provides the Java development kit OpenJDK.") (license license:gpl2+))) +(define-public openjdk10 + (package + (inherit openjdk9) + (name "openjdk") + (version "10.46") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk/archive/6fa770f9f8ab.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.bin$")) + (for-each delete-file (find-files "." ".*.exe$")) + (for-each delete-file (find-files "." ".*.jar$")) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments openjdk9) + ((#:phases phases) + `(modify-phases ,phases + (replace 'fix-java-shebangs + (lambda _ + ;; This file was "fixed" by patch-source-shebangs, but it requires + ;; this exact first line. + (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" + (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "bash" "./configure" + (string-append "--with-freetype=" (assoc-ref inputs "freetype")) + "--disable-freetype-bundling" + "--disable-warnings-as-errors" + "--disable-hotspot-gtest" + "--with-giflib=system" + "--with-libjpeg=system" + "--with-native-debug-symbols=zipped" + (string-append "--prefix=" (assoc-ref outputs "out"))) + #t)))))) + (native-inputs + `(("openjdk9" ,openjdk9) + ("openjdk9:jdk" ,openjdk9 "jdk") + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))))) + (define-public icedtea icedtea-8) From 3bd83e6db2982d0b419945dd6ea4174d1a880c6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Nov 2018 23:24:19 +0100 Subject: [PATCH 327/435] gnu: qtbase: Remove obsolete patch. This patch is no longer needed since 7930cfc98923eda64ec4a37d56b19f96f86f5f59 was merged to core-updates. * gnu/packages/patches/qtbase-glibc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/qt.scm (qtbase)[source](patches): Drop it. --- gnu/local.mk | 1 - .../patches/qtbase-glibc-compat.patch | 50 ------------------- gnu/packages/qt.scm | 3 +- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4f1d6306b1..93bf44ac9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,7 +1097,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qt4-ldflags.patch \ - %D%/packages/patches/qtbase-glibc-compat.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-glibc-compat.patch b/gnu/packages/patches/qtbase-glibc-compat.patch deleted file mode 100644 index 15a2540b3a..0000000000 --- a/gnu/packages/patches/qtbase-glibc-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix qmake build with glibc 2.28. - -Taken from upstream: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 3469ebe5e6..c5585ea32a 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -98,10 +98,18 @@ - #define QT_NO_QOBJECT - #define QT_FEATURE_process -1 - #define QT_FEATURE_regularexpression -1 --#define QT_FEATURE_renameat2 -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+#endif - #define QT_FEATURE_sharedmemory -1 - #define QT_FEATURE_slog2 -1 --#define QT_FEATURE_statx -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_statx -1 -+#endif - #define QT_FEATURE_syslog -1 - #define QT_NO_SYSTEMLOCALE - #define QT_FEATURE_systemsemaphore -1 -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 0c9cdb8667..deb4a9f220 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); - # include - # include - # include --# include - - // in case linux/fs.h is too old and doesn't define it: - #ifndef FICLONE -@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp - # endif - - # if !QT_CONFIG(statx) && defined(SYS_statx) -+# include - static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) - { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } - # elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1dd21101b2..cffebc7bff 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -508,8 +508,7 @@ system, and the core design of Django is reused in Grantlee.") (base32 "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-glibc-compat.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 From 8dd36658832b405ee8c04d29b96381519920ed91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:24:33 +0200 Subject: [PATCH 328/435] gnu: rocksdb: Don't use unstable tarball. * gnu/packages/databases.scm (rocksdb)[source]: Use GIT-FETCH. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e1fa6b783f..1a3781b7df 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -990,13 +990,14 @@ types are supported, as is encryption.") (name "rocksdb") (version "5.12.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/rocksdb" - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/rocksdb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jcwgsjhk4hdfr2wf549blkgb89vwcdb5i2ahhqs6zf3mm20i3bf")) + "0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) (modules '((guix build utils))) (snippet '(begin From e2568df74e46b6ab5b9d63a78dd805f8018848ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:27:31 +0200 Subject: [PATCH 329/435] gnu: rocksdb: Update to 5.15.10. * gnu/packages/databases.scm (rocksdb): Update to 5.15.10. --- 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 1a3781b7df..5fc3607b76 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -988,7 +988,7 @@ types are supported, as is encryption.") (define-public rocksdb (package (name "rocksdb") - (version "5.12.4") + (version "5.15.10") (source (origin (method git-fetch) (uri (git-reference @@ -997,7 +997,7 @@ types are supported, as is encryption.") (file-name (git-file-name name version)) (sha256 (base32 - "0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) + "0q26frbj9pykarcfa0yxgwncxlvsqhjkby0jrbfs1a8srja688r4")) (modules '((guix build utils))) (snippet '(begin From 1badc85068ee0be2a028c1b94a3dd285901bc391 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 18:41:50 +0200 Subject: [PATCH 330/435] gnu: ceph: Update to 13.2.2. * gnu/packages/patches/ceph-skip-unittest_blockdev.patch: Adjust for 13.2.2. * gnu/packages/patches/ceph-rocksdb-compat.patch: Delete file. * gnu/packages/patches/ceph-detect-rocksdb.patch, gnu/packages/patches/ceph-volume-respect-PATH.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/storage.scm (ceph): Update to 13.2.2. [source]: Don't remove src/dpdk, which has been moved to src/spdk/dpdk and is purged elsewhere. Drop bundled rapidjson. Adjust patch list. [arguments]: Add "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" and "-DWITH_SPDK=OFF" to #:configure-flags. Drop obsolete "-DWITH_EMBEDDED". Add workaround for . Remove obsolete test substitution. Rework 'wrap-python-script' to be less verbose and wrap more scripts. [native-inputs]: Add GCC-7. [inputs]: Add OATH-TOOLKIT, RAPIDJSON and PYTHON2-SIX. --- gnu/local.mk | 3 +- .../patches/ceph-detect-rocksdb.patch | 24 +++++++ .../patches/ceph-rocksdb-compat.patch | 63 ------------------- .../patches/ceph-skip-unittest_blockdev.patch | 20 +++--- .../patches/ceph-volume-respect-PATH.patch | 22 +++++++ gnu/packages/storage.scm | 43 ++++++++----- 6 files changed, 82 insertions(+), 93 deletions(-) create mode 100644 gnu/packages/patches/ceph-detect-rocksdb.patch delete mode 100644 gnu/packages/patches/ceph-rocksdb-compat.patch create mode 100644 gnu/packages/patches/ceph-volume-respect-PATH.patch diff --git a/gnu/local.mk b/gnu/local.mk index 93bf44ac9b..86f081f7cf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -608,10 +608,11 @@ dist_patch_DATA = \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ + %D%/packages/patches/ceph-detect-rocksdb.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/ceph-rocksdb-compat.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ + %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ %D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \ diff --git a/gnu/packages/patches/ceph-detect-rocksdb.patch b/gnu/packages/patches/ceph-detect-rocksdb.patch new file mode 100644 index 0000000000..badad6d1b9 --- /dev/null +++ b/gnu/packages/patches/ceph-detect-rocksdb.patch @@ -0,0 +1,24 @@ +Help the build system find system RocksDB. + +Taken from this upstream commit: +https://github.com/ceph/ceph/commit/2ac26bd0e01fd6c82bd59936cf25c25173f7775a + +diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake +index f8369f73fc..5926647348 100644 +--- a/cmake/modules/Findrocksdb.cmake ++++ b/cmake/modules/Findrocksdb.cmake +@@ -15,11 +15,11 @@ find_library(ROCKSDB_LIBRARIES rocksdb) + + if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h") + foreach(ver "MAJOR" "MINOR" "PATCH") +- file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE ++ file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE + REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$" +- "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}") +- unset(${ROCKDB_VER_${ver}_LINE}) ++ "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}") ++ unset(${ROCKSDB_VER_${ver}_LINE}) + endforeach() + set(ROCKSDB_VERSION_STRING + "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}") diff --git a/gnu/packages/patches/ceph-rocksdb-compat.patch b/gnu/packages/patches/ceph-rocksdb-compat.patch deleted file mode 100644 index 1a3c6b0b23..0000000000 --- a/gnu/packages/patches/ceph-rocksdb-compat.patch +++ /dev/null @@ -1,63 +0,0 @@ -Fix compatibility with newer versions of RocksDB. - -Adapted from this upstream patch, with some additional changes for 12.2: -https://github.com/ceph/ceph/commit/9d73a7121fdb1ae87cb1aa6f7d9d7a13f329ae68 - -diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc -index 8660afe1886d..bc0de79e23cb 100644 ---- a/src/kv/RocksDBStore.cc -+++ b/src/kv/RocksDBStore.cc -@@ -505,7 +505,7 @@ - // considering performance overhead, default is disabled - if (g_conf->rocksdb_perf) { - rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); -- rocksdb::perf_context.Reset(); -+ rocksdb::get_perf_context()->Reset(); - } - - RocksDBTransactionImpl * _t = -@@ -532,13 +532,13 @@ - utime_t write_wal_time; - utime_t write_pre_and_post_process_time; - write_wal_time.set_from_double( -- static_cast(rocksdb::perf_context.write_wal_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); - write_memtable_time.set_from_double( -- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); - write_delay_time.set_from_double( -- static_cast(rocksdb::perf_context.write_delay_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); - write_pre_and_post_process_time.set_from_double( -- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); - logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); - logger->tinc(l_rocksdb_write_delay_time, write_delay_time); - logger->tinc(l_rocksdb_write_wal_time, write_wal_time); -@@ -558,7 +558,7 @@ - // considering performance overhead, default is disabled - if (g_conf->rocksdb_perf) { - rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex); -- rocksdb::perf_context.Reset(); -+ rocksdb::get_perf_context()->Reset(); - } - - RocksDBTransactionImpl * _t = -@@ -586,13 +586,13 @@ - utime_t write_wal_time; - utime_t write_pre_and_post_process_time; - write_wal_time.set_from_double( -- static_cast(rocksdb::perf_context.write_wal_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000); - write_memtable_time.set_from_double( -- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000); - write_delay_time.set_from_double( -- static_cast(rocksdb::perf_context.write_delay_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000); - write_pre_and_post_process_time.set_from_double( -- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000); -+ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000); - logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time); - logger->tinc(l_rocksdb_write_delay_time, write_delay_time); - logger->tinc(l_rocksdb_write_wal_time, write_wal_time); diff --git a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch index 43b9984862..407bd93278 100644 --- a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch +++ b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch @@ -4,25 +4,21 @@ This test tries to walk a sysfs path and hits a null pointer exception. Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00> diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt -index 5172663898..ac84085eaa 100644 --- a/src/test/common/CMakeLists.txt +++ b/src/test/common/CMakeLists.txt -@@ -12,15 +12,6 @@ target_link_libraries(get_command_descriptions +@@ -12,15 +12,6 @@ ${CMAKE_DL_LIBS} ) -if(HAVE_BLKID) --# unittest_blkdev --add_executable(unittest_blkdev -- test_blkdev.cc -- ) --add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev) --target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES}) --endif(HAVE_BLKID) +- # unittest_blkdev +- add_executable(unittest_blkdev +- test_blkdev.cc +- ) +- add_ceph_unittest(unittest_blkdev) +- target_link_libraries(unittest_blkdev ceph-common ${BLKID_LIBRARIES}) +-endif() - # unittest_bloom_filter add_executable(unittest_bloom_filter test_bloom_filter.cc --- -2.11.1 - diff --git a/gnu/packages/patches/ceph-volume-respect-PATH.patch b/gnu/packages/patches/ceph-volume-respect-PATH.patch new file mode 100644 index 0000000000..08a9a15ddd --- /dev/null +++ b/gnu/packages/patches/ceph-volume-respect-PATH.patch @@ -0,0 +1,22 @@ +Look for required tools in $PATH instead of just a handful locations. + +diff --git a/src/ceph-volume/ceph_volume/util/system.py b/src/ceph-volume/ceph_volume/util/system.py +index b637f023a4..14516e1c65 100644 +--- a/src/ceph-volume/ceph_volume/util/system.py ++++ b/src/ceph-volume/ceph_volume/util/system.py +@@ -33,14 +33,7 @@ def generate_uuid(): + + def which(executable): + """find the location of an executable""" +- locations = ( +- '/usr/local/bin', +- '/bin', +- '/usr/bin', +- '/usr/local/sbin', +- '/usr/sbin', +- '/sbin', +- ) ++ locations = os.getenv('PATH').split(':') + + for location in locations: + executable_path = os.path.join(location, executable) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 11f6f9d7e8..5051ccd986 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages assembly) + #:use-module (gnu packages authentication) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -35,6 +36,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages disk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gperf) #:use-module (gnu packages jemalloc) @@ -51,18 +53,19 @@ (define-public ceph (package (name "ceph") - (version "12.2.5") + (version "13.2.2") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "1ydc3mfvc0vpnpfnfmissvsrsj4jyxgzc2pcl1a4vdr3bwkcglp3")) + "0h483n9iy0fkbqrhf7k0dzspwdpcaswkjwmc5n5c600fr6s1v9pk")) (patches (search-patches "ceph-skip-unittest_blockdev.patch" "ceph-skip-collect-sys-info-test.patch" - "ceph-rocksdb-compat.patch" + "ceph-detect-rocksdb.patch" + "ceph-volume-respect-PATH.patch" "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) (snippet @@ -76,7 +79,7 @@ ;"src/zstd" ;"src/civetweb" "src/test/downloads" - "src/dpdk" + "src/rapidjson" "src/spdk" "src/rocksdb" "src/boost")) @@ -100,13 +103,14 @@ (assoc-ref %build-inputs "keyutils") "/include") "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" "-DENABLE_SHARED=ON" - "-DWITH_EMBEDDED=OFF" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_PYTHON3=ON" ;; TODO: Enable these when available in Guix. + "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ;requires node + nodeenv "-DWITH_BABELTRACE=OFF" "-DWITH_LTTNG=OFF" + "-DWITH_SPDK=OFF" "-DWITH_XFS=OFF" "-DWITH_XIO=OFF" ;; Use jemalloc instead of tcmalloc. @@ -184,9 +188,6 @@ ;; /tmp/ceph-disk-virtualenv/bin/ceph-disk, but somehow ;; src/ceph-disk/CMakeLists.txt fails to create it. (substitute* "src/test/CMakeLists.txt" - ;; FIXME: "create cannot load compressor of type zlib" - ;; "libceph_zlib.so: undefined symbol: isal_deflate" - (("^add_subdirectory\\(compressor\\)") "") ;; FIXME: These tests fails because `ceph-disk' ;; is not available. (("^add_ceph_test\\(test-ceph-helpers\\.sh.*$") "\n") @@ -235,6 +236,11 @@ (("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n") (("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n")) #t))) + (add-before 'configure 'gcc-workaround + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)) (add-before 'check 'set-check-environment (lambda _ ;; Run tests in parallel. @@ -262,28 +268,28 @@ (add-after 'install 'wrap-python-scripts (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (ceph (string-append out "/bin/ceph")) - (ceph-disk (string-append out "/bin/ceph-disk")) - (ceph-detect-init (string-append - out "/bin/ceph-detect-init")) - + (scripts '("ceph" "ceph-mgr" "ceph-volume" + "ceph-detect-init" + "ceph-disk")) ;deprecated (prettytable (assoc-ref inputs "python2-prettytable")) - + (six (assoc-ref inputs "python2-six")) (sitedir (lambda (package) (string-append package "/lib/python2.7/site-packages"))) (PYTHONPATH (string-append (sitedir out) ":" + (sitedir six) ":" (sitedir prettytable)))) (for-each (lambda (executable) - (wrap-program executable + (wrap-program (string-append out "/bin/" executable) `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) - (list ceph ceph-disk ceph-detect-init)) + scripts) #t)))))) (outputs '("out" "lib")) (native-inputs - `(("gperf" ,gperf) + `(("gcc" ,gcc-7) ;7 or later is required + ("gperf" ,gperf) ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-sphinx" ,python-sphinx) @@ -329,13 +335,16 @@ ("libatomic-ops" ,libatomic-ops) ("lua" ,lua) ("lz4" ,lz4) + ("oath-toolkit" ,oath-toolkit) ("openldap" ,openldap) ("openssl" ,openssl) ("nss" ,nss) ("parted" ,parted) ("python@2" ,python-2) ("python2-prettytable" ,python2-prettytable) ;used by ceph_daemon.py + ("python2-six" ,python2-six) ;for ceph-mgr + plugins ("python@3" ,python-3) + ("rapidjson" ,rapidjson) ("rocksdb" ,rocksdb) ("snappy" ,snappy) ("udev" ,eudev) From 8754ea483dbdac7eef8e885d6bd8c28b4a8a5373 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:26:09 +0200 Subject: [PATCH 331/435] gnu: f2fs-tools: Update to 1.11.0. * gnu/packages/linux.scm (f2fs-tools): Update to 1.11.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d4ea542514..02d30bacf4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3402,7 +3402,7 @@ disks and SD cards. This package provides the userland utilities.") (package (inherit f2fs-tools-1.7) (name "f2fs-tools") - (version "1.10.0") + (version "1.11.0") (source (origin (method url-fetch) (uri (string-append @@ -3410,7 +3410,7 @@ disks and SD cards. This package provides the userland utilities.") "/f2fs-tools.git/snapshot/" name "-" version ".tar.gz")) (sha256 (base32 - "05ikaim0qq3dx9x3sp43ralwz43r3b0viv62n99kabp0vf3b0hg8")))) + "1qvr3hcic1vzfmyl7c0gnjxfsw8zjaadm66y337h49chv9yaq5mr")))) (inputs `(("libuuid" ,util-linux))))) From 2529c8381f622b78b02e53a4e95dd6ad65b1f8e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:57:26 +0200 Subject: [PATCH 332/435] gnu: dvd+rw-tools: Fix building with glibc@2.28. * gnu/packages/cdrom.scm (dvd+rw-tools)[arguments]: Add custom phase to add missing import. --- gnu/packages/cdrom.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index d8dc9ee6f9..992c204d2f 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -291,6 +291,15 @@ images.") `(#:tests? #f ; No tests. #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-glibc-compatability + (lambda* (#:key inputs #:allow-other-keys) + ;; We use sed --in-place because substitute* cannot handle the + ;; character encoding used by growisofs.c. + (invoke "sed" "-i" "-e" + (string-append + "s,," + "\\\n#include ,") + "growisofs.c"))) (replace 'configure (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) (add-before 'build 'embed-mkisofs From efe0a4a2a7ece13c855a1f316ad49bcdbfa1596f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 19:58:28 +0200 Subject: [PATCH 333/435] gnu: dvd+rw-tools: Use invoke. * gnu/packages/cdrom.scm (dvd+rw-tools): Use 'invoke'. --- gnu/packages/cdrom.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 992c204d2f..ccb276607a 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -303,14 +303,14 @@ images.") (replace 'configure (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) (add-before 'build 'embed-mkisofs - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) ;; We use sed --in-place because substitute* cannot handle the ;; character encoding used by growisofs.c. - (zero? (system* "sed" "-i" "-e" - (string-append - "s,\"mkisofs\"," - "\"" (which "mkisofs") "\",") - "growisofs.c"))))))) + (invoke "sed" "-i" "-e" + (string-append + "s,\"mkisofs\"," + "\"" (which "mkisofs") "\",") + "growisofs.c")))))) (home-page "http://fy.chalmers.se/~appro/linux/DVD+RW/") (synopsis "DVD and Blu-ray Disc burning tools") (description "dvd+rw-tools, mostly known for its command From f268b744b84734b374a15feae1f02b9f2c4085c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:07:48 +0200 Subject: [PATCH 334/435] gnu: lbzip2: Fix building with glibc@2.28. * gnu/packages/compression.scm (lbzip2)[source]: Add snippet to patch bundled gnulib for glibc@2.28. --- gnu/packages/compression.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7249cf775c..41289ad494 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -363,7 +363,23 @@ decompression.") version ".tar.gz")) (sha256 (base32 - "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6")))) + "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) (synopsis "Parallel bzip2 compression utility") (description From 9829e0699b6b0373c1742393f18db261a6ae67a8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:13:20 +0200 Subject: [PATCH 335/435] gnu: lbzip2: Remove false comment. This is a follow-up to f268b744b84734b374a15feae1f02b9f2c4085c7. * gnu/packages/compression.scm (lbzip2)[source]: This snippet is, in fact, a snippet. --- gnu/packages/compression.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 41289ad494..aa47fefd8a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -367,9 +367,6 @@ decompression.") (modules '((guix build utils))) (snippet '(begin - ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. - ;; "m4-gnulib-libio.patch". This is a phase rather than patch - ;; or snippet to work around . (substitute* (find-files "lib" "\\.c$") (("#if defined _IO_ftrylockfile") "#if defined _IO_EOF_SEEN")) From 211db9caf7ffdaa9f2abc7d6216f239f96312545 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:14:36 +0200 Subject: [PATCH 336/435] gnu: sharutils: Remove false comment. This is a follow-up to b50d58b3445a85bf4395e2b767da10c2e3438902. * gnu/packages/compression.scm (sharutils)[source]: This snippet is, in fact, a snippet. --- gnu/packages/compression.scm | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index aa47fefd8a..5b09cb584e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -598,22 +598,19 @@ decompressors when faced with corrupted input.") (sha256 (base32 "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. - ;; "m4-gnulib-libio.patch". This is a phase rather than patch - ;; or snippet to work around . - (substitute* (find-files "lib" "\\.c$") - (("#if defined _IO_ftrylockfile") - "#if defined _IO_EOF_SEEN")) - (substitute* "lib/stdio-impl.h" - (("^/\\* BSD stdio derived implementations") - (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" - "# define _IO_IN_BACKUP 0x100\n" - "#endif\n\n" - "/* BSD stdio derived implementations"))) - #t)))) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) (inputs `(("which" ,which))) From 1de2937283b3f19abf50af77f955a5dc4313755a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 20:18:08 +0200 Subject: [PATCH 337/435] gnu: idutils: Fix building with glibc@2.28. * gnu/packages/idutils.scm (idutils)[source]: Add snippet to patch bundled gnulib for glibc@2.28. --- gnu/packages/idutils.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index abab0c16bf..81715591b4 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès +;;; Copyright © 208 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,20 @@ (sha256 (base32 "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1")) - (patches (search-patches "diffutils-gets-undeclared.patch")))) + (patches (search-patches "diffutils-gets-undeclared.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) (home-page "https://www.gnu.org/software/idutils/") From c1ab1590854e4a1af2436c0c60b8dd570b219598 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 21:48:26 +0200 Subject: [PATCH 338/435] gnu: perl-autovivification: Update to 0.18. * gnu/packages/perl.scm (perl-autovivification): Update to 0.18. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cadef602e4..d6ea360b8e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -327,7 +327,7 @@ sometimes even without using a single syscall.") (define-public perl-autovivification (package (name "perl-autovivification") - (version "0.16") + (version "0.18") (source (origin (method url-fetch) @@ -335,7 +335,7 @@ sometimes even without using a single syscall.") "autovivification-" version ".tar.gz")) (sha256 (base32 - "1422kw9fknv7rbjkgdfflg1q3mb69d3yryszp38dn0bgzkqhwkc1")))) + "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/autovivification") (synopsis "Lexically disable autovivification") From 1a392ee7aed74e345f5263063fdde9a739082af4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Nov 2018 22:34:56 +0200 Subject: [PATCH 339/435] gnu: nfs-utils: Fix building with glibc@2.28. * gnu/packages/nfs.scm (nfs-utils)[arguments]: Add custom phase to fix building with glibc@2.28. --- gnu/packages/nfs.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index f6bb5b3b71..bdb36d272b 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,13 @@ ,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-glibc-compatability + (lambda _ + (substitute* '("utils/blkmapd/device-discovery.c" + "utils/blkmapd/dm-device.c") + (("") + "\n#include ")) + #t)) (add-before 'configure 'adjust-command-file-names (lambda _ ;; Remove assumptions of FHS from start-statd script From 5528b8e7885834e80e41fe876b9c501c7d95bc6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:48:18 +0200 Subject: [PATCH 340/435] gnu: tvtime: Fix building with glibc@2.28. * gnu/packages/tvtime.scm (tvtime)[arguments]: Add custom phase to add missing import. --- gnu/packages/tv.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/tv.scm b/gnu/packages/tv.scm index ef67ad37f2..2196162956 100644 --- a/gnu/packages/tv.scm +++ b/gnu/packages/tv.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018 Alex Kost +;;; Copyright © 208 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,15 @@ (base32 "1367rl3n6qxwf30lqyz234zpb43s9xjhig3hrvbg7cbqcl8g4fs0")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-glibc-compatability + (lambda _ + (substitute* "src/get_media_devices.c" + (("") + "\n#include ")) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("libx11" ,libx11) From 01029e20430c54333bdc50d2b6db8fa5f389f331 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:55:28 +0200 Subject: [PATCH 341/435] gnu: bitshuffle: Update to 0.3.5. * gnu/packages/compression.scm (bitshuffle): Update to 0.3.5. [source]: Add snippet to remove cythonized source files. --- gnu/packages/compression.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5b09cb584e..d24f48cd2c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1194,13 +1194,20 @@ well as bzip2.") (define-public bitshuffle (package (name "bitshuffle") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (pypi-uri "bitshuffle" version)) (sha256 (base32 - "0ydawb01ghsvmw0lraczhrgvkjj97bpg98f1qqs1cnfp953mdd5v")))) + "1823x61kyax4dc2hjmc1xraskxi1193y8lvxd03vqv029jrj8cjy")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove generated Cython files. + (delete-file "bitshuffle/h5.c") + (delete-file "bitshuffle/ext.c") + #t)))) (build-system python-build-system) (arguments `(#:tests? #f)) ; fail: https://github.com/h5py/h5py/issues/769 From 28b24e9975967119620e272662b8ffc4a3f783aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 08:56:49 +0200 Subject: [PATCH 342/435] gnu: bitshuffle: Don't use '-march=native'. * gnu/packages/compression.scm (bitshuffle)[arguments]: Add custom phase to substitute out the '-march=native' compilation flag. --- gnu/packages/compression.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d24f48cd2c..7f6857d260 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1210,7 +1210,14 @@ well as bzip2.") #t)))) (build-system python-build-system) (arguments - `(#:tests? #f)) ; fail: https://github.com/h5py/h5py/issues/769 + `(#:tests? #f ; fail: https://github.com/h5py/h5py/issues/769 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'dont-build-native + (lambda _ + (substitute* "setup.py" + (("'-march=native', ") "")) + #t))))) (inputs `(("numpy" ,python-numpy) ("h5py" ,python-h5py) From c92d056a8b83aa51c2223cc3d840e3d9775e64b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 09:36:17 +0200 Subject: [PATCH 343/435] gnu: python-alembic: Update to 1.0.2. * gnu/packages/databases.scm (python-alembic, python2-alembic): Update to 1.0.2. --- 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 d4a1d35d95..9e752457e9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2424,14 +2424,14 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "0.9.6") + (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 (base32 - "0cm73vabrqj92v7a0wwvldj8j7bc7dwv358kvkk7p87gx7mm2a04")))) + "0asqz9mwc4w8bsar1icv3ik9jslxrj3gv3yxgmhc6nc6r9qbkg04")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) From 5ac2b2717f8d4b05c39c5717843d40bb1a493364 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 10:29:56 +0200 Subject: [PATCH 344/435] gnu: python-networkx2: Remove variable. * gnu/packages/python.scm (python-networkx2): Remove variable. * gnu/packages/patches/python-networkx2-reproducible-build.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-networkx2-reproducible-build.patch | 29 ------------------- gnu/packages/python.scm | 19 ------------ 3 files changed, 49 deletions(-) delete mode 100644 gnu/packages/patches/python-networkx2-reproducible-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 545a7d173f..15088a56a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1080,7 +1080,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ - %D%/packages/patches/python-networkx2-reproducible-build.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-networkx2-reproducible-build.patch b/gnu/packages/patches/python-networkx2-reproducible-build.patch deleted file mode 100644 index 8274767ab8..0000000000 --- a/gnu/packages/patches/python-networkx2-reproducible-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c065b972ed294769a41936d6b9feb336473af5d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= -Date: Sat, 4 Nov 2017 15:28:47 +0100 -Subject: Fix SOURCE_DATE_EPOCH ignored bug (#2735) - -* Fix SOURCE_DATE_EPOCH ignored bug - -Fix a bug in networkx/release.py that makes build -non-reproducible. ---- - networkx/release.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/networkx/release.py b/networkx/release.py -index e81fc0c0..6322cf0d 100644 ---- a/networkx/release.py -+++ b/networkx/release.py -@@ -135,7 +135,7 @@ def get_revision(): - - def get_info(dynamic=True): - # Date information -- date_info = datetime.datetime.now() -+ date_info = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) - date = time.asctime(date_info.timetuple()) - - revision, version, version_info, vcs_info = None, None, None, None --- -2.14.2 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d90805071b..f4592829a0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5208,25 +5208,6 @@ of the structure, dynamics, and functions of complex networks.") (define-public python2-networkx (package-with-python2 python-networkx)) -;; Define new package, because the current version of python-colormath does -;; not build against 2.0. -(define-public python-networkx2 - (package (inherit python-networkx) - (name "python-networkx2") - (version "2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "networkx" version ".zip")) - (sha256 - (base32 - "1ajl2jp8qry9nyjzzkqpy0vmsr14d23z1qk7y0vr5iwjbpvzhpyd")) - (patches - (search-patches "python-networkx2-reproducible-build.patch")))))) - -(define-public python2-networkx2 - (package-with-python2 python-networkx2)) - (define-public python-datrie (package (name "python-datrie") From 95176544d54cbc8c7c2bacd96e19b4a1411afbff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 10:41:32 +0200 Subject: [PATCH 345/435] gnu: python-paste: Update to 3.0.4. * gnu/packages/python-web.scm (python-paste): Update to 3.0.4. [source]: Remove patch, add snippet to remove one test. [native-inputs]: Add python-pytest, python-pytest-runner. * gnu/packages/patches/python-paste-remove-website-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-paste-remove-website-test.patch | 21 ------------------- gnu/packages/python-web.scm | 18 ++++++++++------ 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/python-paste-remove-website-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 15088a56a2..31dafdd42b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1086,7 +1086,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ - %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch b/gnu/packages/patches/python-paste-remove-website-test.patch deleted file mode 100644 index 93417fbe75..0000000000 --- a/gnu/packages/patches/python-paste-remove-website-test.patch +++ /dev/null @@ -1,21 +0,0 @@ -Remove the test to see if the Python Paste website is up. - -Obviously without network access there is no way for us to check this, and -it's pretty strange to test a project's website when you really mean to test -the project anyhow... - ---- a/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 -+++ b/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 -@@ -1,12 +1,3 @@ - from paste import proxy - from paste.fixture import TestApp - --def test_paste_website(): -- # Not the most robust test... -- # need to test things like POSTing to pages, and getting from pages -- # that don't set content-length. -- app = proxy.Proxy('http://pythonpaste.org') -- app = TestApp(app) -- res = app.get('/') -- assert 'documentation' in res -- diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6a8b1f21fb..e158df2000 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge @@ -2628,19 +2628,25 @@ available in Django, but is a standalone package.") (define-public python-paste (package (name "python-paste") - (version "2.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (pypi-uri "Paste" version)) (sha256 (base32 - "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3")) - (patches (search-patches "python-paste-remove-website-test.patch" - "python-paste-remove-timing-test.patch")))) + "01w26w9jyfkh0mfydhfz3dwy3pj3fw7mzvj0lna3vs8hyx1hwl0n")) + (patches (search-patches "python-paste-remove-timing-test.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; This test calls out to the internet. + (delete-file "tests/test_proxy.py") #t)))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-nose" ,python-nose))) (propagated-inputs `(("python-six" ,python-six))) (home-page "http://pythonpaste.org") From 8189ce6f05ebc49fc85934bdd1c81f8d43496a93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:07:21 +0200 Subject: [PATCH 346/435] gnu: python-pyclipper: Update to 1.1.0post1. * gnu/packages/python.scm (python-pyclipper): Update to 1.1.0post1. [source]: Add snippet to remove cythonized source files. [arguments]: Add custom phase to generate cythonized files. [native-inputs]: Add python-cython. [description]: Update clipper library version. --- gnu/packages/python.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f4592829a0..e8d8daae40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12896,26 +12896,38 @@ belong to tagged versions.") (define-public python-pyclipper (package (name "python-pyclipper") - (version "1.0.6") + (version "1.1.0.post1") (source (origin (method url-fetch) (uri (pypi-uri "pyclipper" version ".zip")) (sha256 (base32 - "1zpmwv3bya3j984y5cf9x9d5108kf6mxldcba68wiq0frv5qrssw")))) + "0ldbkbnx94an4zzrwb1sxmg6k0jgk4cwmvcdyy8y5k1zslc612wa")) + (modules '((guix build utils))) + (snippet + '(begin + ;; This file is generated by Cython. + (delete-file "pyclipper/pyclipper.cpp") #t)))) (build-system python-build-system) (arguments - `(#:tests? #f)); 8 Tests fail, 37 succeed + `(#:tests? #f ; 8 Tests fail, 37 succeed + #:phases + (modify-phases %standard-phases + (add-before 'build 'cythonize-sources + (lambda _ + (with-directory-excursion "pyclipper" + (invoke "cython" "--cplus" "pyclipper.pyx"))))))) (propagated-inputs `(("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive))) (native-inputs - `(("unzip" ,unzip))) + `(("python-cython" ,python-cython) + ("unzip" ,unzip))) (home-page "https://github.com/greginvm/pyclipper") (synopsis "Wrapper for Angus Johnson's Clipper library") (description "Pyclipper is a Cython wrapper for the C++ translation of the - Angus Johnson's polygon clipping Clipper library (ver. 6.2.1).") +Angus Johnson's polygon clipping Clipper library (ver. 6.4.2).") (license license:expat))) (define-public python2-pyclipper From 261e4214592709d5e4be1c8a7abdd92e9b1d253c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:12:37 +0200 Subject: [PATCH 347/435] gnu: python-pyclipper: Enable tests. * gnu/packages/python.scm (python-pyclipper)[arguments]: Enable tests. [native-inputs]: Add python-pytest, python-pytest-runner, python-unittest2. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e8d8daae40..cce995535a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12911,8 +12911,7 @@ belong to tagged versions.") (delete-file "pyclipper/pyclipper.cpp") #t)))) (build-system python-build-system) (arguments - `(#:tests? #f ; 8 Tests fail, 37 succeed - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'cythonize-sources (lambda _ @@ -12922,6 +12921,9 @@ belong to tagged versions.") `(("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive))) (native-inputs `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-unittest2" ,python-unittest2) ("unzip" ,unzip))) (home-page "https://github.com/greginvm/pyclipper") (synopsis "Wrapper for Angus Johnson's Clipper library") From 22d04ceda000b16881071094e4a1c8cddbe09dfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:47:57 +0200 Subject: [PATCH 348/435] gnu: python-rq: Update to 0.12.0. * gnu/packages/databases.scm (python-rq): Update to 0.12.0. --- 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 9e752457e9..1617c28b1e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2749,13 +2749,13 @@ reasonable substitute.") (define-public python-rq (package (name "python-rq") - (version "0.7.1") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "rq" version)) (sha256 - (base32 "0gaq5pnh0zy46r8jvygi0ifbvz3pq6i7xla78ijcgjw0x77qzsdh")))) + (base32 "16d8kni57xlnah2hawy4xgw21xrv3f64j5q5shyp3zxx4yd9iibs")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click) From 2bdca673517c566d55f5f3a540160b22fc51039e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:53:15 +0200 Subject: [PATCH 349/435] gnu: python-yapf: Update to 0.24.0. * gnu/packages/python.scm (python-yapf): Update to 0.24.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cce995535a..41c2a1f7ee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13272,14 +13272,14 @@ user's @file{~/Trash} directory.") (define-public python-yapf (package (name "python-yapf") - (version "0.21.0") + (version "0.24.0") (source (origin (method url-fetch) (uri (pypi-uri "yapf" version)) (sha256 (base32 - "144gc7d6b1415vh02409rnb8qd5kxi6mxlr7y64d5cizgxbf72kx")))) + "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf")))) (build-system python-build-system) (home-page "https://github.com/google/yapf") (synopsis "Formatter for Python code") From 8c5749f1b5255e37a6ef7b43e48fe0bbc57ce209 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Nov 2018 16:59:53 +0100 Subject: [PATCH 350/435] gnu: python-cffi: Fix test failure on i686. * gnu/packages/patches/python-cffi-x87-stack-clean.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/libffi.scm (python-cffi)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/libffi.scm | 3 +- .../patches/python-cffi-x87-stack-clean.patch | 29 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-cffi-x87-stack-clean.patch diff --git a/gnu/local.mk b/gnu/local.mk index 31dafdd42b..3e355ac9b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ + %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index d1b910bd07..01a5ea2049 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -88,7 +88,8 @@ conversions for values passed between the two languages.") (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")))) + (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")) + (patches (search-patches "python-cffi-x87-stack-clean.patch")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs diff --git a/gnu/packages/patches/python-cffi-x87-stack-clean.patch b/gnu/packages/patches/python-cffi-x87-stack-clean.patch new file mode 100644 index 0000000000..50243505ee --- /dev/null +++ b/gnu/packages/patches/python-cffi-x87-stack-clean.patch @@ -0,0 +1,29 @@ +Fix test that fails on i686: + +https://bitbucket.org/cffi/cffi/issues/382 + +This is a squashed version of these commits: +https://bitbucket.org/cffi/cffi/commits/ef09637b2314 +https://bitbucket.org/cffi/cffi/commits/7a76a3815340 + +diff -r 99940f1f5402 testing/cffi0/test_function.py +--- a/testing/cffi0/test_function.py Tue Feb 27 21:18:33 2018 +0100 ++++ b/testing/cffi0/test_function.py Sun Nov 11 16:26:23 2018 +0100 +@@ -45,14 +45,14 @@ + assert x != math.sin(1.23) # rounding effects + assert abs(x - math.sin(1.23)) < 1E-6 + +- def test_sin_no_return_value(self): ++ def test_lround_no_return_value(self): + # check that 'void'-returning functions work too + ffi = FFI(backend=self.Backend()) + ffi.cdef(""" +- void sin(double x); ++ void lround(double x); + """) + m = ffi.dlopen(lib_m) +- x = m.sin(1.23) ++ x = m.lround(1.23) + assert x is None + + def test_dlopen_filename(self): From 1767581fb50d2b97e12053aca087b6a490156f1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Nov 2018 18:21:04 +0100 Subject: [PATCH 351/435] build-system/haskell: Fix register phase. This is a follow-up to commit a7e231a2a3edbd6a70949432c1ff434d87f625ff. Reported by Marius Bakke . * guix/build/haskell-build-system.scm (register): Use "when" instead of "unless". --- guix/build/haskell-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 7b556f6431..23d97e6602 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -239,7 +239,7 @@ given Haskell package." (list (string-append "--gen-pkg-config=" config-file)))) (run-setuphs "register" params) ;; The conf file is created only when there is a library to register. - (unless (file-exists? config-file) + (when (file-exists? config-file) (mkdir-p config-dir) (let* ((config-file-name+id (call-with-ascii-input-file config-file (cut grep id-rx <>)))) From 05a5721f06acc0ac85f970991307bc52fe91f6de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 10:46:00 +0100 Subject: [PATCH 352/435] build-system/dub: Let all phases return #T unconditionally. * guix/build/dub-build-system.scm (configure, build, check): Return #T unconditionally; use INVOKE. --- guix/build/dub-build-system.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/guix/build/dub-build-system.scm b/guix/build/dub-build-system.scm index 9a72e3d544..3ab50733de 100644 --- a/guix/build/dub-build-system.scm +++ b/guix/build/dub-build-system.scm @@ -67,7 +67,8 @@ (symlink (string-append path "/lib/dub/" d-basename) (string-append vendor-dir "/" d-basename)))))))) inputs) - (zero? (system* "dub" "add-path" vendor-dir)))) + (invoke "dub" "add-path" vendor-dir) + #t)) (define (grep string file-name) "Find the first occurrence of STRING in the file named FILE-NAME. @@ -88,24 +89,22 @@ (define* (build #:key (dub-build-flags '()) #:allow-other-keys) "Build a given DUB package." - (if (or (grep* "sourceLibrary" "package.json") - (grep* "sourceLibrary" "dub.sdl") ; note: format is different! - (grep* "sourceLibrary" "dub.json")) - #t - (let ((status (zero? (apply system* `("dub" "build" ,@dub-build-flags))))) - (substitute* ".dub/dub.json" - (("\"lastUpgrade\": \"[^\"]*\"") - "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\"")) - status))) + (unless (or (grep* "sourceLibrary" "package.json") + (grep* "sourceLibrary" "dub.sdl") ; note: format is different! + (grep* "sourceLibrary" "dub.json")) + (apply invoke `("dub" "build" ,@dub-build-flags)) + (substitute* ".dub/dub.json" + (("\"lastUpgrade\": \"[^\"]*\"") + "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))) + #t) (define* (check #:key tests? #:allow-other-keys) - (if tests? - (let ((status (zero? (system* "dub" "test")))) - (substitute* ".dub/dub.json" - (("\"lastUpgrade\": \"[^\"]*\"") - "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\"")) - status) - #t)) + (when tests? + (invoke "dub" "test") + (substitute* ".dub/dub.json" + (("\"lastUpgrade\": \"[^\"]*\"") + "\"lastUpgrade\": \"1970-01-01T00:00:00.0000000\""))) + #t) (define* (install #:key inputs outputs #:allow-other-keys) "Install a given DUB package." From 7d9d521fbcf1423f66d6f33208c03d5dacb7ba50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Nov 2018 20:23:17 +0100 Subject: [PATCH 353/435] gnu: aide: Provide libpcre.a and libz.a. * gnu/packages/admin.scm (aide)[inputs]: Add PCRE:STATIC and ZLIB:STATIC. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa60cadd01..3c65ce102c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -125,7 +125,9 @@ `(("libgcrypt" ,libgcrypt) ("libgpg-error" ,libgpg-error) ("libmhash" ,libmhash) + ("pcre:static" ,pcre "static") ("pcre" ,pcre) + ("zlib:static" ,zlib "static") ("zlib" ,zlib))) (synopsis "File and directory integrity checker") (description From 21f7d88e7a5c6862f8c001a4877620dfeeb11904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 14 Nov 2018 23:49:19 +0100 Subject: [PATCH 354/435] gnu: texlive-bin: Fix substitution regexp. This is a followup to commit be200ef316478585059041a33d8f4287017dea5a. * gnu/packages/tex.scm (texlive-bin)[arguments]: In 'disable-failing-test' phase, escape "|" characters. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index cbe601ea9d..916aa54d58 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -199,7 +199,7 @@ ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28: ;; . (substitute* "texk/web2c/omegafonts/check.test" - (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck || exit 1") + (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck \\|\\| exit 1") "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77")) #t)) (add-after 'install 'postint From cb8ba848d2d0fc1ccd7b64a70858fdcc3e1b084a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 19:14:51 -0400 Subject: [PATCH 355/435] gnu: admin: Return #t from all phases. * gnu/packages/admin.scm (daemon-tools, rottlog, wpa-supplicant-minimal) (wakelan, cpulimit, nmap, sunxi-tools): Return #t from all phases. --- gnu/packages/admin.scm | 75 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0da35ea62e..cd18aaa06f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -227,13 +227,15 @@ interface and is based on GNU Guile.") (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ - (chdir ,(string-append name "-" version)))) + (chdir ,(string-append name "-" version)) + #t)) (delete 'configure) (add-before 'build 'patch (lambda _ (substitute* "src/error.h" (("extern int errno;") - "#include ")))) + "#include ")) + #t)) (replace 'build (lambda _ (invoke "package/compile"))) @@ -243,7 +245,8 @@ interface and is based on GNU Guile.") (bin (string-append out "/bin"))) (for-each (lambda (file) (install-file file bin)) - (find-files "command")))))))) + (find-files "command"))) + #t))))) (synopsis "Tools for managing UNIX style services") (description "@code{daemontools} is a collection of tools for managing UNIX @@ -965,7 +968,7 @@ at once based on a Perl regular expression.") #t)) (add-after 'install 'install-info (lambda _ - (zero? (system* "make" "install-info"))))))) + (invoke "make" "install-info")))))) (native-inputs `(("texinfo" ,texinfo) ("util-linux" ,util-linux))) ; for 'cal' (home-page "https://www.gnu.org/software/rottlog/") @@ -1096,7 +1099,8 @@ commands and their arguments.") CFLAGS += $(shell pkg-config libnl-3.0 --cflags) CONFIG_LIBNL32=y CONFIG_READLINE=y\n" port) - (close-port port)))) + (close-port port)) + #t)) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1235,11 +1239,10 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") ;; It's an old configure script that doesn't understand ;; the extra options we pass. (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - (string-append "--mandir=" out - "/share/man"))))))) + (invoke "./configure" + (string-append "--prefix=" out) + (string-append "--mandir=" out + "/share/man")))))) #:tests? #f)) (home-page "https://www.kernel.org") ; really, no home page (synopsis "Send a wake-on-LAN packet") @@ -1641,20 +1644,18 @@ things like zero-downtime rolling updates with load balancers.") (arguments `(#:phases (modify-phases %standard-phases (delete 'configure) - (replace - 'build - (lambda _ - (zero? (system* "make" "CC=gcc" "-Csrc")))) - (replace - 'check - (lambda _ - (zero? (system* "make" "CC=gcc" "-Ctests")))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "src/cpulimit" bin))))))) + (replace 'build + (lambda _ + (invoke "make" "CC=gcc" "-Csrc"))) + (replace 'check + (lambda _ + (invoke "make" "CC=gcc" "-Ctests"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "src/cpulimit" bin)) + #t))))) (home-page "https://github.com/opsengine/cpulimit") (synopsis "Limit CPU usage") (description @@ -1863,10 +1864,9 @@ done with the @code{auditctl} utility.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (define (make out . args) - (unless (zero? (apply system* "make" - (string-append "prefix=" out) - args)) - (error "make failed"))) + (apply invoke "make" + (string-append "prefix=" out) + args)) (define (python-path dir) (string-append dir "/lib/python2.7/site-packages")) (let ((out (assoc-ref outputs "out")) @@ -1880,13 +1880,14 @@ done with the @code{auditctl} utility.") (make ndiff "install-ndiff") (wrap-program (string-append ndiff "/bin/ndiff") `("PYTHONPATH" prefix - (,(python-path ndiff))))))) + (,(python-path ndiff))))) + #t)) ;; These are the tests that do not require network access. (replace 'check - (lambda _ (zero? (system* "make" - "check-nse" - "check-ndiff" - "check-dns"))))) + (lambda _ (invoke "make" + "check-nse" + "check-ndiff" + "check-dns")))) ;; Nmap can't cope with out-of-source building. #:out-of-source? #f)) (home-page "https://nmap.org/") @@ -2192,15 +2193,15 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") #t)) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) - (zero? (apply system* "make" "tools" "misc" make-flags)))) + (apply invoke "make" "tools" "misc" make-flags))) (add-after 'build 'build-armhf (lambda* (#:key make-flags #:allow-other-keys) (setenv "LIBRARY_PATH" #f) - (zero? (apply system* "make" "target-tools" make-flags)))) + (apply invoke "make" "target-tools" make-flags))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (zero? (apply system* "make" "install-all" "install-misc" - make-flags))))))) + (apply invoke "make" "install-all" "install-misc" + make-flags)))))) (home-page "https://github.com/linux-sunxi/sunxi-tools") (synopsis "Hardware management tools for Allwinner computers") (description "This package contains tools for Allwinner devices: From fccacffbf46ca51e76f67e4c51eb0fb081e12576 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:42:35 -0400 Subject: [PATCH 356/435] gnu: image: Return #t from all phases. * gnu/packages/image.scm (libpng-apng, pngcrush, leptonica, zimg) (perceptualdiff): Return #t from all phases. --- gnu/packages/image.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6436d7e404..11e1b1539b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -136,15 +136,15 @@ library. It supports almost all PNG features and is extensible.") (add-after 'unpack 'patch-apng (lambda* (#:key inputs #:allow-other-keys) (define (apply-patch file) - (zero? (system* "patch" "-p1" "--force" - "--input" file))) + (invoke "patch" "-p1" "--force" + "--input" file)) (let ((apng.gz (assoc-ref inputs "apng"))) (format #t "Applying APNG patch '~a'...~%" apng.gz) - (and - (zero? - (system (string-append "gunzip < " apng.gz " > the-patch"))) - (apply-patch "the-patch"))))) + (invoke "sh" "-c" + (string-append "gunzip < " apng.gz " > the-patch")) + (apply-patch "the-patch") + #t))) (add-before 'configure 'no-checks (lambda _ (substitute* "Makefile.in" @@ -239,7 +239,8 @@ in-memory raw vectors.") (string-append vardef (assoc-ref inputs "zlib") "/")) ;; The Makefile is written by hand and not using $PREFIX (("\\$\\(DESTDIR\\)/usr/") - (string-append (assoc-ref outputs "out") "/")))))))) + (string-append (assoc-ref outputs "out") "/"))) + #t))))) (inputs `(("libpng" ,libpng) ("zlib" , zlib))) @@ -473,14 +474,15 @@ collection of tools for doing simple manipulations of TIFF images.") (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autobuild")))) + (invoke "sh" "autobuild"))) (add-after 'unpack 'patch-reg-wrapper (lambda _ (substitute* "prog/reg_wrapper.sh" ((" /bin/sh ") (string-append " " (which "sh") " ")) (("which gnuplot") - "true"))))))) + "true")) + #t))))) (home-page "http://www.leptonica.com/") (synopsis "Library and tools for image processing and analysis") (description @@ -1083,7 +1085,7 @@ ISO/IEC 15444-1).") (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (synopsis "Scaling, colorspace conversion, and dithering library") (description "Zimg implements the commonly required image processing basics of scaling, colorspace conversion, and depth conversion. A simple API enables @@ -1116,7 +1118,8 @@ the programmer.") ;; of the source tree, one level higher than expected (lambda _ (substitute* "test/run_tests.bash" - (("../build") "../../build"))))))) + (("../build") "../../build")) + #t))))) (home-page "https://github.com/myint/perceptualdiff") (synopsis "Perceptual image comparison utility") (description "PerceptualDiff visually compares two images to determine From 9922278b25d552ea5bfc4a3a94f2837dc41eaa9d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:46:38 -0400 Subject: [PATCH 357/435] gnu: linux: Return #t from all phases. * gnu/packages/linux.scm (iproute, ntfs-3g, cpupower, radeontop, tlp): Return #t from all phases. --- gnu/packages/linux.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 955ad436b7..bdad1602b9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1251,7 +1251,8 @@ that the Ethernet protocol is much simpler than the IP protocol.") (lambda _ ;; Don't attempt to create /var/lib/arpd. (substitute* "Makefile" - (("^.*ARPDDIR.*$") ""))))))) + (("^.*ARPDDIR.*$") "")) + #t))))) (inputs `(("iptables" ,iptables) ("db4" ,bdb))) @@ -3539,7 +3540,8 @@ from userspace.") (let* ((out (assoc-ref outputs "out")) (sbin (string-append out "/sbin"))) (symlink "mount.ntfs-3g" - (string-append sbin "/mount.ntfs")))))))) + (string-append sbin "/mount.ntfs"))) + #t))))) (home-page "https://www.tuxera.com/community/open-source-ntfs-3g/") (synopsis "Read-write access to NTFS file systems") (description @@ -3696,7 +3698,8 @@ from that to the system kernel's @file{/dev/random} machinery.") '(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-subdirectory (lambda _ - (chdir "tools/power/cpupower"))) + (chdir "tools/power/cpupower") + #t)) (delete 'configure) (add-before 'build 'fix-makefiles (lambda _ @@ -3704,7 +3707,8 @@ from that to the system kernel's @file{/dev/random} machinery.") (("/usr/") "/") (("/bin/(install|pwd)" _ command) command)) (substitute* "bench/Makefile" - (("\\$\\(CC\\) -o") "$(CC) $(LDFLAGS) -o"))))) + (("\\$\\(CC\\) -o") "$(CC) $(LDFLAGS) -o")) + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") @@ -4016,9 +4020,11 @@ developers.") ;; getver.sh uses ‘git --describe’, isn't worth an extra git ;; dependency, and doesn't even work on release(!) tarballs. (add-after 'unpack 'report-correct-version - (lambda _ (substitute* "getver.sh" - (("ver=unknown") - (string-append "ver=" ,version))))) + (lambda _ + (substitute* "getver.sh" + (("ver=unknown") + (string-append "ver=" ,version))) + #t)) (delete 'configure)) ; no configure script #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) @@ -4245,8 +4251,7 @@ Light is the successor of lightscript.") #t)) (replace 'install (lambda _ - (invoke "make" "install-tlp" "install-man") - #t)) + (invoke "make" "install-tlp" "install-man"))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) From 366c1cbbc623fd94de05bde7c67e61ec0360aded Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 20:51:35 -0400 Subject: [PATCH 358/435] gnu: networking: Return #t from all phases. * gnu/packages/networking.scm (miredo, tcp-wrappers, librdkafka, ifstatus) (iodine, httpstat, perl-socket6, perl-netaddr-ip, libproxy, openvswitch) (libnet, asio): Return #t from all phases. --- gnu/packages/networking.scm | 48 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5504742fa8..a9e1576733 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -144,7 +144,8 @@ or, more generally, MAC addresses of the same category of hardware.") 'check 'disable-checkconf-test (lambda _ (substitute* "src/Makefile" - (("^TESTS = .*") "TESTS = \n"))))))) + (("^TESTS = .*") "TESTS = \n")) + #t))))) (home-page "http://www.remlab.net/miredo/") (synopsis "Teredo IPv6 tunneling software") (description @@ -216,7 +217,7 @@ libwrap.so: $(LIB_OBJ)\n (substitute* "scaffold.c" (("extern char .malloc.*;") "")) ;; This, believe it or not, is the recommended way to build! - (zero? (system* "make" "REAL_DAEMON_DIR=/etc" "linux")))) + (invoke "make" "REAL_DAEMON_DIR=/etc" "linux"))) ;; There is no make install stage, so we have to do it ourselves. (replace 'install (lambda _ @@ -251,7 +252,8 @@ libwrap.so: $(LIB_OBJ)\n (for-each (lambda (x) (install-file x (string-append out "/bin/"))) - bins))))))) + bins)) + #t))))) (home-page "http://www.porcupine.org") (synopsis "Monitor and filter incoming requests for network services") (description "With this package you can monitor and filter incoming requests for @@ -373,8 +375,8 @@ files contain direct mappings of the abstractions provided by the ØMQ C API.") ;; librdkafka++.so lacks RUNPATH for librdkafka.so (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) - (zero? (system* "./configure" - (string-append "--prefix=" out))))))))) + (invoke "./configure" + (string-append "--prefix=" out)))))))) (native-inputs `(("python" ,python-wrapper))) (propagated-inputs @@ -457,7 +459,8 @@ Ethernet devices.") (bin (string-append out "/bin"))) (mkdir-p bin) (copy-file "ifstatus" - (string-append bin "/ifstatus")))))))) + (string-append bin "/ifstatus"))) + #t))))) (inputs `(("ncurses" ,ncurses))) (home-page "http://ifstatus.sourceforge.net/graphic/index.html") (synopsis "Text based network interface status monitor") @@ -511,14 +514,16 @@ and min/max network usage.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/tun.c" (("PATH=[^ ]* ") - (string-append (assoc-ref inputs "net-tools") "/bin/"))))) + (string-append (assoc-ref inputs "net-tools") "/bin/"))) + #t)) (add-before 'check 'delete-failing-tests ;; Avoid https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802105. (lambda _ (substitute* "tests/common.c" (("tcase_add_test\\(tc, \ test_parse_format_ipv(4(|_listen_all|_mapped_ipv6)|6)\\);") - ""))))) + "")) + #t))) #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:test-target "test")) @@ -779,7 +784,8 @@ application stack itself.") (("ENV_CURL_BIN.get\\('curl'\\)") (string-append "ENV_CURL_BIN.get('" (assoc-ref inputs "curl") - "/bin/curl')")))))))) + "/bin/curl')"))) + #t))))) (home-page "https://github.com/reorx/httpstat") (synopsis "Visualize curl statistics") (description @@ -949,7 +955,7 @@ private (reserved).") ,(string-append "PREFIX=" out) "INSTALLDIRS=site"))) (setenv "CONFIG_SHELL" (which "sh")) - (zero? (apply system* "perl" args)))))))) + (apply invoke "perl" args))))))) (home-page "https://metacpan.org/release/Socket6") (synopsis "IPv6 related part of the C socket.h defines and structure manipulators for Perl") @@ -1009,7 +1015,7 @@ offline emulation of DNS.") ,(string-append "PREFIX=" out) "INSTALLDIRS=site"))) (setenv "CONFIG_SHELL" (which "sh")) - (zero? (apply system* "perl" args)))))))) + (apply invoke "perl" args))))))) (home-page "https://metacpan.org/release/NetAddr-IP") (synopsis @@ -1145,7 +1151,7 @@ sockets in Perl.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ctest" "-E" "url-test"))))))) + (invoke "ctest" "-E" "url-test")))))) (synopsis "Library providing automatic proxy configuration management") (description "Libproxy handles the details of HTTP/HTTPS proxy configuration for applications across all scenarios. Applications using @@ -1416,13 +1422,13 @@ procedure calls (RPCs).") (modify-phases %standard-phases (replace 'install (lambda _ - (zero? (system* "make" - ;; Don't try to create directories under /var. - "RUNDIR=/tmp" - "PKIDIR=/tmp" - "LOGDIR=/tmp" - "DBDIR=/tmp" - "install"))))))) + (invoke "make" + ;; Don't try to create directories under /var. + "RUNDIR=/tmp" + "PKIDIR=/tmp" + "LOGDIR=/tmp" + "DBDIR=/tmp" + "install")))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -1723,8 +1729,8 @@ interface and a programmable text output for scripting.") (lambda _ (chdir "libnet") #t)) (add-before 'build 'build-doc (lambda* (#:key make-flags #:allow-other-keys) - (zero? (apply system* "make" "-C" "doc" "doc" - make-flags))))))) + (apply invoke "make" "-C" "doc" "doc" + make-flags)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From 4851af9ebe3949354a2d22ca932bbecb072c5024 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:01:27 -0400 Subject: [PATCH 359/435] gnu: perl: Return #t from all phases. * gnu/packages/gd.scm (perl-gd-securityimage) * gnu/packages/libevent.scm (perl-ev) * gnu/packages/markup.scm (perl-text-markdown-discount) * gnu/packages/perl-check.scm (perl-test2-bundle-extended) * gnu/packages/perl.scm (perl-digest-md5, perl-encode-hanextra) (perl-ipc-run, perl-pathtools) * gnu/packages/photo.scm (perl-image-exiftool): Return #t from all phases. --- gnu/packages/gd.scm | 2 +- gnu/packages/markup.scm | 3 ++- gnu/packages/perl-check.scm | 2 +- gnu/packages/perl.scm | 11 +++++++---- gnu/packages/photo.scm | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 1fe69577fd..a53a4f2c2f 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -142,7 +142,7 @@ you can create PNG images on the fly or modify existing files.") '(#:phases (modify-phases %standard-phases (add-after 'unpack 'set-env - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1")))))) + (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))))) (native-inputs `(("perl-module-build" ,perl-module-build))) (propagated-inputs diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index cdcfbc7898..20da258029 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -173,7 +173,8 @@ convert it to structurally valid XHTML (or HTML).") (string-append "OTHERLDFLAGS = -lmarkdown -Wl,-rpath=" (assoc-ref inputs "discount") - "/lib")))))))) + "/lib"))) + #t))))) (inputs `(("discount" ,discount))) (home-page diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 98b4e392c7..d0abb39254 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -82,7 +82,7 @@ lexically, just dynamically.") '(#:phases (modify-phases %standard-phases (add-after 'unpack 'set-env - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1")))))) + (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))))) (propagated-inputs `(("perl-importer" ,perl-importer) ("perl-term-table" ,perl-term-table) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d6ea360b8e..8c854e88df 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2877,7 +2877,8 @@ interface for the RFC 2104 HMAC mechanism.") (add-after 'build 'set-permissions (lambda _ ;; Make MD5.so read-write so it can be stripped. - (chmod "blib/arch/auto/Digest/MD5/MD5.so" #o755)))))) + (chmod "blib/arch/auto/Digest/MD5/MD5.so" #o755) + #t))))) (home-page "https://metacpan.org/release/Digest-MD5") (synopsis "Perl interface to the MD-5 algorithm") (description @@ -3003,7 +3004,7 @@ also known as JIS 2000.") '(#:phases (modify-phases %standard-phases (add-after 'unpack 'set-env - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1")))))) + (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))))) (home-page "https://metacpan.org/release/Encode-HanExtra") (synopsis "Additional Chinese encodings") (description "This Perl module provides Chinese encodings that are not @@ -4278,7 +4279,8 @@ run interactively. It also has an option to capture output/error buffers.") (lambda _ ;; This test fails, and we're not really interested in ;; it, so disable it. - (delete-file "t/win32_compile.t")))))) + (delete-file "t/win32_compile.t") + #t))))) (home-page "https://metacpan.org/release/IPC-Run") (synopsis "Run system() and background procs w/ piping, redirs, ptys") (description "IPC::Run allows you run and interact with child processes @@ -6867,7 +6869,8 @@ directory specifications in a cross-platform manner.") (substitute* "Cwd.pm" (("'/bin/pwd'") (string-append "'" (assoc-ref inputs "coreutils") - "/bin/pwd'")))))))) + "/bin/pwd'"))) + #t))))) (inputs `(("coreutils" ,coreutils))) (home-page "https://metacpan.org/release/PathTools") diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 1cd789b802..713342658b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -227,7 +227,8 @@ MTP, and much more.") (pm (find-files out "^ExifTool\\.pm$")) (lib (dirname (dirname (car pm))))) (wrap-program (string-append out "/bin/exiftool") - `("PERL5LIB" prefix (,lib))))))))) + `("PERL5LIB" prefix (,lib))) + #t)))))) (home-page "https://metacpan.org/release/Image-ExifTool") (synopsis "Program and Perl library to manipulate EXIF and other metadata") (description "This package provides the @code{exiftool} command and the From 9dcfd6aac97044474b3df9aeb67a56e2fdaa87fb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:08:56 -0400 Subject: [PATCH 360/435] gnu: video: Return #t from all phases. * gnu/packages/video.scm (youtube-dl-gui, avidemux, xvid, twitchy, aegisub): Return #t from all phases, use invoke where appropriate, and remove vestigial plumbing. --- gnu/packages/video.scm | 102 +++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 94c5cf3a67..f4e461119b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1371,7 +1371,8 @@ YouTube.com and many more sites.") (("os\\.path\\.join\\('/usr', 'share'") (string-append "os.path.join('" (assoc-ref %outputs "out") - "', 'share'")))))))) + "', 'share'"))) + #t))))) (inputs `(("python2-wxpython" ,python2-wxpython) ("youtube-dl" ,youtube-dl))) @@ -1709,67 +1710,68 @@ for use with HTML5 video.") (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" - (system* "tar" "xf" "ffmpeg-2.7.6.tar.bz2") - (delete-file "ffmpeg-2.7.6.tar.bz2")))) + (invoke "tar" "xf" "ffmpeg-2.7.6.tar.bz2") + (delete-file "ffmpeg-2.7.6.tar.bz2")) + #t)) (add-after 'patch-source-shebangs 'repack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" (substitute* "ffmpeg-2.7.6/configure" (("#! /bin/sh") (string-append "#!" (which "sh")))) - (system* "tar" "cjf" "ffmpeg-2.7.6.tar.bz2" "ffmpeg-2.7.6" - ;; avoid non-determinism in the archive - "--sort=name" "--mtime=@0" - "--owner=root:0" "--group=root:0") - (delete-file-recursively "ffmpeg-2.7.6")))) + (invoke "tar" "cjf" "ffmpeg-2.7.6.tar.bz2" "ffmpeg-2.7.6" + ;; avoid non-determinism in the archive + "--sort=name" "--mtime=@0" + "--owner=root:0" "--group=root:0") + (delete-file-recursively "ffmpeg-2.7.6")) + #t)) (replace 'configure (lambda _ ;; Copy-paste settings from the cmake build system. (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")))) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + #t)) (replace 'build (lambda* (#:key inputs outputs #:allow-other-keys) - (let* - ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (top (getcwd)) - (sdl (assoc-ref inputs "sdl")) - (build_component - (lambda* (component srcdir #:optional (args '())) - (let ((builddir (string-append "build_" component))) - (mkdir builddir) - (with-directory-excursion builddir - (zero? - (and - (apply system* "cmake" - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" - (string-append "-DCMAKE_INSTALL_PREFIX=" out) - (string-append "-DCMAKE_INSTALL_RPATH=" lib) - (string-append "-DCMAKE_SHARED_LINKER_FLAGS=" - "\"-Wl,-rpath=" lib "\"") - (string-append "-DAVIDEMUX_SOURCE_DIR=" top) - (string-append "-DSDL_INCLUDE_DIR=" - sdl "/include/SDL") - (string-append "../" srcdir) - "-DENABLE_QT5=True" - args) - (system* "make" "-j" + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (top (getcwd)) + (sdl (assoc-ref inputs "sdl")) + (build_component + (lambda* (component srcdir #:optional (args '())) + (let ((builddir (string-append "build_" component))) + (mkdir builddir) + (with-directory-excursion builddir + (apply invoke "cmake" + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" + (string-append "-DCMAKE_INSTALL_PREFIX=" out) + (string-append "-DCMAKE_INSTALL_RPATH=" lib) + (string-append "-DCMAKE_SHARED_LINKER_FLAGS=" + "\"-Wl,-rpath=" lib "\"") + (string-append "-DAVIDEMUX_SOURCE_DIR=" top) + (string-append "-DSDL_INCLUDE_DIR=" + sdl "/include/SDL") + (string-append "../" srcdir) + "-DENABLE_QT5=True" + args) + (invoke "make" "-j" (number->string (parallel-job-count))) - (system* "make" "install")))))))) + (invoke "make" "install")))))) (mkdir out) - (and (build_component "core" "avidemux_core") - (build_component "cli" "avidemux/cli") - (build_component "qt4" "avidemux/qt4") - (build_component "plugins_common" "avidemux_plugins" - '("-DPLUGIN_UI=COMMON")) - (build_component "plugins_cli" "avidemux_plugins" - '("-DPLUGIN_UI=CLI")) - (build_component "plugins_qt4" "avidemux_plugins" - '("-DPLUGIN_UI=QT4")) - (build_component "plugins_settings" "avidemux_plugins" - '("-DPLUGIN_UI=SETTINGS"))) + (build_component "core" "avidemux_core") + (build_component "cli" "avidemux/cli") + (build_component "qt4" "avidemux/qt4") + (build_component "plugins_common" "avidemux_plugins" + '("-DPLUGIN_UI=COMMON")) + (build_component "plugins_cli" "avidemux_plugins" + '("-DPLUGIN_UI=CLI")) + (build_component "plugins_qt4" "avidemux_plugins" + '("-DPLUGIN_UI=QT4")) + (build_component "plugins_settings" "avidemux_plugins" + '("-DPLUGIN_UI=SETTINGS")) ;; Remove .exe and .dll file. (delete-file-recursively - (string-append out "/share/ADM6_addons"))))) + (string-append out "/share/ADM6_addons")) + #t))) (delete 'install)))) (home-page "http://fixounet.free.fr/avidemux/") (synopsis "Video editor") @@ -1849,7 +1851,8 @@ format changes.") (lambda _ (chdir "build/generic") (substitute* "configure" - (("#! /bin/sh") (string-append "#!" (which "sh"))))))) + (("#! /bin/sh") (string-append "#!" (which "sh")))) + #t))) ;; No 'check' target. #:tests? #f)) (home-page "https://www.xvid.com/") @@ -1922,7 +1925,8 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (lambda* (#:key outputs #:allow-other-keys) (install-file "plugins/rofi-twitchy" (string-append (assoc-ref outputs "out") - "/bin"))))))) + "/bin")) + #t))))) (inputs `(("python-requests" ,python-requests) ("streamlink" ,streamlink))) From aa6f87a2b984039229abbaba08c06415a782badc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:13:52 -0400 Subject: [PATCH 361/435] gnu: xml: Return #t from all phases. * gnu/packages/xml.scm (python-libxml2, perl-xml-sax, xlsx2csv, libxls) (java-kxml2): Return #t from all phases. --- gnu/packages/xml.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7f7ff6fc38..3ac01133e5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -187,7 +187,8 @@ project (but it is usable outside of the Gnome platform).") (format #f "ROOT = r'~a'" libxml2)) ;; For 'iconv.h'. (("/opt/include") - (string-append glibc "/include"))))))))) + (string-append glibc "/include")))) + #t))))) (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) @@ -552,7 +553,8 @@ that allow you to generate HTML from an RSS, convert between 0.9, 0.91, and (setenv "PERL5LIB" (string-append (getenv "PERL5LIB") ":" (assoc-ref outputs "out") - "/lib/perl5/site_perl"))))))) + "/lib/perl5/site_perl")) + #t))))) (home-page "https://metacpan.org/release/XML-SAX") (synopsis "Perl API for XML") (description "XML::SAX consists of several framework classes for using and @@ -1220,7 +1222,7 @@ elements to their parents (substitute* "test/run" ;; Run tests with `python' only (("^(PYTHON_VERSIONS = ).*" all m) (string-append m "['']"))) - (zero? (system* "test/run"))))))) + (invoke "test/run")))))) (home-page "https://github.com/dilshod/xlsx2csv") (synopsis "XLSX to CSV converter") (description @@ -1269,7 +1271,7 @@ files. It is designed to be fast and to handle large input files.") ;; Bootstrapping is required in order to fix the test driver script. (replace 'bootstrap (lambda _ - (zero? (system* "bash" "bootstrap"))))))) + (invoke "bash" "bootstrap")))))) (native-inputs `(("unzip" ,unzip) ("autoconf" ,autoconf) @@ -1870,7 +1872,8 @@ low memory footprint.") (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda _ - (copy-recursively "src/main/resources" "build/classes")))))) + (copy-recursively "src/main/resources" "build/classes") + #t))))) (inputs `(("java-xpp3" ,java-xpp3))) (native-inputs From c6bf07d14a42a0d7d67ce045c7654547cba0bd34 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:16:30 -0400 Subject: [PATCH 362/435] gnu: xorg: Return #t from all phases. * gnu/packages/xorg.scm (xcompmgr) * gnu/packages/xdisorg.scm (xdotool, scrot, unclutter, xscreensaver) (tint2, nxbelld, xautolock): Return #t from all phases. --- gnu/packages/xdisorg.scm | 11 +++++++---- gnu/packages/xorg.scm | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f2338783d2..966847e245 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -243,7 +243,8 @@ X11 (yet).") (mkdir-p (string-append out "/lib")) (setenv "PREFIX" out) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) - (setenv "CC" "gcc"))))))) + (setenv "CC" "gcc") + #t)))))) (native-inputs `(("perl" ,perl))) ; for pod2man (inputs `(("libx11" ,libx11) ("libxext" ,libxext) @@ -477,7 +478,7 @@ move windows, switch between desktops, etc.).") (doc (string-append out "/share/doc/scrot"))) (mkdir-p doc) (invoke "make" "install" - (string-append "docsdir=" doc)))))))) + (string-append "docsdir=" doc)))))))) (inputs `(("libx11" ,libx11) ("giblib" ,giblib))) @@ -1004,7 +1005,8 @@ color temperature should be set to match the lamps in your room.") (lambda _ (substitute* '("driver/Makefile.in" "po/Makefile.in.in") (("@GTK_DATADIR@") "@datadir@") - (("@PO_DATADIR@") "@datadir@"))))) + (("@PO_DATADIR@") "@datadir@")) + #t))) #:configure-flags '("--with-pam" "--with-proc-interrupts" "--without-readdisplay") #:make-flags (list (string-append "AD_DIR=" @@ -1164,7 +1166,8 @@ by name.") (add-after 'unpack 'fix-installation-prefix (lambda _ (substitute* "CMakeLists.txt" - (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))))))) + (("/etc") "${CMAKE_INSTALL_PREFIX}/etc")) + #t))))) (inputs `(("gtk+" ,gtk+-2) ("imlib2" ,imlib2) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5adb04a86a..774001af6c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5939,7 +5939,7 @@ Conventions Manual) and some of the @dfn{EWMH} (add-after 'unpack 'autogen (lambda _ (setenv "NOCONFIGURE" "t") - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) From ee527187a651210522ebf0c930cb22077b8d37cc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:21:56 -0400 Subject: [PATCH 363/435] gnu: audio: Return #t from all phases. * gnu/packages/audio.scm (clalsadrv, jack-2, libsbsms, zita-convolver) (zita-resampler, zita-alsa-pcmi, gsm, cava): Return #t from all phases. (ladspa): Use 'modify-phases'. Return #t from all phases. --- gnu/packages/audio.scm | 60 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6dc0d82668..2e1b0467c3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -715,7 +715,8 @@ language and software synthesizer.") (lambda _ (symlink "libclalsadrv.so" (string-append (assoc-ref %outputs "out") - "/lib/libclalsadrv.so.2")))) + "/lib/libclalsadrv.so.2")) + #t)) ;; no configure script (delete 'configure)))) (inputs @@ -1484,7 +1485,8 @@ synchronous execution of all clients, and low latency operation.") ((".*CFLAGS.*-Wall.*" m) (string-append m " conf.env.append_unique('LINKFLAGS'," - "'-Wl,-rpath=" %output "/lib')\n"))))) + "'-Wl,-rpath=" %output "/lib')\n"))) + #t)) (add-after 'install 'wrap-python-scripts (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'jack_control' runs with the correct PYTHONPATH. @@ -1567,19 +1569,20 @@ plugin function as a JACK application.") (arguments `(#:tests? #f ; the "test" target is a listening test only #:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - (chdir "src") - (let ((out (assoc-ref outputs "out"))) - (substitute* "makefile" - (("/usr/lib/ladspa/") (string-append out "/lib/ladspa/")) - (("/usr/include/") (string-append out "/include/")) - (("/usr/bin/") (string-append out "/bin/")) - (("-mkdirhier") "mkdir -p") - (("^CC.*") "CC = gcc\n") - (("^CPP.*") "CPP = g++\n")))) - (alist-delete 'build %standard-phases)))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (chdir "src") + (let ((out (assoc-ref outputs "out"))) + (substitute* "makefile" + (("/usr/lib/ladspa/") (string-append out "/lib/ladspa/")) + (("/usr/include/") (string-append out "/include/")) + (("/usr/bin/") (string-append out "/bin/")) + (("-mkdirhier") "mkdir -p") + (("^CC.*") "CC = gcc\n") + (("^CPP.*") "CPP = g++\n"))) + #t)) + (delete 'build)))) ;; Since the home page is gone, we provide a link to the archived version. (home-page "https://web.archive.org/web/20140729190945/http://www.ladspa.org/") @@ -2503,7 +2506,8 @@ analysis plugins or audio feature extraction plugins.") (symlink (string-append (assoc-ref inputs "automake") "/share/automake-" ,(package-version automake) "/ar-lib") - "ar-lib")))))) + "ar-lib") + #t))))) (home-page "http://sbsms.sourceforge.net/") (synopsis "Library for time stretching and pitch scaling of audio") (description @@ -2899,12 +2903,14 @@ result.") (substitute* "libs/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") #t)) + (chdir "libs") + #t)) (add-after 'install 'install-symlink (lambda _ (symlink "libzita-convolver.so" (string-append (assoc-ref %outputs "out") - "/lib/libzita-convolver.so.3")))) + "/lib/libzita-convolver.so.3")) + #t)) ;; no configure script (delete 'configure)))) (inputs `(("fftwf" ,fftwf))) @@ -2954,7 +2960,8 @@ engine.") (lambda _ (symlink "libzita-resampler.so" (string-append (assoc-ref %outputs "out") - "/lib/libzita-resampler.so.1")))) + "/lib/libzita-resampler.so.1")) + #t)) ;; no configure script (delete 'configure)))) (home-page "https://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html") @@ -2995,7 +3002,8 @@ provide high-quality sample rate conversion.") (lambda _ (symlink "libzita-alsa-pcmi.so" (string-append (assoc-ref %outputs "out") - "/lib/libzita-alsa-pcmi.so.0")))) + "/lib/libzita-alsa-pcmi.so.0")) + #t)) ;; no configure script (delete 'configure)))) (inputs @@ -3180,7 +3188,8 @@ code, used in @code{libtoxcore}.") (mkdir-p (string-append out "/man/man1")) (mkdir-p (string-append out "/man/man3")) (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/lib"))))) + (mkdir-p (string-append out "/lib"))) + #t)) (add-after 'install 'post-install (lambda _ (let ((out (assoc-ref %outputs "out"))) @@ -3188,7 +3197,8 @@ code, used in @code{libtoxcore}.") (string-append out "/include")) (mkdir-p (string-append out "/include/gsm")) (copy-recursively "inc" - (string-append out "/include/gsm"))))) + (string-append out "/include/gsm"))) + #t)) (delete 'configure)))) ; no configure script (synopsis "GSM 06.10 lossy speech compression library") (description "This C library provides an encoder and a decoder for the GSM @@ -3464,14 +3474,16 @@ representations.") (invoke "sh" "autogen.sh"))) (add-before 'build 'make-cava-ldflags (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "out") "/lib")))) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) + #t)) (add-after 'install 'data (lambda* (#:key outputs #:allow-other-keys) (for-each (lambda (file) (install-file file (string-append (assoc-ref outputs "out") "/share/doc/examples"))) - (find-files "example_files"))))))) + (find-files "example_files")) + #t))))) (home-page "https://karlstav.github.io/cava/") (synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio") (description "C.A.V.A. is a bar audio spectrum visualizer for the terminal From 29594404a154b35431609d5f72154c2b69c11dff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:03:33 -0400 Subject: [PATCH 364/435] gnu: check: Return #t from all phases. * gnu/packages/check.scm (cmdtest, python-pytest-cov, python-fixtures) (python-pytest-localserver, python-pytest-flakes) (python2-coverage-test-runner, python-pylint, python-behave-web-api): Return #t from all phases, and use invoke where appropriate. --- gnu/packages/check.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 02c1d52740..96144995c1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -250,7 +250,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.") ;; the build environment. Hence assuming-failure test fails. (delete-file "yarn.tests/assuming-failure.script") (delete-file "yarn.tests/assuming-failure.stdout") - (zero? (system* "python" "setup.py" "check"))))))) + (invoke "python" "setup.py" "check")))))) (native-inputs `(("python2-coverage-test-runner" ,python2-coverage-test-runner))) (propagated-inputs @@ -715,8 +715,8 @@ and many external plugins.") ;; options taken from tox.ini ;; TODO: make "--restructuredtext" tests pass. They currently fail ;; with "Duplicate implicit target name" - (zero? (system* "python" "./setup.py" "check" - "--strict" "--metadata"))))))) + (invoke "python" "./setup.py" "check" + "--strict" "--metadata")))))) (propagated-inputs `(("python-coverage" ,python-coverage) ("python-pytest" ,python-pytest))) @@ -1100,8 +1100,8 @@ python-fixtures package instead.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "python" "-m" "testtools.run" - "fixtures.test_suite"))))))) + (invoke "python" "-m" "testtools.run" + "fixtures.test_suite")))))) (propagated-inputs ;; Fixtures uses pbr at runtime to check versions, etc. `(("python-pbr" ,python-pbr) @@ -1353,8 +1353,8 @@ the last py.test invocation.") `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "py.test" "--genscript=runtests.py")) - (zero? (system* "py.test"))))))) + (invoke "py.test" "--genscript=runtests.py") + (invoke "py.test")))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-requests" ,python-requests) @@ -1523,7 +1523,7 @@ failures.") ;; It's easier to run tests after install. ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) - (zero? (system* "py.test" "-vv"))))))) + (invoke "py.test" "-vv")))))) (native-inputs `(("python-coverage" ,python-coverage) ("python-pytest" ,python-pytest) @@ -1560,7 +1560,7 @@ failures.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "./testrun"))))))) + (invoke "./testrun")))))) (propagated-inputs `(("python2-coverage" ,python2-coverage))) (home-page "https://liw.fi/coverage-test-runner/") @@ -1606,9 +1606,9 @@ statements in the module it tests.") (string-append (getenv "PYTHONPATH") ":" work)) (copy-recursively "." work) (with-directory-excursion "/tmp" - (zero? (system* "python" "-m" "unittest" "discover" - "-s" (string-append work "/pylint/test") - "-p" "*test_*.py"))))))))) + (invoke "python" "-m" "unittest" "discover" + "-s" (string-append work "/pylint/test") + "-p" "*test_*.py")))))))) (home-page "https://github.com/PyCQA/pylint") (synopsis "Python source code analyzer which looks for coding standard errors") @@ -1841,7 +1841,8 @@ tests written in a natural language style, backed up by Python code.") (lambda _ (substitute* "setup.py" (("'wheel'") "") ; We don't use it. - (("'ordereddict==1.1'") ""))))))) ; Python >= 2.7 has it built-in. + (("'ordereddict==1.1'") "")) ; Python >= 2.7 has it built-in. + #t))))) (propagated-inputs `(("behave" ,behave) ("python-requests" ,python-requests))) From 9f6f726c7f43b9504d132471e0d13b2b0fdf6505 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:14:34 -0400 Subject: [PATCH 365/435] gnu: compression: Return #t from all phases. * gnu/packages/compression.scm (perl-compress-raw-zlib, java-snappy) (java-iq80-snappy, pzstd, java-tukaani-xz): Return #t from all phases. --- gnu/packages/compression.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6c3d88e7cb..fb07867c6d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -760,7 +760,8 @@ INCLUDE = ~a/include LIB = ~:*~a/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT" - (assoc-ref inputs "zlib"))))))))) + (assoc-ref inputs "zlib")))) + #t))))) (home-page "https://metacpan.org/release/Compress-Raw-Zlib") (synopsis "Low-level interface to zlib compression library") (description "This module provides a Perl interface to the zlib @@ -1344,7 +1345,8 @@ install: libbitshuffle.so (add-after 'build-jni 'copy-jni (lambda _ (copy-recursively "src/main/resources/org/xerial/snappy/native" - "build/classes/org/xerial/snappy/native"))) + "build/classes/org/xerial/snappy/native") + #t)) (add-before 'check 'fix-failing (lambda _ (with-directory-excursion "src/test/java/org/xerial/snappy" @@ -1462,7 +1464,8 @@ compressor/decompressor.") class)) (invoke "ant" "compile-tests") (test "org.iq80.snappy.SnappyFramedStreamTest") - (test "org.iq80.snappy.SnappyStreamTest"))) + (test "org.iq80.snappy.SnappyStreamTest") + #t)) (add-before 'build 'remove-hadoop-dependency (lambda _ ;; We don't have hadoop @@ -1817,7 +1820,7 @@ speed.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-subdirectory - (lambda _ (chdir "contrib/pzstd"))) + (lambda _ (chdir "contrib/pzstd") #t)) (delete 'configure) ; no configure script (add-before 'check 'compile-tests (lambda* (#:key make-flags #:allow-other-keys) @@ -2099,14 +2102,16 @@ type by using either Perl modules, or command-line tools on your system.") (lambda _ ;; Our build system enters the first directory in the archive, but ;; the package is not contained in a subdirectory - (chdir ".."))) + (chdir "..") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Do we want to install *Demo.jar? (install-file "build/jar/xz.jar" (string-append (assoc-ref outputs "out") - "/share/java/xz.jar"))))))) + "/share/java/xz.jar")) + #t))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://tukaani.org") From 96272e2822046519e9d6a89bfac0d29936ef2766 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:24:08 -0400 Subject: [PATCH 366/435] gnu: databases: Return #t from all phases. * gnu/packages/databases.scm (4store, go-gopkg.in-mgo.v2, mongodb) (sparql-query, tdb, sqlcipher, python-sqlparse, mongo-tools): Return #t from all phases, use invoke where appropriate, and remove vestigial plumbing. --- gnu/packages/databases.scm | 137 +++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 05bebed6a6..393b13a314 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -153,7 +153,7 @@ (modify-phases %standard-phases (add-after 'unpack 'generate-configure (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") @@ -207,14 +207,16 @@ and provides interfaces to the traditional file format.") (delete 'reset-gzip-timestamps) (add-before 'check 'start-mongodb (lambda* (#:key tests? #:allow-other-keys) - (or (not tests?) - (with-directory-excursion "src/gopkg.in/mgo.v2" - (invoke "make" "startdb"))))) + (when tests? + (with-directory-excursion "src/gopkg.in/mgo.v2" + (invoke "make" "startdb"))) + #t)) (add-after 'check 'stop'mongodb (lambda* (#:key tests? #:allow-other-keys) - (or (not tests?) - (with-directory-excursion "src/gopkg.in/mgo.v2" - (invoke "make" "stopdb")))))))) + (when tests? + (with-directory-excursion "src/gopkg.in/mgo.v2" + (invoke "make" "stopdb"))) + #t))))) (native-inputs `(("go-gopkg.in-check.v1" ,go-gopkg.in-check.v1) ("mongodb" ,mongodb) @@ -511,28 +513,27 @@ applications.") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (or (not tests?) - ;; Note that with the tests, especially the unittests, the - ;; build can take up to ~45GB of space, as many tests are - ;; individual executable files, with some being hundreds of - ;; megabytes in size. - (begin - (apply - invoke `("scons" ,@common-options "dbtest" "unittests")) - (substitute* "build/unittests.txt" - ;; TODO: Don't run the async_stream_test, as it hangs - (("^build\\/opt\\/mongo\\/executor\\/async\\_stream\\_test\n$") - "") - ;; TODO: This test fails - ;; Expected 0UL != disks.size() (0 != 0) @src/mongo/util/procparser_test.cpp:476 - (("^build\\/opt\\/mongo\\/util\\/procparser\\_test\n$") - "")) - (invoke "python" "buildscripts/resmoke.py" - "--suites=dbtest,unittests" - (format #f "--jobs=~a" (parallel-job-count))))))) + (when tests? + ;; Note that with the tests, especially the unittests, the + ;; build can take up to ~45GB of space, as many tests are + ;; individual executable files, with some being hundreds of + ;; megabytes in size. + (apply invoke `("scons" ,@common-options "dbtest" "unittests")) + (substitute* "build/unittests.txt" + ;; TODO: Don't run the async_stream_test, as it hangs + (("^build\\/opt\\/mongo\\/executor\\/async\\_stream\\_test\n$") + "") + ;; TODO: This test fails + ;; Expected 0UL != disks.size() (0 != 0) @src/mongo/util/procparser_test.cpp:476 + (("^build\\/opt\\/mongo\\/util\\/procparser\\_test\n$") + "")) + (invoke "python" "buildscripts/resmoke.py" + "--suites=dbtest,unittests" + (format #f "--jobs=~a" (parallel-job-count)))) + #t)) (replace 'install - (lambda _ - (let ((bin (string-append (assoc-ref %outputs "out") "/bin"))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (install-file "mongod" bin) (install-file "mongos" bin) (install-file "mongo" bin)) @@ -1118,7 +1119,8 @@ data in a single database. RocksDB is partially based on @code{LevelDB}.") (lambda _ (substitute* "Makefile" (("^gitrev :=.*$") - (string-append "gitrev = \"v" ,version "\""))))) + (string-append "gitrev = \"v" ,version "\""))) + #t)) ;; The install phase of the Makefile assumes $PREFIX/usr/local/bin. ;; This replacement does the same thing, except for using $PREFIX/bin ;; instead. @@ -1127,14 +1129,13 @@ data in a single database. RocksDB is partially based on @code{LevelDB}.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (install-file "sparql-query" bin) - (system* "ln" "--symbolic" - (string-append bin "/sparql-query") - (string-append bin "/sparql-update"))))) + (symlink (string-append bin "/sparql-query") + (string-append bin "/sparql-update"))) + #t)) (replace 'check (lambda* (#:key make-flags #:allow-other-keys) - (and - (zero? (apply system* "make" `(,@make-flags "scan-test"))) - (zero? (system "./scan-test")))))))) + (apply invoke "make" `(,@make-flags "scan-test")) + (invoke "./scan-test")))))) (home-page "https://github.com/tialaramex/sparql-query/") (synopsis "Command-line tool for accessing SPARQL endpoints over HTTP") (description "Sparql-query is a command-line tool for accessing SPARQL @@ -1259,8 +1260,8 @@ is in the public domain.") (let ((out (assoc-ref outputs "out"))) ;; The 'configure' script is a wrapper for Waf and ;; doesn't recognize things like '--enable-fast-install'. - (zero? (system* "./configure" - (string-append "--prefix=" out))))))))) + (invoke "./configure" + (string-append "--prefix=" out)))))))) (native-inputs `(;; TODO: Build the documentation. ;; ("docbook-xsl" ,docbook-xsl) @@ -2009,8 +2010,7 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (assoc-ref %standard-phases 'check)) (replace 'check (lambda _ - (zero? - (system* "./testfixture" "test/crypto.test"))))))) + (invoke "./testfixture" "test/crypto.test")))))) (home-page "https://www.zetetic.net/sqlcipher/") (synopsis "Library providing transparent encryption of SQLite database files") @@ -2805,7 +2805,7 @@ is designed to have a low barrier to entry.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "py.test"))))))) + (lambda _ (invoke "py.test")))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andialbrecht/sqlparse") @@ -2872,41 +2872,46 @@ transforms idiomatic python function calls to well-formed SQL queries.") (delete 'install-source) (replace 'build (lambda _ - (every (lambda (tool) - (let ((command - `("go" "build" - ;; This is where the tests expect to find the - ;; executables - "-o" ,(string-append - "src/github.com/mongodb/mongo-tools/bin/" - tool) - "-v" - "-tags=\"ssl sasl\"" - "-ldflags" - "-extldflags=-Wl,-z,now,-z,relro" - ,(string-append - "src/github.com/mongodb/mongo-tools/" - tool "/main/" tool ".go")))) - (simple-format #t "build: running ~A\n" - (string-join command)) - (apply invoke command))) - all-tools))) + (for-each (lambda (tool) + (let ((command + `("go" "build" + ;; This is where the tests expect to find the + ;; executables + "-o" ,(string-append + "src/github.com/mongodb/mongo-tools/bin/" + tool) + "-v" + "-tags=\"ssl sasl\"" + "-ldflags" + "-extldflags=-Wl,-z,now,-z,relro" + ,(string-append + "src/github.com/mongodb/mongo-tools/" + tool "/main/" tool ".go")))) + (simple-format #t "build: running ~A\n" + (string-join command)) + (apply invoke command))) + all-tools) + #t)) (replace 'check (lambda _ (with-directory-excursion "src" - (every (lambda (tool) - (invoke - "go" "test" "-v" - (string-append "github.com/mongodb/mongo-tools/" tool))) - all-tools)))) + (for-each (lambda (tool) + (invoke + "go" "test" "-v" + (string-append "github.com/mongodb/mongo-tools/" + tool))) + all-tools)) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (for-each (lambda (tool) (install-file - (string-append "src/github.com/mongodb/mongo-tools/bin/" tool) + (string-append "src/github.com/mongodb/mongo-tools/bin/" + tool) (string-append (assoc-ref outputs "out") "/bin"))) - all-tools))))))) + all-tools) + #t)))))) (native-inputs `(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass) ("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags) From 2e0f69057a58a5cf2abb2f2b2c8d1a705d297c25 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 19:52:54 -0400 Subject: [PATCH 367/435] gnu: bioinformatics: Return #t from all phases and snippets. * gnu/packages/bioinformatics.scm (bamtools, ribotaper, bioawk) (codingquarry, fraggenescan, minced, pplacer, star, subread, sailfish) (salmon): Return #t from all phases and snippets, use 'invoke' where appropriate, and remove vestigal plumbing. --- gnu/packages/bioinformatics.scm | 47 ++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 58cee5cbbe..28b6cd318b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -281,7 +281,8 @@ instance, it implements several methods to assess contig-wise read coverage.") (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - (assoc-ref outputs "out") "/lib/bamtools"))))))) + (assoc-ref outputs "out") "/lib/bamtools")) + #t))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/pezmaster31/bamtools") (synopsis "C++ API and command-line toolkit for working with BAM data") @@ -496,7 +497,8 @@ BED, GFF/GTF, VCF.") '("create_annotations_files.bash" "create_metaplots.bash" "Ribotaper_ORF_find.sh" - "Ribotaper.sh")))))))) + "Ribotaper.sh"))) + #t))))) (inputs `(("bedtools" ,bedtools-2.18) ("samtools" ,samtools-0.1) @@ -591,7 +593,8 @@ independently with transcriptional regulation.") (man (string-append out "/share/man/man1"))) (mkdir-p man) (copy-file "awk.1" (string-append man "/bioawk.1")) - (install-file "bioawk" bin))))))) + (install-file "bioawk" bin)) + #t))))) (home-page "https://github.com/lh3/bioawk") (synopsis "AWK with bioinformatics extensions") (description "Bioawk is an extension to Brian Kernighan's awk, adding the @@ -1811,7 +1814,8 @@ databases.") (copy-recursively "QuarryFiles" (string-append out "/QuarryFiles")) (install-file "CodingQuarry" bin) - (install-file "CufflinksGTF_to_CodingQuarryGFF3.py" bin))))))) + (install-file "CufflinksGTF_to_CodingQuarryGFF3.py" bin)) + #t))))) (inputs `(("openmpi" ,openmpi))) (native-search-paths (list (search-path-specification @@ -2727,7 +2731,8 @@ Illumina, Roche 454, and the SOLiD platform.") (share (string-append out "/share/fraggenescan/train"))) (install-file "run_FragGeneScan.pl" bin) (install-file "FragGeneScan" bin) - (copy-recursively "train" share)))) + (copy-recursively "train" share)) + #t)) (delete 'check) (add-after 'install 'post-install-check ;; In lieu of 'make check', run one of the examples and check the @@ -4153,7 +4158,8 @@ probabilistic distances of genome abundance and tetranucleotide frequency.") "#!" (assoc-ref inputs "bash") "/bin/sh\n\n" (assoc-ref inputs "jre") "/bin/java -jar " bin "/minced.jar \"$@\"\n")))) - (chmod wrapper #o555))))))) + (chmod wrapper #o555)) + #t))))) (native-inputs `(("jdk" ,icedtea "jdk"))) (inputs @@ -4408,7 +4414,7 @@ downstream analysis.") #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-scripts-dir - (lambda _ (chdir "scripts"))) + (lambda _ (chdir "scripts") #t)) (replace 'check (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t)) (add-after 'install 'wrap-executables @@ -6019,7 +6025,8 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (lambda _ (substitute* "Makefile" (("(COMPILATION_TIME_PLACE=\")(.*)(\")" _ pre mid post) - (string-append pre "Built with Guix" post))))) + (string-append pre "Built with Guix" post))) + #t)) (add-after 'enter-source-dir 'do-not-use-bundled-htslib (lambda _ (substitute* "Makefile" @@ -6103,7 +6110,8 @@ sequences.") (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (mkdir-p bin) - (copy-recursively "../bin" bin)))) + (copy-recursively "../bin" bin)) + #t)) ;; no "configure" script (delete 'configure)))) (inputs `(("zlib" ,zlib))) @@ -12006,11 +12014,13 @@ bytes of memory space, where n is the length of the string.") (add-after 'unpack 'do-not-look-for-boost (lambda* (#:key inputs #:allow-other-keys) (substitute* "CMakeLists.txt" - (("find_package\\(Boost 1\\.53\\.0") "#")))) + (("find_package\\(Boost 1\\.53\\.0") "#")) + #t)) (add-after 'unpack 'do-not-assign-to-macro (lambda _ (substitute* "include/spdlog/details/format.cc" - (("const unsigned CHAR_WIDTH = 1;") "")))) + (("const unsigned CHAR_WIDTH = 1;") "")) + #t)) (add-after 'unpack 'prepare-rapmap (lambda* (#:key inputs #:allow-other-keys) (let ((src "external/install/src/rapmap/") @@ -12026,7 +12036,8 @@ bytes of memory space, where n is the length of the string.") (for-each (lambda (file) (install-file file src)) (find-files "/tmp/rapmap/src" "\\.(c|cpp)")) - (copy-recursively "/tmp/rapmap/include" include)))) + (copy-recursively "/tmp/rapmap/include" include)) + #t)) (add-after 'unpack 'use-system-libraries (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/SailfishIndexer.cpp" @@ -12066,7 +12077,8 @@ bytes of memory space, where n is the length of the string.") (string-append (getenv "CPLUS_INCLUDE_PATH") ":" (assoc-ref inputs "eigen") - "/include/eigen3"))))))) + "/include/eigen3")) + #t))))) (inputs `(("boost" ,boost) ("eigen" ,eigen) @@ -12252,11 +12264,13 @@ performance as its primary goal.") (add-after 'unpack 'do-not-look-for-boost (lambda* (#:key inputs #:allow-other-keys) (substitute* "CMakeLists.txt" - (("find_package\\(Boost 1\\.53\\.0") "#")))) + (("find_package\\(Boost 1\\.53\\.0") "#")) + #t)) (add-after 'unpack 'do-not-phone-home (lambda _ (substitute* "src/Salmon.cpp" - (("getVersionMessage\\(\\)") "\"\"")))) + (("getVersionMessage\\(\\)") "\"\"")) + #t)) (add-after 'unpack 'prepare-rapmap (lambda* (#:key inputs #:allow-other-keys) (let ((src "external/install/src/rapmap/") @@ -12273,7 +12287,8 @@ performance as its primary goal.") "external/install/include/rapmap/concurrentqueue.h" "external/install/include/rapmap/FastxParserThreadUtils.hpp" "external/install/src/rapmap/FastxParser.cpp" - "external/install/src/rapmap/xxhash.c"))))) + "external/install/src/rapmap/xxhash.c"))) + #t)) (add-after 'unpack 'use-system-libraries (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/CMakeLists.txt" From 85b28320d4493902395c49f32f48a11290a41de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Nov 2018 17:40:55 +0100 Subject: [PATCH 368/435] gnu: Add libfaketime. * gnu/packages/check.scm (libfaketime): New variable. --- gnu/packages/check.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 96144995c1..24a9902434 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Marius Bakke -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; ;;; This file is part of GNU Guix. @@ -51,6 +51,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages llvm) #:use-module (gnu packages golang) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages time) @@ -2088,3 +2089,42 @@ aspects of UnitTest++. UnitTest++ is mostly standard C++ and makes minimal use of advanced library and language features, which means it should be easily portable to just about any platform.") (license license:expat))) + +(define-public libfaketime + (package + (name "libfaketime") + (version "0.9.7") + (home-page "https://github.com/wolfcw/libfaketime") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "1cin1pqwpsswcv7amiwijirvcg3x1zf2l00s1x84nxc5602fzr5c")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" "gcc") + (setenv "PREFIX" out) + #t))) + (add-before 'check 'pre-check + (lambda _ + (substitute* "test/functests/test_exclude_mono.sh" + (("/bin/bash") (which "bash"))) + #t))) + #:test-target "test")) + (native-inputs + `(("perl" ,perl))) ;for tests + (synopsis "Fake the system time for single applications") + (description + "The libfaketime library allows users to modify the system time that an +application \"sees\". It is meant to be loaded using the dynamic linker's +@code{LD_PRELOAD} environment variable. The @command{faketime} command +provides a simple way to achieve this.") + (license license:gpl2))) From bc9aa60bd574f44b0a75363d59c43a23cda6bdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Nov 2018 19:02:18 +0100 Subject: [PATCH 369/435] gnu: nss: Make tests deterministic. Tests would fail once certificates had expired, along these lines: chains.sh: Verifying certificate(s) PayPalEE.cert with flags -d AllDB -pp -o OID.2.16.840.1.114412.1.1 vfychain -d AllDB -pp -vv -o OID.2.16.840.1.114412.1.1 /tmp/guix-build-nss-3.39.drv-0/nss-3.39/nss/tests/libpkix/certs/PayPalEE.cert Chain is bad! PROBLEM WITH THE CERT CHAIN: CERT 0. PayPalEE : ERROR -8181: Peer's Certificate has expired. Returned value is 1, expected result is pass Using 'faketime' allows us to get deterministic results. * gnu/packages/gnuzilla.scm (nss)[arguments]: In 'check' phase, run 'all.sh' under 'faketime'. [native-inputs]: Add LIBFAKETIME. --- gnu/packages/gnuzilla.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e1abe8c2cd..d6b1f4c2d6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -417,7 +418,12 @@ in the Mozilla clients.") (setenv "DOMSUF" "(none)") (setenv "USE_IP" "TRUE") (setenv "IP_ADDRESS" "127.0.0.1") - (invoke "./nss/tests/all.sh"))) + + ;; The "PayPalEE.cert" certificate expires every six months, + ;; leading to test failures: + ;; . To + ;; work around that, set the time to roughly the release date. + (invoke "faketime" "2018-09-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -453,7 +459,8 @@ in the Mozilla clients.") `(("sqlite" ,sqlite) ("zlib" ,zlib))) (propagated-inputs `(("nspr" ,nspr))) ; required by nss.pc. - (native-inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + ("libfaketime" ,libfaketime))) ;for tests ;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when ;; another build is happening concurrently on the same machine. From e005ddc223683f030d4dc64588968e474328eb65 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 10:14:57 +0200 Subject: [PATCH 370/435] gnu: libgtextutils: Re-instate custom bootstrap phase. The source lacks a standard bootstrap script so the bootstrap phase is skipped otherwise. * gnu/packages/textutils.smc (libgtextutils)[arguments]: Replace 'bootstrap phase with upstream's bootstrap phase. --- gnu/packages/textutils.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index e9a4ab3d68..cda79231f1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -198,6 +198,11 @@ encoding, supporting Unicode version 9.0.0.") (sha256 (base32 "0jiybkb2z58wa2msvllnphr4js2hvjvh988pavb3mzkgr6ihwbkr")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "sh" "reconf")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From 45a2346f329935bd6837e5fa3eca6232ef694242 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:39:09 +0200 Subject: [PATCH 371/435] gnu: python-pytest-localserver: Fix test suite. * gnu/packages/check.scm (python-pytest-localserver): Replace custom 'check phase. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 24a9902434..d85295206a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1351,11 +1351,11 @@ the last py.test invocation.") "08f06rvj31wqf0vgmd1waya87r7vy6x8ck48lxl3dxy83q5gcam7")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases + '(#:phases + (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "py.test" "--genscript=runtests.py") - (invoke "py.test")))))) + (invoke "py.test" "-v")))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-requests" ,python-requests) From 74854d11ceb6d54c5ba27a7554a69577ddc983fa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:40:29 +0200 Subject: [PATCH 372/435] gnu: python-pytest-localserver: Update to 0.5.0. * gnu/packages/check.scm (python-pytest-localserver): Update to 0.5.0. --- gnu/packages/check.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d85295206a..937e4e094c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1342,13 +1342,13 @@ the last py.test invocation.") (define-public python-pytest-localserver (package (name "python-pytest-localserver") - (version "0.4.1") + (version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-localserver" version)) - (sha256 - (base32 - "08f06rvj31wqf0vgmd1waya87r7vy6x8ck48lxl3dxy83q5gcam7")))) + (method url-fetch) + (uri (pypi-uri "pytest-localserver" version)) + (sha256 + (base32 + "1hpgpxrpfq5c731ndnsay2lc0y9nh2wy9fn1f83s3z8xkn82fm1s")))) (build-system python-build-system) (arguments '(#:phases From 774f8bbeb1f3515c3af08e67f24e508e7c4cc067 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 18 Nov 2018 11:54:53 +0200 Subject: [PATCH 373/435] gnu: linkchecker: Use 'git-file-name' for the source. * gnu/packages/web.scm (linkchecker)[source]: Add missing 'file-name' field. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d56b82ce48..db1654afac 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5771,6 +5771,7 @@ Instagram and YouTube.") (uri (git-reference (url "https://github.com/linkchecker/linkchecker") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187")))) From af50b4abc0b577f7892dafce1a5e6f57150b88b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 18 Nov 2018 10:18:42 +0100 Subject: [PATCH 374/435] gnu: qt@5: Fix build failure on glibc 2.28. * gnu/packages/patches/qt-5-renameat2.patch: New file. * gnu/packages/qt.scm (qt)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/qt-5-renameat2.patch | 35 +++++++++++++++++++++++ gnu/packages/qt.scm | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qt-5-renameat2.patch diff --git a/gnu/local.mk b/gnu/local.mk index c4299fcbe4..447f08d201 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1099,6 +1099,7 @@ dist_patch_DATA = \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ + %D%/packages/patches/qt-5-renameat2.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-test-fix-regex.patch \ diff --git a/gnu/packages/patches/qt-5-renameat2.patch b/gnu/packages/patches/qt-5-renameat2.patch new file mode 100644 index 0000000000..036070c7ff --- /dev/null +++ b/gnu/packages/patches/qt-5-renameat2.patch @@ -0,0 +1,35 @@ +Avoid conflicting declaration of 'renameat2' on glibc 2.28 +(see .) + +Patch from +by Andreas Müller . + +--- + src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index be6ce48d0cb..1bf1bebc7f1 100644 +--- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp +@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); + # define FICLONE _IOW(0x94, 9, int) + #endif + ++// renameat2/statx features for non bootstrapped build ++#ifndef QT_BOOTSTRAPPED ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++# define QT_FEATURE_statx -1 ++#endif ++#endif ++ + # if defined(Q_OS_ANDROID) + // renameat2() and statx() are disabled on Android because quite a few systems + // come with sandboxes that kill applications that make system calls outside a +-- +2.14.4 + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cffebc7bff..c4407fea29 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2018 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Thomas Danckaert @@ -121,6 +121,7 @@ system, and the core design of Django is reused in Grantlee.") (sha256 (base32 "10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466")) + (patches (search-patches "qt-5-renameat2.patch")) (modules '((guix build utils))) (snippet '(begin From 8504d1922240b29815fd3e1e231e27da391338cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 18 Nov 2018 11:16:22 +0100 Subject: [PATCH 375/435] gnu: spice: Run tests sequentially. * gnu/packages/spice.scm (spice)[arguments]: Add #:parallel-tests?. --- gnu/packages/spice.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index fb121a0581..94e6aa8438 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -211,6 +211,10 @@ which allows users to view a desktop computing environment.") `(#:configure-flags '("--enable-lz4" "--enable-automated-tests") + + ;; Several tests appear to be opening the same sockets concurrently. + #:parallel-tests? #f + #:phases (modify-phases %standard-phases (add-before 'check 'use-empty-ssl-cert-file (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t))))) From 2d546858b139e5fcf2cbdf9958a17fd98803ac4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 18 Nov 2018 23:12:36 +0100 Subject: [PATCH 376/435] gnu: hurd: Build against glibc 2.28. Version 2.28 of glibc is the first in a long time that fully supports GNU/Hurd. This change updates the Hurd and Mach to provide the features glibc 2.28 expects and adjusts the cross-compilation tool chain for "i586-pc-gnu". * gnu/packages/base.scm (glibc/linux): Rename to... (glibc): ... this. [propagated-inputs]: Add 'hurd-target?' case. [arguments]: Use '--disable-werror' when 'hurd-target?'. Add 'augment-libc.so' phase when 'hurd-target?'. [native-inputs]: Add MIG and PERL when 'hurd-target?'. (glibc/hurd, glibc-for-target): Remove (glibc/hurd-headers): Inherit from GLIBC, not GLIBC/HURD. [arguments]: Remove "--enable-obsolete-rpc" configure flag and 'patch-configure-script' phase. * gnu/packages/cross-base.scm (cross-kernel-headers)[xglibc/hurd-headers]: Move 'set-cross-headers-path' after 'unpack'. * gnu/packages/cross-base.scm (cross-libc)[cross-libc-for-target]: Remove. Pass "--disable-werror" when TARGET matches 'hurd-triplet?'. * gnu/packages/hurd.scm (hurd-target?, patch-url): New procedures. (gnumach-headers)[source](patches, modules, snippet): New fields. (hurd-headers): Use Git commit 98b3390. [native-inputs]: Add AUTOCONF and AUTOMAKE. [arguments]: Add "ac_cv_func_*" configure flags. (hurd-minimal)[native-inputs]: Remove. [arguments]: In 'build' phase, build "include/assert-backtrace.h" first. --- gnu/packages/base.scm | 139 ++++++++++-------------------------- gnu/packages/cross-base.scm | 18 ++--- gnu/packages/hurd.scm | 136 ++++++++++++++++++++++++----------- 3 files changed, 138 insertions(+), 155 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3a1186673e..60f8051dc6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -577,7 +577,9 @@ store.") (export make-ld-wrapper) -(define-public glibc/linux +(define-public glibc + ;; This is the GNU C Library, used on GNU/Linux and GNU/Hurd. Prior to + ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") ;; Note: Always use a dot after the minor version since various places rely @@ -608,8 +610,13 @@ store.") (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc - ;; users should automatically pull Linux headers as well. - (propagated-inputs `(("kernel-headers" ,linux-libre-headers))) + ;; users should automatically pull Linux headers as well. On GNU/Hurd, + ;; libc provides , which includes a bunch of Hurd and Mach headers, + ;; so both should be propagated. + (propagated-inputs + (if (hurd-target?) + `(("hurd-core-headers" ,hurd-core-headers)) + `(("kernel-headers" ,linux-libre-headers)))) (outputs '("out" "debug" "static")) ;9 MiB of .a files @@ -664,7 +671,13 @@ store.") ;; Use our Bash instead of /bin/sh. (string-append "BASH_SHELL=" (assoc-ref %build-inputs "bash") - "/bin/bash")) + "/bin/bash") + + ;; On GNU/Hurd we get discarded-qualifiers warnings for + ;; 'device_write_inband' among other things. Ignore them. + ,@(if (hurd-target?) + '("--disable-werror") + '())) #:tests? #f ; XXX #:phases (modify-phases %standard-phases @@ -769,7 +782,18 @@ store.") (filter linker-script? (map (cut string-append slib "/" <>) files))) - #t)))))) + #t))) + + ,@(if (hurd-target?) + '((add-after 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" + " libmachuser.so libhurduser.so")))) + #t))) + '())))) (inputs `(("static-bash" ,static-bash))) @@ -778,7 +802,12 @@ store.") (native-inputs `(("texinfo" ,texinfo) ("perl" ,perl) ("bison" ,bison) - ("gettext" ,gettext-minimal))) + ("gettext" ,gettext-minimal) + + ,@(if (hurd-target?) + `(("mig" ,mig) + ("perl" ,perl)) + '()))) (native-search-paths ;; Search path for packages that provide locale data. This is useful @@ -800,89 +829,6 @@ with the Linux kernel.") (license lgpl2.0+) (home-page "https://www.gnu.org/software/libc/"))) -(define-public glibc/hurd - ;; The Hurd's libc variant. - (package (inherit glibc/linux) - (name "glibc-hurd") - (version "2.23") - (source (origin - (method url-fetch) - (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-" - version "-hurd+libpthread-20161218" ".tar.gz")) - (sha256 - (base32 - "0vpdv05j6j3ria5bw8gp468i64gij94cslxkxj9xkfgi6p615b8p")))) - - ;; Libc provides , which includes a bunch of Hurd and Mach headers, - ;; so both should be propagated. - (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers))) - (native-inputs - `(,@(package-native-inputs glibc/linux) - ("mig" ,mig) - ("perl" ,perl))) - - (arguments - (substitute-keyword-arguments (package-arguments glibc/linux) - ((#:phases original-phases) - ;; Add libmachuser.so and libhurduser.so to libc.so's search path. - ;; See . - `(modify-phases ,original-phases - (add-after 'install 'augment-libc.so - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libc.so") - (("/[^ ]+/lib/libc.so.0.3") - (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so")))) - #t)) - (add-after 'pre-configure 'pre-configure-set-pwd - (lambda _ - ;; Use the right 'pwd'. - (substitute* "configure" - (("/bin/pwd") "pwd")) - #t)) - (replace 'build - (lambda _ - ;; Force mach/hurd/libpthread subdirs to build first in order to avoid - ;; linking errors. - ;; See - (let ((flags (list "-j" (number->string (parallel-job-count))))) - (define (make target) - (apply invoke "make" target flags)) - (make "mach/subdir_lib") - (make "hurd/subdir_lib") - (make "libpthread/subdir_lib") - (apply invoke "make" flags)))))) - ((#:configure-flags original-configure-flags) - `(append (list "--host=i586-pc-gnu" - - ;; We need this to get a working openpty() function. - "--enable-pt_chown" - - ;; - "--disable-werror" - - ;; nscd fails to build for GNU/Hurd: - ;; . - ;; Disable it. - "--disable-nscd") - (filter (lambda (flag) - (not (string-prefix? "--enable-kernel=" flag))) - ,original-configure-flags))))) - (synopsis "The GNU C Library (GNU Hurd variant)") - (supported-systems %hurd-systems))) - -(define* (glibc-for-target #:optional - (target (or (%current-target-system) - (%current-system)))) - "Return the glibc for TARGET, GLIBC/LINUX for a Linux host or -GLIBC/HURD for a Hurd host" - (match target - ((or "i586-pc-gnu" "i586-gnu") glibc/hurd) - (_ glibc/linux))) - -(define-syntax glibc - (identifier-syntax (glibc-for-target))) - ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) @@ -1121,18 +1067,17 @@ command.") (license gpl3+))) ; some files are under GPLv2+ (define-public glibc/hurd-headers - (package (inherit glibc/hurd) + (package (inherit glibc) (name "glibc-hurd-headers") (outputs '("out")) (propagated-inputs `(("gnumach-headers" ,gnumach-headers) ("hurd-headers" ,hurd-headers))) (arguments - (substitute-keyword-arguments (package-arguments glibc/hurd) + (substitute-keyword-arguments (package-arguments glibc) ;; We just pass the flags really needed to build the headers. ((#:configure-flags _) `(list "--enable-add-ons" - "--host=i586-pc-gnu" - "--enable-obsolete-rpc")) + "--host=i586-pc-gnu")) ((#:phases _) '(modify-phases %standard-phases (replace 'install @@ -1147,13 +1092,7 @@ command.") (open-output-file (string-append out "/include/gnu/stubs.h")))) #t)) - (delete 'build) ; nothing to build - (add-before 'configure 'patch-configure-script - (lambda _ - ;; Use the right 'pwd'. - (substitute* "configure" - (("/bin/pwd") "pwd")) - #t)))))))) + (delete 'build))))))) ; nothing to build (define-public tzdata (package diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bbd779ae4e..2fcb7fb36b 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis @@ -356,7 +356,7 @@ target that libc." ,@(package-arguments glibc/hurd-headers)) ((#:phases phases) `(modify-phases ,phases - (add-before 'pre-configure 'set-cross-headers-path + (add-after 'unpack 'set-cross-headers-path (lambda* (#:key inputs #:allow-other-keys) (let* ((mach (assoc-ref inputs "gnumach-headers")) (hurd (assoc-ref inputs "hurd-headers")) @@ -426,17 +426,9 @@ target that libc." (xheaders (cross-kernel-headers target))) "Return a libc cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS and the cross tool chain." - (define (cross-libc-for-target target) - "Return libc depending on TARGET." - (match target - ((or "i586-pc-gnu" "i586-gnu") glibc/hurd) - (_ glibc/linux))) - - ;; Use (cross-libc-for-target ...) to determine the correct libc to use. - (if (cross-newlib? target) (native-libc target) - (let ((libc (cross-libc-for-target target))) + (let ((libc glibc)) (package (inherit libc) (name (string-append "glibc-cross-" target)) (arguments @@ -457,7 +449,9 @@ XBINUTILS and the cross tool chain." ,@(package-arguments libc)) ((#:configure-flags flags) `(cons ,(string-append "--host=" target) - ,flags)) + ,(if (hurd-triplet? target) + `(cons "--disable-werror" ,flags) + flags))) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'set-cross-kernel-headers-path diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d6c1fb5e64..938cb116ca 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,17 +25,25 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages autotools) #:use-module (gnu packages flex) #:use-module (gnu packages bison) #:use-module (gnu packages perl) #:use-module (gnu packages base) #:use-module (guix git-download) - #:export (hurd-triplet?)) + #:export (hurd-triplet? + hurd-target?)) (define (hurd-triplet? triplet) (and (string-suffix? "-gnu" triplet) (not (string-contains triplet "linux")))) +(define (hurd-target?) + "Return true if the cross-compilation target or the current system is +GNU/Hurd." + (or (and=> (%current-target-system) hurd-triplet?) + (string-suffix? (%current-system) "-gnu"))) + (define (gnumach-source-url version) (string-append "mirror://gnu/gnumach/gnumach-" version ".tar.gz")) @@ -43,6 +52,10 @@ (string-append "mirror://gnu/hurd/hurd-" version ".tar.gz")) +(define (patch-url repository commit) + (string-append "https://git.savannah.gnu.org/cgit/hurd/" repository + ".git/patch/?id=" commit)) + (define-public gnumach-headers (package (name "gnumach-headers") @@ -53,7 +66,24 @@ (uri (gnumach-source-url version)) (sha256 (base32 - "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")))) + "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")) + (patches (list (origin + ;; This patch adds , which defines the + ;; VM_WIRE_* constants needed by glibc 2.28. + (method url-fetch) + (uri (patch-url "gnumach" "2b0f19f602e08fd9d37268233b962674fd592634")) + (sha256 + (base32 + "01iajnwsmka0w9hwjkxxijc4xfhwqbvlkw1w8n71hpnhfixd0y28")) + (file-name "gnumach-vm-wire-header.patch")))) + (modules '((guix build utils))) + (snippet + '(begin + ;; Actually install vm_wire.h. + (substitute* "Makefile.in" + (("^include_mach_HEADERS =") + "include_mach_HEADERS = include/mach/vm_wire.h")) + #t)))) (build-system gnu-build-system) (arguments `(#:phases @@ -110,56 +140,71 @@ communication.") (license gpl2+))) (define-public hurd-headers - (package - (name "hurd-headers") - (version "0.9") - (source (origin - (method url-fetch) - (uri (hurd-source-url version)) - (sha256 - (base32 - "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw")))) - (build-system gnu-build-system) - (native-inputs - `(("mig" ,mig))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'install - (lambda _ - (invoke "make" "install-headers" "no_deps=t"))) - (delete 'build)) + ;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and + ;; 'file_exec_paths' RPCs that glibc 2.28 expects. + (let ((revision "0") + (commit "98b33905c89b7e5c309c74ae32302a5745901a6e")) + (package + (name "hurd-headers") + (version "0.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/hurd.git") + (commit commit))) + (sha256 + (base32 + "1mj22sxgscas2675vrbxr477mwbxdj68pqcrh65lbir8qlssrgrf")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("mig" ,mig) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda _ + (invoke "make" "install-headers" "no_deps=t"))) + (delete 'build)) - #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants - ;; that. - ,@(if (%current-target-system) - '() - '("--host=i586-pc-gnu")) + #:configure-flags '( ;; Pretend we're on GNU/Hurd; 'configure' wants + ;; that. + ,@(if (%current-target-system) + '() + '("--host=i586-pc-gnu")) - ;; Reduce set of dependencies. - "--without-parted" - "--disable-ncursesw" - "--disable-test" - "--without-libbz2" - "--without-libz" - ;; Skip the clnt_create check because it expects - ;; a working glibc causing a circular dependency. - "ac_cv_search_clnt_create=no") + ;; Reduce set of dependencies. + "--without-parted" + "--disable-ncursesw" + "--disable-test" + "--without-libbz2" + "--without-libz" + ;; Skip the clnt_create check because it expects + ;; a working glibc causing a circular dependency. + "ac_cv_search_clnt_create=no" - #:tests? #f)) - (home-page "https://www.gnu.org/software/hurd/hurd.html") - (synopsis "GNU Hurd headers") - (description - "This package provides C headers of the GNU Hurd, used to build the GNU C + ;; Annihilate the checks for the 'file_exec_paths' + ;; & co. libc functions to avoid "link tests are + ;; not allowed after AC_NO_EXECUTABLES" error. + "ac_cv_func_file_exec_paths=no" + "ac_cv_func_exec_exec_paths=no" + "ac_cv_func__hurd_exec_paths=no" + "ac_cv_func_file_futimens=no") + + #:tests? #f)) + (home-page "https://www.gnu.org/software/hurd/hurd.html") + (synopsis "GNU Hurd headers") + (description + "This package provides C headers of the GNU Hurd, used to build the GNU C Library and other user programs.") - (license gpl2+))) + (license gpl2+)))) (define-public hurd-minimal (package (inherit hurd-headers) (name "hurd-minimal") (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) - (native-inputs - `(("mig" ,mig))) (arguments (substitute-keyword-arguments (package-arguments hurd-headers) ((#:phases _) @@ -178,6 +223,11 @@ Library and other user programs.") #t))) (replace 'build (lambda _ + ;; Install & co. + (invoke "make" "-Clibshouldbeinlibc" + "../include/assert-backtrace.h") + + ;; Build libihash. (invoke "make" "-Clibihash" "libihash.a"))))))) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") From 4e94cdb652ca30b74ad68153da976827c8ea16a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 11:57:12 +0200 Subject: [PATCH 377/435] gnu: python-astroid: Update to 2.0.4. * gnu/packages/python.scm (python-astroid): Update to 2.0.4. [source]: Switch to pypi source. [native-inputs]: Add python-dateutil, python-nose, python-pytest, python-pytest-runner. [arguments]: Add phase to remove spurious test failure. Update custom 'check phase. (python2-astroid): Update to 1.6.5. [source]: Use pypi source. [arguments]: Add phase to remove spurious test failure. --- gnu/packages/python.scm | 60 +++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ba7ebcbdbe..1e67640763 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11361,28 +11361,37 @@ clone, while other processes access the original tree.") (define-public python-astroid (package (name "python-astroid") - (version "1.5.3") + (version "2.0.4") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/PyCQA/astroid/archive/astroid-" - version ".tar.gz")) + (uri (pypi-uri "astroid" version)) (sha256 (base32 - "0isn5p7f9n48hmksgbrj7dkm9dyglnayzn5jngk37qywg8a74ngn")))) + "138svbm88w5k0y2nvl4svyas1jfhcc5iy0d2ywkbcpn9kq8ks0f7")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) ("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) + (native-inputs + `(("python-dateutil" ,python-dateutil) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-spurious-test + (lambda _ + ;; This can be removed after upgrading from python-3.7 + ;; https://github.com/PyCQA/astroid/issues/593 + ;; https://bugs.python.org/issue34056 + (delete-file "astroid/tests/unittest_modutils.py") + #t)) (replace 'check - (lambda _ - (zero? (system* "python" "-m" "unittest" "discover" - "-p" "unittest*.py"))))))) + (lambda _ + (invoke "pytest" "astroid")))))) (home-page "https://github.com/PyCQA/astroid") (synopsis "Common base representation of python source code for pylint and other projects") @@ -11402,12 +11411,35 @@ builds partial trees by inspecting living objects.") (let ((base (package-with-python2 (strip-python2-variant python-astroid)))) (package (inherit base) - (propagated-inputs - `(("python2-backports-functools-lru-cache" - ,python2-backports-functools-lru-cache) - ("python2-enum34" ,python2-enum34) - ("python2-singledispatch" ,python2-singledispatch) - ,@(package-propagated-inputs base)))))) + ;; Version 2.x removes python2 support. + (version "1.6.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "astroid" version)) + (sha256 + (base32 + "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'remove-spurious-test + (lambda _ + ;; https://github.com/PyCQA/astroid/issues/276 + (delete-file "astroid/tests/unittest_brain.py") + #t)) + (replace 'check + (lambda _ + (invoke"python" "-m" "unittest" "discover" + "-p" "unittest*.py"))))))) + (native-inputs `()) + (propagated-inputs + `(("python2-backports-functools-lru-cache" + ,python2-backports-functools-lru-cache) + ("python2-enum34" ,python2-enum34) + ("python2-singledispatch" ,python2-singledispatch) + ,@(package-propagated-inputs base)))))) (define-public python-isort (package From 24a2e19c432580a1a4900417ce81a4826e41e8f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 15:17:12 +0200 Subject: [PATCH 378/435] gnu: python-waf: Use a proper directory structure. Fixes . * gnu/packages/python.scm (python-waf): Replace custom 'install phase to install "waf" binary into the bin directory. Remove the 'wrap phase. * gnu/packages/video.scm (mpv)[arguments]: Adjust the 'setup-waf phase accordingly. --- gnu/packages/python.scm | 9 ++++++--- gnu/packages/video.scm | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1e67640763..07ab0e5293 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5607,9 +5607,12 @@ so it might be a tiny bit slower.") (lambda _ (invoke "python" "waf" "--version"))) (replace 'install - (lambda _ - (copy-file "waf" %output) - #t))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "waf" (string-append out "/bin"))) + #t)) + ;; waf breaks when it is wrapped. + (delete 'wrap)))) (home-page "https://waf.io/") (synopsis "Python-based build system") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f4e461119b..8a5e730bd5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1180,7 +1180,8 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (add-before 'configure 'setup-waf (lambda* (#:key inputs #:allow-other-keys) - (copy-file (assoc-ref inputs "waf") "waf") + (let ((waf (assoc-ref inputs "waf"))) + (copy-file (string-append waf "/bin/waf") "waf")) (setenv "CC" "gcc") #t))) #:configure-flags (list "--enable-libmpv-shared" From 4cf879fefbce0a4e960f8c90e1f8b598d7a6e3df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 Nov 2018 15:38:52 +0200 Subject: [PATCH 379/435] gnu: ntk: Don't use bundled waf. * gnu/packages/fltk.scm (ntk)[inputs]: Add python-waf. [arguments]: Add custom phase to replace vendored waf. --- gnu/packages/fltk.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index a3c088c2e8..972506c8c5 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -115,6 +115,12 @@ UI builder called FLUID that can be used to create applications in minutes.") #:configure-flags '("--enable-gl") #:phases (modify-phases %standard-phases + (add-before 'configure 'setup-waf + (lambda* (#:key inputs #:allow-other-keys) + (let ((waf (assoc-ref inputs "waf"))) + (delete-file "waf") + (copy-file (string-append waf "/bin/waf") "waf")) + #t)) (add-before 'configure 'set-ldflags (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" @@ -123,7 +129,8 @@ UI builder called FLUID that can be used to create applications in minutes.") #t))))) (inputs `(("libjpeg" ,libjpeg) - ("glu" ,glu))) + ("glu" ,glu) + ("waf" ,python-waf))) ;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in ;; Requires. (propagated-inputs From e1f791276144bc1737ab855226d3e66e58909f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 21 Nov 2018 10:24:06 +0100 Subject: [PATCH 380/435] gnu: casync: Fix build with glibc 2.28. * gnu/packages/patches/casync-renameat2-declaration.patch: New file. * gnu/packages/sync.scm (casync)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../casync-renameat2-declaration.patch | 27 +++++++++++++++++++ gnu/packages/sync.scm | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/casync-renameat2-declaration.patch diff --git a/gnu/local.mk b/gnu/local.mk index 358222729a..aeff3f8298 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -607,6 +607,7 @@ dist_patch_DATA = \ %D%/packages/patches/cairo-setjmp-wrapper.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \ + %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ diff --git a/gnu/packages/patches/casync-renameat2-declaration.patch b/gnu/packages/patches/casync-renameat2-declaration.patch new file mode 100644 index 0000000000..74c2ca7b3c --- /dev/null +++ b/gnu/packages/patches/casync-renameat2-declaration.patch @@ -0,0 +1,27 @@ +Fix build failure on glibc 2.28 where 'renameat2' would end up being +declared twice: . + +From 625244ca47e8ee1375d2d0092271bfd13b0913ea Mon Sep 17 00:00:00 2001 +From: Daniel Mack +Date: Tue, 13 Nov 2018 17:52:48 +0100 +Subject: [PATCH] meson.build: pass -D_GNU_SOURCE when checking for functions + +As described in #166, -D_GNU_SOURCE needs to be passed to the meson function +availability checker. h/t to @tomeon for providing a link to the solution as +well. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f42ed16..c0f741e 100644 +--- a/meson.build ++++ b/meson.build +@@ -78,6 +78,6 @@ foreach ident : [ + ['copy_file_range', '''#include + #include '''], + ] +- have = cc.has_function(ident[0], prefix : ident[1]) ++ have = cc.has_function(ident[0], args : '-D_GNU_SOURCE', prefix : ident[1]) + conf.set10('HAVE_' + ident[0].to_upper(), have) + endforeach diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index e0b0af3d96..60e66437a8 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -214,7 +214,8 @@ and does not hamper local file system performance.") (sha256 (base32 "0znkp3fcksrykcsv06y2mjvf2lbwmin25snmvfa8i5qfm3f4rm88")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (patches (search-patches "casync-renameat2-declaration.patch")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) From c3d8c6ac7e457bbde72ce54cd4caf4b9610e2d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 21 Nov 2018 11:59:37 +0100 Subject: [PATCH 381/435] gnu: emacs-pdf-tools: Use 'git-fetch'. * gnu/packages/emacs.scm (emacs-pdf-tools)[source]: Switch to GIT-FETCH. [arguments]: In 'emacs-patch-variables' phase, make files writable. --- gnu/packages/emacs.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ce1add3915..c386b080e7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1593,15 +1593,15 @@ filters, new key bindings and faces. It can be enabled by (package (name "emacs-pdf-tools") (version "0.80") + (home-page "https://github.com/politza/pdf-tools") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/politza/pdf-tools/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "06imydn3a92vr57azpn1zhqc14kxyyslmyi9ldsyphan9b724gb6")))) + "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests @@ -1626,6 +1626,8 @@ filters, new key bindings and faces. It can be enabled by (lambda _ (chdir "../lisp") #t)) (add-after 'enter-lisp-dir 'emacs-patch-variables (lambda* (#:key outputs #:allow-other-keys) + (for-each make-file-writable (find-files ".")) + ;; Set path to epdfinfo program. (emacs-substitute-variables "pdf-info.el" ("pdf-info-epdfinfo-program" @@ -1659,7 +1661,6 @@ filters, new key bindings and faces. It can be enabled by files. The key difference is that pages are not pre-rendered by e.g. ghostscript and stored in the file-system, but rather created on-demand and stored in memory.") - (home-page "https://github.com/politza/pdf-tools") (license license:gpl3+))) (define-public emacs-dash From e555bbfc48ebb4ca019d3648324b1900a891cda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 21 Nov 2018 12:43:57 +0100 Subject: [PATCH 382/435] gnu: emacs-pdf-tools: Fix build with recent Poppler. * gnu/packages/patches/emacs-pdf-tools-poppler.patch: New file. * gnu/packages/emacs.scm (emacs-pdf-tools)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 3 +- .../patches/emacs-pdf-tools-poppler.patch | 41 +++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-pdf-tools-poppler.patch diff --git a/gnu/local.mk b/gnu/local.mk index aeff3f8298..4b194d7b13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -667,6 +667,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ + %D%/packages/patches/emacs-pdf-tools-poppler.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-realgud-fix-configure-ac.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c386b080e7..dfcee56afe 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1601,7 +1601,8 @@ filters, new key bindings and faces. It can be enabled by (file-name (git-file-name name version)) (sha256 (base32 - "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s")))) + "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s")) + (patches (search-patches "emacs-pdf-tools-poppler.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests diff --git a/gnu/packages/patches/emacs-pdf-tools-poppler.patch b/gnu/packages/patches/emacs-pdf-tools-poppler.patch new file mode 100644 index 0000000000..0477508fa9 --- /dev/null +++ b/gnu/packages/patches/emacs-pdf-tools-poppler.patch @@ -0,0 +1,41 @@ +Fix build issue with recent Poppler: + . + +This combines upstream commits +6cd76dec9aece2a8daa90f17ab77fbf773157a1d..50a5297b82e26cfd52f6c00645ddc1057099d6a7 +for this file. + +diff --git a/server/poppler-hack.cc b/server/poppler-hack.cc +index 0c62f73..427f9df 100644 +--- a/server/poppler-hack.cc ++++ b/server/poppler-hack.cc +@@ -51,7 +51,10 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; + double y2; + }; + +- char *_xpoppler_goo_string_to_utf8(GooString *s) ++ // This function does not modify its argument s, but for ++ // compatibility reasons (e.g. getLength in GooString.h before 2015) ++ // with older poppler code, it can't be declared as such. ++ char *_xpoppler_goo_string_to_utf8(/* const */ GooString *s) + { + char *result; + +@@ -85,7 +88,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; + // Set the rectangle of an annotation. It was first added in v0.26. + void xpoppler_annot_set_rectangle (PopplerAnnot *a, PopplerRectangle *rectangle) + { +- GooString *state = a->annot->getAppearState (); ++ GooString *state = (GooString*) a->annot->getAppearState (); + char *ustate = _xpoppler_goo_string_to_utf8 (state); + + a->annot->setRect (rectangle->x1, rectangle->y1, +@@ -105,7 +108,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; + g_return_val_if_fail (POPPLER_IS_ANNOT_MARKUP (poppler_annot), NULL); + + annot = static_cast(POPPLER_ANNOT (poppler_annot)->annot); +- text = annot->getDate (); ++ text = (GooString*) annot->getDate (); + + return text ? _xpoppler_goo_string_to_utf8 (text) : NULL; + } From bf6859e45ad33aa631fc231b23df2d56aff97360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 21 Nov 2018 14:52:59 +0100 Subject: [PATCH 383/435] gnu: libbytesize: Make .mo file builds reproducible. * gnu/packages/c.scm (libbytesize)[sources](modules, snippet): New fields. [arguments]: Add #:configure-flags and #:phases. --- gnu/packages/c.scm | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d89b6ea00d..c5141451f0 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -185,8 +185,45 @@ compiler while still keeping it small, simple, fast and understandable.") "download/" version "/libbytesize-" version ".tar.gz")) (sha256 (base32 - "0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv")))) + "0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv")) + (modules '((guix build utils))) + (snippet + '(begin + ;; This Makefile hard-codes MSGMERGE et al. instead of + ;; honoring what 'configure' detected. Fix that. + (substitute* "po/Makefile.in" + (("^MSGMERGE = msgmerge") + "MSGMERGE = @MSGMERGE@\n")) + #t)))) (build-system gnu-build-system) + (arguments + ;; When running "make", the POT files are built with the build time as + ;; their "POT-Creation-Date". Later on, "make" notices that .pot + ;; files were updated and goes on to run "msgmerge"; as a result, the + ;; non-deterministic POT-Creation-Date finds its way into .po files, + ;; and then in .gmo files. To avoid that, simply make sure 'msgmerge' + ;; never runs. See . + '(#:configure-flags '("ac_cv_path_MSGMERGE=true") + + #:phases (modify-phases %standard-phases + (add-after 'configure 'create-merged-po-files + (lambda _ + ;; Create "merged PO" (.mpo) files so that 'msgmerge' + ;; doesn't need to run. + (for-each (lambda (po-file) + (let ((merged-po + (string-append (dirname po-file) "/" + (basename po-file + ".po") + ".mpo"))) + (copy-file po-file merged-po))) + (find-files "po" "\\.po$")) + #t))) + + ;; One test fails because busctl (systemd only?) and python2-pocketlint + ;; are missing. Should we fix it, we would need the "python-2" , + ;; "python2-polib" and "python2-six" native-inputs. + #:tests? #f)) (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) @@ -194,10 +231,6 @@ compiler while still keeping it small, simple, fast and understandable.") (inputs `(("mpfr" ,mpfr) ("pcre" ,pcre))) - ;; One test fails because busctl (systemd only?) and python2-pocketlint - ;; are missing. Should we fix it, we would need the "python-2" , - ;; "python2-polib" and "python2-six" native-inputs. - (arguments `(#:tests? #f)) (home-page "https://github.com/storaged-project/libbytesize") (synopsis "Tiny C library for working with arbitrary big sizes in bytes") (description From 148caae0499028c12a0f51ca2f435124c06d46ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 21 Nov 2018 22:43:40 +0100 Subject: [PATCH 384/435] gnu: python-numpy: Update to 1.15.4. * gnu/packages/python.scm (python-numpy): Update to 1.15.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 52c130e1f3..5e41224edc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2939,7 +2939,7 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.15.1") + (version "1.15.4") (source (origin (method url-fetch) @@ -2948,7 +2948,7 @@ between language specification and implementation aspects.") version "/numpy-" version ".tar.gz")) (sha256 (base32 - "1yp75fkqk7abq3mrbqdf0pdmr2phkr2mnng0dbqqvvrmv7jwq71w")))) + "102vcl2qq4pjbm7a3d67vkkvn4466ngia1d8wi5avqwqh8j0jvkn")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) From 437c78bcfb268fe9d4e6116b2eb083ed873215f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 00:00:44 +0100 Subject: [PATCH 385/435] gnu: python-tblib: Fix test failure with Python 3.7. * gnu/packages/python.scm (python-tblib)[arguments]: Add 'adjust-tests' phase. --- gnu/packages/python.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5e41224edc..569a1a5732 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9021,6 +9021,14 @@ own code, responding to click events and updating clock every second.") (arguments `(#:phases (modify-phases %standard-phases + (add-before 'check 'adjust-tests + (lambda _ + (when (which "python3") + ;; Adjust the example output to match that of Python 3.7: + ;; . + (substitute* "README.rst" + (("Exception\\('fail',") "Exception('fail'")) + #t))) (replace 'check (lambda _ ;; Upstream runs tests after installation and the package itself From 7ff3f3d22caaf03948a60ae691313db28f4fab06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 01:47:36 +0100 Subject: [PATCH 386/435] gnu: python-scikit-learn: Update to 0.20.1. * gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/machine-learning.scm (python-scikit-learn): Update to 0.20.1. [source](patches): Remove. [arguments]: Skip network tests with pytest instead of deleting files. Make sure $HOME is writable. (python2-scikit-learn): Rewrite in terms of PACKAGE-WITH-PYTHON2. --- gnu/local.mk | 1 - gnu/packages/machine-learning.scm | 35 +++++-------------- ...cikit-learn-fix-test-non-determinism.patch | 25 ------------- 3 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch diff --git a/gnu/local.mk b/gnu/local.mk index e56f8a28dc..b67958d083 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1090,7 +1090,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ - %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 09c525ff20..4b2447ece0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -706,7 +706,7 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.19.2") + (version "0.20.1") (source (origin (method git-fetch) @@ -716,9 +716,7 @@ computing environments.") (file-name (git-file-name name version)) (sha256 (base32 - "1dk9hdj01c0bny4ps78b7869fjw9gr6qklxf6wyql8h6nh4k19xm")) - (patches (search-patches - "python-scikit-learn-fix-test-non-determinism.patch")))) + "0qv7ir1fy9vjar3llc72yxmfja3gxm5icdf0y3q57vsn3wcdglkz")))) (build-system python-build-system) (arguments `(#:phases @@ -729,11 +727,11 @@ computing environments.") (lambda _ ;; Restrict OpenBLAS threads to prevent segfaults while testing! (setenv "OPENBLAS_NUM_THREADS" "1") - ;; Disable tests that require network access - (delete-file "sklearn/datasets/tests/test_mldata.py") - (delete-file "sklearn/datasets/tests/test_rcv1.py") - (invoke "pytest" "sklearn") - #t)) + + ;; Some tests require write access to $HOME. + (setenv "HOME" "/tmp") + + (invoke "pytest" "sklearn" "-m" "not network"))) ;; FIXME: This fails with permission denied (delete 'reset-gzip-timestamps)))) (inputs @@ -753,24 +751,7 @@ data analysis.") (license license:bsd-3))) (define-public python2-scikit-learn - (let ((parent (package-with-python2 python-scikit-learn))) - (package (inherit parent) - (arguments - (substitute-keyword-arguments (package-arguments parent) - ((#:phases phases) - `(modify-phases ,phases - (replace 'check - (lambda _ - ;; Restrict OpenBLAS threads to prevent segfaults while testing! - (setenv "OPENBLAS_NUM_THREADS" "1") - ;; Some tests expect to be able to write to HOME. - (setenv "HOME" "/tmp") - ;; Disable tests that require network access - (delete-file "sklearn/datasets/tests/test_kddcup99.py") - (delete-file "sklearn/datasets/tests/test_mldata.py") - (delete-file "sklearn/datasets/tests/test_rcv1.py") - (invoke "pytest" "sklearn") - #t))))))))) + (package-with-python2 python-scikit-learn)) (define-public python-autograd (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") diff --git a/gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch b/gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch deleted file mode 100644 index 90328cc0eb..0000000000 --- a/gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch +++ /dev/null @@ -1,25 +0,0 @@ -This patch stops a test sometimes failing because of non-determinism. See -https://github.com/scikit-learn/scikit-learn/pull/9542 - -From ff9f6db6e8b59c2b3528c8137ed4054f57c1d7c4 Mon Sep 17 00:00:00 2001 -From: Hanmin Qin -Date: Sun, 13 Aug 2017 22:13:49 +0800 -Subject: [PATCH] add random_state - ---- - sklearn/tests/test_kernel_ridge.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sklearn/tests/test_kernel_ridge.py b/sklearn/tests/test_kernel_ridge.py -index 4750a096ac6..979875870b6 100644 ---- a/sklearn/tests/test_kernel_ridge.py -+++ b/sklearn/tests/test_kernel_ridge.py -@@ -10,7 +10,7 @@ - from sklearn.utils.testing import assert_array_almost_equal - - --X, y = make_regression(n_features=10) -+X, y = make_regression(n_features=10, random_state=0) - Xcsr = sp.csr_matrix(X) - Xcsc = sp.csc_matrix(X) - Y = np.array([y, y]).T From 691d39a267be141edbafce77472afd2415b12cd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Nov 2018 22:06:15 +0200 Subject: [PATCH 387/435] gnu: jalv: Build with python-2. * gnu/packages/audio.scm (jalv)[arguments]: Build with python-2. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3938494ba..9cee084b19 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1604,6 +1604,7 @@ synchronous execution of all clients, and low latency operation.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + #:python ,python-2 #:phases (modify-phases %standard-phases (add-before From 37751b480fccde4db000fc4072f5e23af46fa829 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 22 Nov 2018 21:55:29 +0100 Subject: [PATCH 388/435] gnu: podofo: Add patch to fix build. * gnu/packages/patches/podofo-cmake-3.12.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pdf.scm (podofo)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/patches/podofo-cmake-3.12.patch | 19 +++++++++++++++++++ gnu/packages/pdf.scm | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/podofo-cmake-3.12.patch diff --git a/gnu/local.mk b/gnu/local.mk index b67958d083..4a63faa22d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1055,6 +1055,7 @@ dist_patch_DATA = \ %D%/packages/patches/plink-1.07-unclobber-i.patch \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ + %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/poppler-CVE-2018-19149.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ diff --git a/gnu/packages/patches/podofo-cmake-3.12.patch b/gnu/packages/patches/podofo-cmake-3.12.patch new file mode 100644 index 0000000000..0a3c19b21a --- /dev/null +++ b/gnu/packages/patches/podofo-cmake-3.12.patch @@ -0,0 +1,19 @@ +The build fails with cmake 3.12.0. This patch will be obsolete with the next +release. + +https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch + + +--- a/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:26:02.921494293 +0200 ++++ b/test/TokenizerTest/CMakeLists.txt 2018-07-20 18:34:53.727136443 +0200 +@@ -2,10 +2,3 @@ + TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS}) + SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}") + ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET}) +- +-# Copy the test samples over to the build tree +-ADD_CUSTOM_COMMAND( +- TARGET TokenizerTest +- POST_BUILD +- COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects" +- ) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 28737c36e4..b89d49fd52 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -557,7 +557,8 @@ interaction.") "/podofo-" version ".tar.gz")) (sha256 (base32 - "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9")))) + "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9")) + (patches (search-patches "podofo-cmake-3.12.patch")))) (build-system cmake-build-system) (native-inputs `(("cppunit" ,cppunit) From 93d229cb868575b2c89bea2b4f61214d0838fe8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 15:59:44 +0100 Subject: [PATCH 389/435] gnu: python-loompy: Remove python-typing. * gnu/packages/bioinformatics.scm (python-loompy)[propagated-inputs]: Remove python-typing. --- gnu/packages/bioinformatics.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b913d5647d..a3eeeea027 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12400,8 +12400,7 @@ variational inference.") (propagated-inputs `(("python-h5py" ,python-h5py) ("python-numpy" ,python-numpy) - ("python-scipy" ,python-scipy) - ("python-typing" ,python-typing))) + ("python-scipy" ,python-scipy))) (home-page "https://github.com/linnarsson-lab/loompy") (synopsis "Work with .loom files for single-cell RNA-seq data") (description "The loom file format is an efficient format for very large From 72ffb5123159ab403b2882d6b6b90609fa49136b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:01:07 +0100 Subject: [PATCH 390/435] gnu: Add python-objgraph. * gnu/packages/python.scm (python-objgraph): New variable. --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 569a1a5732..3b6259c48a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9081,6 +9081,30 @@ are synchronized with data exchanges on \"channels\".") (define-public python2-greenlet (package-with-python2 python-greenlet)) +(define-public python-objgraph + (package + (name "python-objgraph") + (version "3.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "objgraph" version)) + (sha256 + (base32 + "184m09am5gpbqfaiy7l0hwh476mczbrly1dffs0rw2p1d1i2q32a")))) + (build-system python-build-system) + (propagated-inputs + `(("python-graphviz" ,python-graphviz))) + (native-inputs + `(("python-mock" ,python-mock) + ("graphviz" ,graphviz))) + (home-page "https://mg.pov.lt/objgraph/") + (synopsis "Draw Python object reference graphs with graphviz") + (description + "This package provides tools to draw Python object reference graphs with +graphviz.") + (license license:expat))) + (define-public python-gevent (package (name "python-gevent") From 936ea3d664b3c9f87824f145ef8649c07287863d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:01:21 +0100 Subject: [PATCH 391/435] gnu: python-gevent: Update to 1.3.7. * gnu/packages/python.scm (python-gevent): Update to 1.3.7. [arguments]: Find headers for greenlet in phase "do-not-use-bundled-sources". [propagated-inputs]: Add python-objgraph. --- gnu/packages/python.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3b6259c48a..01b1d352c6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9108,13 +9108,13 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "1.2.2") + (version "1.3.7") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7")) + "0b0fr04qdk1p4sniv87fh8z5psac60x01pv054kpgi94520g81iz")) (modules '((guix build utils))) (snippet '(begin @@ -9146,11 +9146,14 @@ graphviz.") (find-files "src/greentest" "\\.py$")) #t)) (add-before 'build 'do-not-use-bundled-sources - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (setenv "CONFIG_SHELL" (which "bash")) (setenv "LIBEV_EMBED" "false") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") + (setenv "CPATH" + (string-append (assoc-ref inputs "python-greenlet") + "/include/python3.7m")) #t)) (replace 'check (lambda _ @@ -9171,7 +9174,8 @@ graphviz.") (make-regexp "test_+(subprocess|core)") <>))))))))) (propagated-inputs - `(("python-greenlet" ,python-greenlet))) + `(("python-greenlet" ,python-greenlet) + ("python-objgraph" ,python-objgraph))) (native-inputs `(("libev-source" ,(package-source libev)) ("python-six" ,python-six))) From c068d0074672c0f6375773de0ef950e3a6e2ac10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:29:35 +0100 Subject: [PATCH 392/435] gnu: pigx-chipseq: Use latest snakemake. * gnu/packages/bioinformatics.scm (pigx-chipseq)[inputs]: Replace snakemake-4 with snakemake. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a3eeeea027..350d639a76 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13073,7 +13073,7 @@ expression report comparing samples in an easily configurable manner.") ("fastqc" ,fastqc) ("bowtie" ,bowtie) ("idr" ,idr) - ("snakemake" ,snakemake-4) + ("snakemake" ,snakemake) ("samtools" ,samtools) ("bedtools" ,bedtools) ("kentutils" ,kentutils))) From 92d9a1e2c6c6b60efef2ad1b7425c0f921760665 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:30:16 +0100 Subject: [PATCH 393/435] gnu: pigx-bsseq: Use latest snakemake. * gnu/packages/bioinformatics.scm (pigx-bsseq)[inputs]: Replace snakemake-4 with snakemake. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 350d639a76..3507853165 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13134,7 +13134,7 @@ in an easily configurable manner.") ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml) - ("snakemake" ,snakemake-4) + ("snakemake" ,snakemake) ("bismark" ,bismark) ("fastqc" ,fastqc) ("bowtie" ,bowtie) From d57ec906ba5b1e2581842c4dbcbfdfbc58cdad83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Nov 2018 16:30:48 +0100 Subject: [PATCH 394/435] gnu: pigx-scrnaseq: Use latest snakemake. * gnu/packages/bioinformatics.scm (pigx-scrnaseq)[inputs]: Replace snakemake-4 with snakemake. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3507853165..a193e56ed9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13184,7 +13184,7 @@ methylation and segmentation.") ("ghc-pandoc" ,ghc-pandoc) ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("samtools" ,samtools) - ("snakemake" ,snakemake-4) + ("snakemake" ,snakemake) ("star" ,star) ("r-minimal" ,r-minimal) ("r-argparser" ,r-argparser) From c491f7f8de66d0f8386ba6fd7c2da5c3c0d1b24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Nov 2018 17:47:31 +0100 Subject: [PATCH 395/435] =?UTF-8?q?gnu:=20pt-scotch,=20pt-scotch32:=20Add?= =?UTF-8?q?=20Open=C2=A0MPI=20setup=20phase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (pt-scotch)[arguments]: Use 'invoke' instead of 'system*'. Add 'mpi-setup' phase. (pt-scotch32)[arguments]: Likewise. --- gnu/packages/maths.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7dc8b62a47..ab83c9bc9f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2600,15 +2600,16 @@ YACC = bison -pscotchyy -y -b y (replace 'build (lambda _ - (and - (zero? (system* "make" - (format #f "-j~a" (parallel-job-count)) - "ptscotch" "ptesmumps")) - ;; Install the serial metis compatibility library - (zero? (system* "make" "-C" "libscotchmetis" "install"))))) - (replace - 'check - (lambda _ (zero? (system* "make" "ptcheck")))))))) + (invoke "make" (format #f "-j~a" (parallel-job-count)) + "ptscotch" "ptesmumps") + + ;; Install the serial metis compatibility library + (invoke "make" "-C" "libscotchmetis" "install"))) + (add-before 'check 'mpi-setup + ,%openmpi-setup) + (replace 'check + (lambda _ + (invoke "make" "ptcheck"))))))) (synopsis "Programs and libraries for graph algorithms (with MPI)"))) (define-public pt-scotch32 @@ -2622,15 +2623,15 @@ YACC = bison -pscotchyy -y -b y `(modify-phases ,scotch32-phases (replace 'build (lambda _ - (and - (zero? (system* "make" - (format #f "-j~a" (parallel-job-count)) - "ptscotch" "ptesmumps")) - ;; Install the serial metis compatibility library - (zero? (system* "make" "-C" "libscotchmetis" "install"))))) + (invoke "make" (format #f "-j~a" (parallel-job-count)) + "ptscotch" "ptesmumps") + ;; Install the serial metis compatibility library + (invoke "make" "-C" "libscotchmetis" "install"))) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ - (zero? (system* "make" "ptcheck")))))))) + (invoke "make" "ptcheck"))))))) (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) From 52b24ba495d674946587419c58192d940f13be4a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:47:42 +0100 Subject: [PATCH 396/435] gnu: mariadb: Update to 10.1.37 [security fixes]. This release fixes CVE-2018-3282, CVE-2018-3174, CVE-2018-3143, CVE-2018-3156, and CVE-2018-3251. See for details. * gnu/packages/databases.scm (mariadb): Update to 10.1.37. --- 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 393b13a314..0456d4508e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -621,7 +621,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.36") + (version "10.1.37") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -629,7 +629,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0n5aj76mn9rxc21l2kjmfrg10bmsyy4cic68khjr94iby262wx5d")) + "0ijdmdn9mcciwv361zfmja6b1h6qpbdqgrnnq6kkdapplyq1dmcc")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet From 01cef16f8594956a06824751f5f2a0be8b823627 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Nov 2018 14:27:55 +0100 Subject: [PATCH 397/435] gnu: rust: Don't depend on 'git'. * gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. (rust-1.20)[arguments]: Disable Cargo tests that require git. (rust-1.26)[arguments]: Likewise. --- gnu/packages/rust.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad079..8618c37761 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) #:use-module (gnu packages) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) @@ -387,7 +386,6 @@ test = { path = \"../libtest\" } ("cmake" ,cmake) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests - ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -446,6 +444,13 @@ safety and thread safety guarantees.") ;; i686-linux. (substitute* "src/tools/cargo/tests/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; These tests pull in a dependency on "git", which changes + ;; too frequently take part in the Rust toolchain. + (substitute* "src/tools/cargo/tests/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test ;; https://github.com/rust-lang/rust/issues/47863 @@ -678,6 +683,12 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; i686-linux. (substitute* "src/tools/cargo/tests/testsuite/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; Avoid dependency on "git". + (substitute* "src/tools/cargo/tests/testsuite/new.rs" + (("fn author_prefers_cargo") "#[ignore]\nfn author_prefers_cargo") + (("fn finds_author_git") "#[ignore]\nfn finds_author_git") + (("fn finds_local_author_git") "#[ignore]\nfn finds_local_author_git")) #t)) (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ From 59a1aa595bfcd997ae9186cbc644df436afed97c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 02:59:09 +0100 Subject: [PATCH 398/435] gnu: python2-cheetah: Update home page. * gnu/packages/python.scm (python-cheetah)[home-page]: Update to current. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c68aa31173..e5e02cf4a0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10714,7 +10714,7 @@ possible on all supported Python versions.") `(#:python ,python-2)) (propagated-inputs `(("python2-markdown" ,python2-markdown))) - (home-page "https://pythonhosted.org/Cheetah/") + (home-page "http://cheetahtemplate.org/") (synopsis "Template engine") (description "Cheetah is a text-based template engine and Python code generator. From 15b5f9f718e29ccd884658bb8cfbd4104d9c4026 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 02:33:40 +0100 Subject: [PATCH 399/435] gnu: python-cheetah: Update to 3.1.0. * gnu/packages/python.scm (python2-cheetah): Rename to ... (python-cheetah): ... this. Update to 3.1.0. [arguments]: Add custom 'check' phase. [propagated-inputs]: Change PYTHON2-MARKDOWN to PYTHON-MARKDOWN. (python2-cheetah): Rewrite in terms of PACKAGE-WITH-PYTHON2. --- gnu/packages/python.scm | 47 +++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e5e02cf4a0..61fcf282ee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10698,22 +10698,52 @@ possible on all supported Python versions.") (propagated-inputs `(("python2-bz2file" ,python2-bz2file) ,@(package-propagated-inputs base)))))) -(define-public python2-cheetah +(define-public python-cheetah (package - (name "python2-cheetah") - (version "2.4.4") + (name "python-cheetah") + (version "3.1.0") (source (origin (method url-fetch) - (uri (pypi-uri "Cheetah" version)) + (uri (pypi-uri "Cheetah3" version)) (sha256 (base32 - "0l5mm4lnysjkzpjr95q5ydm9xc8bv43fxmr79ypybrf1y0lq4c5y")))) + "1ihag9cxll6b86fc8v5lkhmr3brdbi4yiz16zpgw79yylmv8fgr9")))) (build-system python-build-system) (arguments - `(#:python ,python-2)) + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'use-absolute-python + (lambda _ + (substitute* "Cheetah/CheetahWrapper.py" + (("#!/usr/bin/env python") + (string-append "#!" (which "python")))) + #t)) + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append + cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" (getenv "PYTHONPATH"))) + (setenv "PATH" + (string-append (getenv "PATH") + ":" cwd "/bin")) + (setenv "TMPDIR" "/tmp") + + (substitute* "Cheetah/Tests/Test.py" + (("unittest.TextTestRunner\\(\\)") + "unittest.TextTestRunner(verbosity=2)")) + + (invoke "python" "Cheetah/Tests/Test.py"))))))) (propagated-inputs - `(("python2-markdown" ,python2-markdown))) + `(("python-markdown" ,python-markdown))) ;optional (home-page "http://cheetahtemplate.org/") (synopsis "Template engine") (description "Cheetah is a text-based template engine and Python code @@ -10742,6 +10772,9 @@ Features: @end enumerate") (license (license:x11-style "file://LICENSE")))) +(define-public python2-cheetah + (package-with-python2 python-cheetah)) + (define-public python-dulwich (package (name "python-dulwich") From f028823c0f8083bdca2dceb9672a67408318117d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:54:03 +0100 Subject: [PATCH 400/435] gnu: mosaik: Fix FTBFS from b90289dadc8ee15848ce911a2bdcd3ae8302d58c. * gnu/packages/bioinformatics.scm (mosaik)[inputs]: Add ZLIB:STATIC. --- gnu/packages/bioinformatics.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a193e56ed9..b09a0f7532 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5228,6 +5228,7 @@ viewer.") #t)))))) (inputs `(("perl" ,perl) + ("zlib:static" ,zlib "static") ("zlib" ,zlib))) (supported-systems '("x86_64-linux")) (home-page "https://github.com/wanpinglee/MOSAIK") From 68f2e552060a9c94f1eb56246e7f14103ca119dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:55:29 +0100 Subject: [PATCH 401/435] gnu: ledger: Fix build with Boost >= 1.68. * gnu/packages/finance.scm (ledger)[arguments]: Add phase 'boost-compat. --- gnu/packages/finance.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 28bfb28f49..929f8a52de 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -165,6 +165,13 @@ line client and a client based on Qt.") #:make-flags (list "ARGS=-E BaselineTest_cmd-org") #:phases (modify-phases %standard-phases + (add-after 'unpack 'boost-compat + (lambda _ + (substitute* "src/utils.h" + ;; This library moved in Boost 1.66. Remove for Ledger + ;; versions > 3.1.1. + (("boost/uuid/sha1.hpp") "boost/uuid/detail/sha1.hpp")) + #t)) (add-before 'configure 'install-examples (lambda* (#:key outputs #:allow-other-keys) (let ((examples (string-append (assoc-ref outputs "out") From 60667159d329b1f07d01b5bd03e3b289208ad406 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:56:55 +0100 Subject: [PATCH 402/435] gnu: python-pycurl: Fix FTBFS from 7b844100464633db5455a3931858bb57c9e529e6. * gnu/packages/python-web.scm (python-pycurl)[arguments]: Add phase 'configure-tls-backend'. --- gnu/packages/python-web.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 03db842531..8957d28268 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -443,7 +443,15 @@ C, yielding parse times that can be a thirtieth of the html5lib parse times.") (arguments ;; The tests attempt to access external web servers, so we cannot run ;; them. Furthermore, they are skipped altogether when using Python 2. - '(#:tests? #f)) + '(#:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'build 'configure-tls-backend + (lambda _ + ;; XXX: PycURL fails to automatically determine which TLS + ;; backend to use when cURL is built with --disable-static. + ;; See setup.py and . + (setenv "PYCURL_SSL_LIBRARY" "gnutls") + #t))))) (native-inputs `(("python-nose" ,python-nose) ("python-bottle" ,python-bottle))) From 799d4bac62038cf253aacdcfa93fe8f5755fc60f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 18:36:45 +0100 Subject: [PATCH 403/435] gnu: python2-futures: Disable tests. * gnu/packages/python.scm (python2-futures)[arguments]: Set #:test? #f. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 61fcf282ee..a9e5306235 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -261,6 +261,10 @@ ((or "." "..") #f) (file (not + ;; FIXME: Add the 'support' directory + ;; in the next rebuild cycle, since it + ;; moved in 2.7.14. See also + ;; python2-futures below. (string-prefix? "test_support." file)))))) (call-with-output-file "__init__.py" (const #t)) @@ -7766,7 +7770,11 @@ otherwise matches 3.2’s API.") (base32 "1pw1z4329xvlabdpwqa6b7v2fxf7hl64m4cgr22ckbym8m8m4hh5")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) + (arguments `(#:python ,python-2 + ;; FIXME: Python 2.7.14 moved the test.support library, + ;; but our package has not yet been adjusted. Enable + ;; tests when the python2 package has been fixed. + #:tests? #f)) (home-page "https://github.com/agronholm/pythonfutures") (synopsis "Backport of the concurrent.futures package from Python 3.2") From 366cd7fcba3ef7a26c17f20fe07a65308d8f9186 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Nov 2018 21:59:46 +0100 Subject: [PATCH 404/435] gnu: python2-futures: Update to 3.2.0. * gnu/packages/python.scm (python2-futures): Update to 3.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a9e5306235..c23f2b5875 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7761,14 +7761,14 @@ otherwise matches 3.2’s API.") (define-public python2-futures (package (name "python2-futures") - (version "3.0.5") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "futures" version)) (sha256 (base32 - "1pw1z4329xvlabdpwqa6b7v2fxf7hl64m4cgr22ckbym8m8m4hh5")))) + "0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y")))) (build-system python-build-system) (arguments `(#:python ,python-2 ;; FIXME: Python 2.7.14 moved the test.support library, From 45bc4b7ecb1a5a2aef379a36f20fc74ba3c5b10b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 18:42:29 +0100 Subject: [PATCH 405/435] gnu: python2-fasteners: Propagate python2-futures. * gnu/packages/python.scm (python-fasteners)[properties]: New field. (python2-fasteners)[propagated-inputs]: Add PYTHON2-FUTURES. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c23f2b5875..892199fc0f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14124,10 +14124,16 @@ introspection.") @item Inter-process locks @item Generic helpers @end itemize\n") + (properties `((python2-variant . ,(delay python2-fasteners)))) (license license:asl2.0))) (define-public python2-fasteners - (package-with-python2 python-fasteners)) + (let ((base (package-with-python2 (strip-python2-variant python-fasteners)))) + (package + (inherit base) + (propagated-inputs + `(("python2-futures" ,python2-futures) + ,@(package-propagated-inputs base)))))) (define-public python-requests-file (package From 5ff6e06763fb5df48465298588a2920ae84c5a3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:26:01 +0100 Subject: [PATCH 406/435] gnu: adb: Fix FTBFS with Glibc 2.28. * gnu/packages/android.scm (adb)[arguments]: Add phase 'glibc-compat'. --- gnu/packages/android.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 9f8d850ff5..e41beee85f 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -339,6 +339,13 @@ various Android core host applications.") (modify-phases %standard-phases (add-after 'unpack 'enter-source (lambda _ (chdir "adb") #t)) + (add-after 'enter-source 'glibc-compat + (lambda _ + ;; Include sysmacros.h for "major" and "minor" in Glibc 2.28. + (substitute* "usb_linux.cpp" + (("#include " all) + (string-append all "\n#include \n"))) + #t)) (add-after 'enter-source 'make-libs-available (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Android.mk" From 4b2d1dc4dc48c38ac440aafd384e60565d638cf6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:32:48 +0100 Subject: [PATCH 407/435] gnu: bless: Adjust to zlib static output. * gnu/packages/bioinformatics.scm (bless)[inputs]: Add ZLIB:STATIC. [arguments]: Adjust #:make-flags accordingly. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b09a0f7532..026527cd36 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1243,7 +1243,7 @@ confidence to have in an alignment.") '(#:tests? #f ;no "check" target #:make-flags (list (string-append "ZLIB=" - (assoc-ref %build-inputs "zlib") + (assoc-ref %build-inputs "zlib:static") "/lib/libz.a") (string-append "LDFLAGS=" (string-join '("-lboost_filesystem" @@ -1286,6 +1286,7 @@ confidence to have in an alignment.") ("boost" ,boost) ("sparsehash" ,sparsehash) ("pigz" ,pigz) + ("zlib:static" ,zlib "static") ("zlib" ,zlib))) (supported-systems '("x86_64-linux")) (home-page "https://sourceforge.net/p/bless-ec/wiki/Home/") From 12618049852bcbfd6390b5ff2779cdadf35618db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:43:18 +0100 Subject: [PATCH 408/435] gnu: python-pika: Update to 0.12.0. * gnu/packages/python.scm (python-pika): Update to 0.12.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 892199fc0f..d9bea45142 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9257,14 +9257,14 @@ focus on event-based network programming and multiprotocol integration.") (define-public python-pika (package (name "python-pika") - (version "0.10.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "pika" version)) (sha256 (base32 - "0nb4h08di432lv7dy2v9kpwgk0w92f24sqc2hw2s9vwr5b8v8xvj")))) + "0ld7akgm93s8pfa4dsx9qlzlhj76zspbr5m9ms0ns09yd2w4aq9h")))) (build-system python-build-system) (native-inputs `(("python-pyev" ,python-pyev) From c1d80c7a9c87e1f3b03f6ec9eec94ce391674e3d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:53:52 +0100 Subject: [PATCH 409/435] gnu: diffoscope: Fix test failure. * gnu/packages/package-management.scm (diffoscope)[arguments]: Remove failing Berkeley DB test. --- gnu/packages/package-management.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 471a08b799..be48aa0685 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -586,6 +586,12 @@ transactions from C or Python.") (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) (add-after 'unpack 'embed-tool-references (lambda* (#:key inputs #:allow-other-keys) (substitute* "diffoscope/comparators/utils/compare.py" From 07fdf96140da4531ffdc4ed7b18ebde9ad012737 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:55:07 +0100 Subject: [PATCH 410/435] gnu: diffoscope: Update to 106. * gnu/packages/package-management.scm (diffoscope): Update to 106. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index be48aa0685..46b0aa26f0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -569,13 +569,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "105") + (version "106") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0bqkwvrvlvybqfi73qv1k5xic2qzw5lv20imqadf1wc4l8vc0vq3")))) + "0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases From 9b3e11f6a874be3412aacd94634de74e1c70cd53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Nov 2018 16:56:26 +0100 Subject: [PATCH 411/435] gnu: python2-numpy@1.8: Provide "python2-nose". Also remove other native-inputs since they appear unnecessary. * gnu/packages/python.scm (python2-numpy-1.8)[native-inputs]: New field. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d9bea45142..6f967c5d6a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3056,6 +3056,8 @@ include_dirs = ~a/include:~a/include (assoc-ref inputs "openblas") (assoc-ref inputs "lapack")))) #t)))))) + (native-inputs + `(("python2-nose" ,python2-nose))) (description "NumPy is the fundamental package for scientific computing with Python. It contains among other things: a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ From 07d4200c1c4e6c82c1369289e67311e1837bbd3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:00:57 +0200 Subject: [PATCH 412/435] gnu: mdds: Update to 1.4.3. * gnu/packages/boost.scm (mdds): Update to 1.4.3. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 897987f71c..b772781f56 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -182,14 +182,14 @@ Boost.Thread.") (define-public mdds (package (name "mdds") - (version "1.3.1") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2")) (sha256 (base32 - "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w")))) + "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5")))) (build-system gnu-build-system) (propagated-inputs `(("boost" ,boost))) ; inclusion of header files From 5895437c619bb40fd24d680571ae67e5229f01d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:25 +0200 Subject: [PATCH 413/435] gnu: ixion: Update to 0.14.1. * gnu/packages/libreoffice.scm (ixion): Update to 0.14.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2e05820f72..53e82e4013 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -81,7 +81,7 @@ (define-public ixion (package (name "ixion") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) @@ -89,7 +89,7 @@ version ".tar.xz")) (sha256 (base32 - "1rf76drzg593jzswwnh8kr2jangp8ylizqjspx57rld25g2n1qss")))) + "14gdd6div4l22vnz3jn2qjxgjly98ck6p8c1v7386c41rx7kilba")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From b64665d1d31d618014f72be6a21a6a6b1825b2d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:47 +0200 Subject: [PATCH 414/435] gnu: orcus: Update to 0.14.1. * gnu/packages/libreoffice.scm (orcus): Update to 0.14.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 53e82e4013..a26deec946 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -107,7 +107,7 @@ their dependencies automatically upon calculation.") (define-public orcus (package (name "orcus") - (version "0.13.4") + (version "0.14.1") (source (origin (method url-fetch) @@ -115,7 +115,7 @@ their dependencies automatically upon calculation.") name "-" version ".tar.xz")) (sha256 (base32 - "1r42waglxwmvvwl20fy49vzgfp1sis4j703f81iswzdyzqalq75p")))) + "1ays13a1x15j81dsrq0d3697v1bbqd3bfz3ajn6kb9d61y2drlgj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 06dd29ef4f64109cbdaa611729eabe38ce1a5379 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:43:56 +0200 Subject: [PATCH 415/435] gnu: libetonyek: Fix build against mdds 1.4. * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Add phase to substitute mdds version. Adjust #:configure-flags accordingly. --- gnu/packages/libreoffice.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a26deec946..9d68ca8f0f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -411,7 +411,16 @@ CorelDRAW documents of all versions.") "0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-mdds=1.2"))) + `(#:configure-flags '("--with-mdds=1.4") + #:phases (modify-phases %standard-phases + (add-before 'configure 'support-mdds-1.4 + (lambda _ + ;; This package already works fine with mdds 1.4, but the + ;; configure check is too strict. Taken from upstream. + (substitute* "configure" + (("mdds=1\\.2") "mdds=1.4") + (("mdds=\"1\\.2\"") "mdds=\"1.4\"")) + #t))))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) From b01e89593da524f131d3c38a9ac0eb95467455f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:00:42 +0100 Subject: [PATCH 416/435] gnu: libreoffice: Fix build with MDDS 1.4 and Orcus 0.14. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add two patches from Arch Linux. [arguments]: Add substitutions so the libraries are found. --- gnu/packages/libreoffice.scm | 37 ++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9d68ca8f0f..45e2f63767 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -959,8 +959,34 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (sha256 (base32 "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")))) + (patches + (append (list (origin + ;; Support newer versions of Orcus and MDDS. These patches + ;; are taken from upstream, but we use the patches from Arch + ;; because they are adapted for the release tarball. + ;; Note: remove the related substitutions below when these + ;; are no longer needed. + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit" + "/packages.git/plain/trunk/" + "0001-Update-orcus-to-0.14.0.patch?&id=" + "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7")) + (file-name "libreoffice-orcus.patch") + (sha256 + (base32 + "0v1knblrmfzkb4g9pm5mdnrmjib59bznvca1ygbwlap2ln1h4mk0"))) + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit" + "/packages.git/plain/trunk/" + "0001-Update-mdds-to-1.4.1.patch?&id=" + "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7")) + (file-name "libreoffice-mdds.patch") + (sha256 + (base32 + "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))) + (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch"))))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1049,6 +1075,13 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) + ;; XXX: Adjust the checks for MDDS and liborcus to avoid having + ;; to re-bootstrap the whole thing. Remove this with the related + ;; patches above. + (substitute* "configure" + (("mdds-1.2 >= 1.2.3") "mdds-1.4 >= 1.4.1") + (("liborcus-0.13 >= 0.13.3") "liborcus-0.14 >= 0.14.0")) + ;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; find them on the include path without a prefix. From 18142e23e8ee55d996d9d4ed1113f3d13e81f234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Nov 2018 19:08:04 +0100 Subject: [PATCH 417/435] gnu: python2-gevent: Fix compilation. * gnu/packages/python.scm (python-gevent)[arguments]: Add (ice-9 match) to #:modules. In 'do-not-use-bundled-sources' phase, use 'scandir' to avoid hard-coded include directory name. [properties]: New field. (python2-gevent): Add 'native-inputs' and 'arguments' fields. --- gnu/packages/python.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6f967c5d6a..578d529eb7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9134,6 +9134,7 @@ graphviz.") (build-system python-build-system) (arguments `(#:modules ((ice-9 ftw) + (ice-9 match) (srfi srfi-26) (guix build utils) (guix build python-build-system)) @@ -9161,9 +9162,16 @@ graphviz.") (setenv "LIBEV_EMBED" "false") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") - (setenv "CPATH" - (string-append (assoc-ref inputs "python-greenlet") - "/include/python3.7m")) + + (let ((greenlet (string-append + (assoc-ref inputs "python-greenlet") + "/include"))) + (match (scandir greenlet + (lambda (item) + (string-prefix? "python" item))) + ((python) + (setenv "CPATH" + (string-append greenlet "/" python))))) #t)) (replace 'check (lambda _ @@ -9197,10 +9205,27 @@ graphviz.") (description "gevent is a coroutine-based Python networking library that uses greenlet to provide a high-level synchronous API on top of the libev event loop.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-gevent)))))) (define-public python2-gevent - (package-with-python2 python-gevent)) + (let ((base (package-with-python2 + (strip-python2-variant python-gevent)))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'skip-timer-test + (lambda _ + ;; XXX: Skip 'TestTimerResolution', which appears to be + ;; unreliable. + (substitute* "src/greentest/test__core_timer.py" + (("not greentest.RUNNING_ON_CI") "False")) + #t)))))) + (native-inputs `(,@(package-native-inputs python-gevent) + ("python-mock" ,python2-mock)))))) (define-public python-fastimport (package From 1e92d311c3e43827a76f5bc9a43def7f7690f8c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 25 Nov 2018 20:36:44 +0100 Subject: [PATCH 418/435] gnu: randomjungle: Do not build static binaries. * gnu/packages/patches/randomjungle-disable-static-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/machine-learning.scm (randomjungle)[source](patches): Add it. [arguments]: Add "--disable-static" to #:configure-flags. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 4 +++- .../randomjungle-disable-static-build.patch | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/randomjungle-disable-static-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8b673fdd8a..5034727ac2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1115,6 +1115,7 @@ dist_patch_DATA = \ %D%/packages/patches/quilt-compat-getopt-fix-second-separator.patch \ %D%/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ + %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4b2447ece0..7b9b28a2eb 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -333,13 +333,15 @@ algorithm.") (uri (string-append "http://www.imbs-luebeck.de/imbs/sites/default/files/u59/" "randomjungle-" version ".tar_.gz")) + (patches (search-patches "randomjungle-disable-static-build.patch")) (sha256 (base32 "12c8rf30cla71swx2mf4ww9mfd8jbdw5lnxd7dxhyw1ygrvg6y4w")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (list (string-append "--with-boost=" + (list "--disable-static" + (string-append "--with-boost=" (assoc-ref %build-inputs "boost"))) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/randomjungle-disable-static-build.patch b/gnu/packages/patches/randomjungle-disable-static-build.patch new file mode 100644 index 0000000000..3de6c269fd --- /dev/null +++ b/gnu/packages/patches/randomjungle-disable-static-build.patch @@ -0,0 +1,14 @@ +Drop build time dependency on the static executables. + +--- a/src/Makefile.in 2018-11-25 20:27:10.691508925 +0100 ++++ b/src/Makefile.in 2018-11-25 20:27:43.565631413 +0100 +@@ -34,8 +34,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = rjungle$(EXEEXT) rjungle_static$(EXEEXT) \ +- rjunglesparse$(EXEEXT) rjunglesparse_static$(EXEEXT) ++bin_PROGRAMS = rjungle$(EXEEXT) rjunglesparse$(EXEEXT) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 From 644af6c87092936e8a556da192ee195db58d65b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Sun, 25 Nov 2018 20:33:13 +0100 Subject: [PATCH 419/435] gnu: aegisub: Fix build. * gnu/packages/patches/aegisub-boost68.patch: New file * gnu/local.mk: Add it. * gnu/packages/video.scm (aegisub)[source]: Use patch. --- gnu/local.mk | 1 + gnu/packages/patches/aegisub-boost68.patch | 35 ++++++++++++++++++++++ gnu/packages/video.scm | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/aegisub-boost68.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5034727ac2..23af3f67d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -574,6 +574,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ + %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/ansible-wrap-program-hack.patch \ diff --git a/gnu/packages/patches/aegisub-boost68.patch b/gnu/packages/patches/aegisub-boost68.patch new file mode 100644 index 0000000000..013721f3bd --- /dev/null +++ b/gnu/packages/patches/aegisub-boost68.patch @@ -0,0 +1,35 @@ +Source: https://git.archlinux.org/svntogit/community.git/plain/trunk/boost-1.68.patch?h=packages/aegisub +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 9 Jul 2018 20:15:29 +0000 +Subject: [PATCH] Keep using std::distance after Boost 1.68 + +src/search_replace_engine.cpp:256:14: error: call to + 'distance' is ambiguous + count += distance( + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = + boost::u32regex_iterator >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = + boost::u32regex_iterator >] + distance(SinglePassIterator first, SinglePassIterator last) + ^ +--- + src/search_replace_engine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp +index 594c21e5e..14c71680d 100644 +--- a/src/search_replace_engine.cpp ++++ b/src/search_replace_engine.cpp +@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { + if (MatchState ms = matches(&diag, 0)) { + auto& diag_field = diag.*get_dialogue_field(settings.field); + std::string const& text = diag_field.get(); +- count += distance( ++ count += std::distance( + boost::u32regex_iterator(begin(text), end(text), *ms.re), + boost::u32regex_iterator()); + diag_field = u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8a5e730bd5..3b2a37112c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2757,7 +2757,8 @@ programmers to access a standard API to open and decompress media files.") (sha256 (base32 "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")) - (patches (search-patches "aegisub-icu59-include-unistr.patch")))) + (patches (search-patches "aegisub-icu59-include-unistr.patch" + "aegisub-boost68.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags From e029d90f45470899d1c37bcbea7fdc5d557e30f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 26 Nov 2018 17:01:58 +0100 Subject: [PATCH 420/435] gnu: ams-lv2: Fix error in configure phase. Python 3.7 introduced PEP 479. That raised an error in an old waf-script included in the package. An updated waf-script was found in a newer commit that fixes the problem. * gnu/packages/music.scm (ams-lv2)[sources]: Update, using two more commits than version 1.2.1. --- gnu/packages/music.scm | 82 ++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fca26edcbb..21659a6429 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2285,47 +2286,52 @@ follows a traditional multi-track tape recorder control paradigm.") (license license:gpl2+))) (define-public ams-lv2 - (package - (name "ams-lv2") - (version "1.2.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blablack/ams-lv2.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x")))) - (build-system waf-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-sse-flags - (lambda* (#:key system #:allow-other-keys) - (when (not (or (string-prefix? "x86_64" system) - (string-prefix? "i686" system))) - (substitute* "wscript" - (("'-msse', '-mfpmath=sse', ") "")) - #t)))) - #:tests? #f)) ; no tests - (inputs - `(("lv2" ,lv2) - ("lvtk" ,lvtk) - ("gtkmm" ,gtkmm-2) - ("gtk" ,gtk+-2) - ("cairo" ,cairo) - ("fftw" ,fftw))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://objectivewave.wordpress.com/ams-lv2/") - (synopsis "Port of Alsa Modular Synth internal modules into LV2") - (description "This set of LV2 plugins is a port of the internal modules + ;; Version 1.2.1 built with Python 3.7 raises an error in the waf-script. + ;; Therefore, we take two more commmits than 1.2.1 that introduce an updated + ;; waf-script and fix one error. + (let ((commit "377d166db54a787b48979171c5652d2eb4f1bbb5") + (revision "1")) + (package + (name "ams-lv2") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blablack/ams-lv2.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ndgxcxjxwidg7436k0nb5clxkyi878k1j999sbbd1gk2fm0kcqm")))) + (build-system waf-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-sse-flags + (lambda* (#:key system #:allow-other-keys) + (when (not (or (string-prefix? "x86_64" system) + (string-prefix? "i686" system))) + (substitute* "wscript" + (("'-msse', '-mfpmath=sse', ") "")) + #t)))) + #:tests? #f)) ; no tests + (inputs + `(("lv2" ,lv2) + ("lvtk" ,lvtk) + ("gtkmm" ,gtkmm-2) + ("gtk" ,gtk+-2) + ("cairo" ,cairo) + ("fftw" ,fftw))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://objectivewave.wordpress.com/ams-lv2/") + (synopsis "Port of Alsa Modular Synth internal modules into LV2") + (description "This set of LV2 plugins is a port of the internal modules found in Alsa Modular Synth. These plugins are used to create modular synthesizers and contain: VCO, VCF, VCA, LFO, slew limiter, envelopes, sample and hold, etc.") - (license license:gpl2))) + (license license:gpl2)))) (define-public gxtuner (package From 6cbb2c87216e37f4d11a36d3d95d6c5fa5dc9216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 26 Nov 2018 17:24:21 +0100 Subject: [PATCH 421/435] gnu: ams-lv2: Always return #t from phase remove-sse-flags. * gnu/packages/music.scm (ams-lv2)[arguments]: Use '(unless' instead of '(when (not'. Return with #t as last value from phase 'remove-sse-flags'. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 21659a6429..568b6f41f7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2310,11 +2310,11 @@ follows a traditional multi-track tape recorder control paradigm.") (modify-phases %standard-phases (add-after 'unpack 'remove-sse-flags (lambda* (#:key system #:allow-other-keys) - (when (not (or (string-prefix? "x86_64" system) - (string-prefix? "i686" system))) + (unless (or (string-prefix? "x86_64" system) + (string-prefix? "i686" system)) (substitute* "wscript" - (("'-msse', '-mfpmath=sse', ") "")) - #t)))) + (("'-msse', '-mfpmath=sse', ") ""))) + #t))) #:tests? #f)) ; no tests (inputs `(("lv2" ,lv2) From de42429040d1754301fe76e5de53deda3e973027 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 19:31:15 +0100 Subject: [PATCH 422/435] gnu: mono: Fix build with glibc 2.28. * gnu/packages/mono.scm (mono)[arguments]<#:phases>[fix-includes]: New phase. --- gnu/packages/mono.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 16c4f71dde..71d7aeac65 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -56,6 +56,13 @@ (lambda _ ;;* (#:key inputs #:allow-other-keys) ;; all tests under mcs/class fail trying to access $HOME (setenv "HOME" "/tmp"))) + (add-after 'unpack 'fix-includes + (lambda _ + ;; makedev is in now. Include it. + (substitute* "mono/io-layer/processes.c" + (("#ifdef HAVE_SYS_MKDEV_H") "#if 1") + (("sys/mkdev.h") "sys/sysmacros.h")) + #t)) (add-after 'unpack 'patch-tests (lambda _ ;;* (#:key inputs #:allow-other-keys) (substitute* "mono/tests/Makefile.in" From 5a1ac6138d31f5e48c273b4f9292292d76d7432a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 20:09:14 +0100 Subject: [PATCH 423/435] gnu: python-tblib: Use invoke. * gnu/packages/python.scm (python-tblib)[arguments]<#:phases>[check]: Use invoke. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 578d529eb7..2ee18be363 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9047,7 +9047,7 @@ own code, responding to click events and updating clock every second.") (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) - (zero? (system* "py.test" "-vv" "tests" "README.rst"))))))) + (invoke "py.test" "-vv" "tests" "README.rst")))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-six" ,python-six))) From aaff78bef9d5ebcde965890fad442e25d8af4a2e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 20:35:35 +0100 Subject: [PATCH 424/435] gnu: adb: Fix build with glibc 2.28. * gnu/packages/android.scm (android-platform-version): Use "7.1.2_r36". (android-platform-system-core): Update sha256 hash value (for 7.1.2_r36). (android-platform-bionic): Update sha256 hash value (for 7.1.2_r36). --- gnu/packages/android.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index e41beee85f..48380740a3 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -108,7 +108,7 @@ use their packages mostly unmodified in our Android NDK build system.") ;; Big thanks to them for laying the groundwork. ;; The version tag is consistent between all repositories. -(define (android-platform-version) "7.1.2_r6") +(define (android-platform-version) "7.1.2_r36") (define (android-platform-system-core version) (origin @@ -120,7 +120,7 @@ use their packages mostly unmodified in our Android NDK build system.") version "-checkout")) (sha256 (base32 - "0xc2n7jxrf1iw9cc278pijdfjix2fkiig5ws27f6rwp40zg5mrgg")) + "1krnc2b9zfkzpdgs1dcbji59nszlx2qr723pg89m52622czc06hg")) (patches (search-patches "libbase-use-own-logging.patch" "libbase-fix-includes.patch" @@ -151,7 +151,7 @@ use their packages mostly unmodified in our Android NDK build system.") version "-checkout")) (sha256 (base32 - "0n9wkz3ynqw39if1ss9n32m66iga14nndf29hpm7g1aqn4wvvgzk")))) + "15r4s20d7vw022f8vrc3jbghmqwdcqzprl7i2bfvdkz8z76wc1ps")))) (define (android-platform-external version subdirectory checksum) (origin From 8160baf8b755cc6217ac263a61724c789fcf49e8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 26 Nov 2018 21:48:03 +0100 Subject: [PATCH 425/435] gnu: mono: End phase with #t. * gnu/packages/mono.scm (mono)[arguments]<#:phases>[set-env]: End with #t. --- gnu/packages/mono.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 71d7aeac65..8ab449dd8e 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -55,7 +55,8 @@ (add-after 'unpack 'set-env (lambda _ ;;* (#:key inputs #:allow-other-keys) ;; all tests under mcs/class fail trying to access $HOME - (setenv "HOME" "/tmp"))) + (setenv "HOME" "/tmp") + #t)) (add-after 'unpack 'fix-includes (lambda _ ;; makedev is in now. Include it. From bc0d24292d776826b8ce9c9aa9d620e33160d1ed Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 27 Nov 2018 00:23:03 +0100 Subject: [PATCH 426/435] gnu: mono: Make build reproducible. * gnu/packages/patches/mono-mdoc-timestamping.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mono.scm (mono)[source]: Use patch. [arguments]<#:phases>[make-reproducible]: New phase. <#:phases>[set-env]: Set SOURCE_DATE_EPOCH. --- gnu/local.mk | 1 + gnu/packages/mono.scm | 11 ++++++++++- gnu/packages/patches/mono-mdoc-timestamping.patch | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mono-mdoc-timestamping.patch diff --git a/gnu/local.mk b/gnu/local.mk index 23af3f67d7..250c773992 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,6 +972,7 @@ dist_patch_DATA = \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch \ + %D%/packages/patches/mono-mdoc-timestamping.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \ %D%/packages/patches/mozjs24-aarch64-support.patch \ %D%/packages/patches/mozjs38-pkg-config-version.patch \ diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 8ab449dd8e..17f90fe30a 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -41,7 +41,8 @@ ".tar.bz2")) (sha256 (base32 - "0jibyvyv2jy8dq5ij0j00iq3v74r0y90dcjc3dkspcfbnn37cphn")))) + "0jibyvyv2jy8dq5ij0j00iq3v74r0y90dcjc3dkspcfbnn37cphn")) + (patches (search-patches "mono-mdoc-timestamping.patch")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -52,10 +53,18 @@ (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "mono/mini/Makefile.in" + (("build_date = [^;]*;") + "build_date = (void*) 0;")) + #t)) (add-after 'unpack 'set-env (lambda _ ;;* (#:key inputs #:allow-other-keys) ;; all tests under mcs/class fail trying to access $HOME (setenv "HOME" "/tmp") + ;; ZIP files have "DOS time" which starts in Jan 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") #t)) (add-after 'unpack 'fix-includes (lambda _ diff --git a/gnu/packages/patches/mono-mdoc-timestamping.patch b/gnu/packages/patches/mono-mdoc-timestamping.patch new file mode 100644 index 0000000000..d5191a93eb --- /dev/null +++ b/gnu/packages/patches/mono-mdoc-timestamping.patch @@ -0,0 +1,15 @@ +--- mono-4.4.1/mcs/class/monodoc/Monodoc/storage/ZipStorage.cs.orig 2018-11-26 22:16:25.008879747 +0100 ++++ mono-4.4.1/mcs/class/monodoc/Monodoc/storage/ZipStorage.cs 2018-11-26 22:21:53.969770985 +0100 +@@ -74,6 +74,12 @@ + id = GetNewCode (); + + ZipEntry entry = new ZipEntry (id); ++ var SOURCE_DATE_EPOCH_string = Environment.GetEnvironmentVariable("SOURCE_DATE_EPOCH"); ++ if (SOURCE_DATE_EPOCH_string != null) ++ { ++ var SOURCE_DATE_EPOCH = Convert.ToInt64(SOURCE_DATE_EPOCH_string); ++ entry.DateTime = new DateTime(SOURCE_DATE_EPOCH, DateTimeKind.Utc); ++ } + zipOutput.PutNextEntry (entry); + } + From 8aad2e32e5d954bc72aa8ef4da9c22f1619b64cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Nov 2018 13:51:52 +0100 Subject: [PATCH 427/435] gnu: orbit2: Do not build static libraries. * gnu/packages/gnome.scm (orbit2)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/gnome.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 026b5fd59c..bf63c37c2b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1321,9 +1321,13 @@ functionality was designed to be as reusable and portable as possible.") (build-system gnu-build-system) (arguments `(#:configure-flags - ;; The programmer kindly gives us a hook to turn off deprecation - ;; warnings ... - '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") + '(;; We don't need static libraries, plus they don't build reproducibly + ;; (non-deterministic ordering of .o files in the archive.) + "--disable-static" + + ;; The programmer kindly gives us a hook to turn off deprecation + ;; warnings ... + "DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") ;; ... which they then completly ignore !! #:phases (modify-phases %standard-phases From 892307aed55c5062841e9defa19d7299c8844be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Nov 2018 13:53:14 +0100 Subject: [PATCH 428/435] gnu: orbit2: Specify upstream name. * gnu/packages/gnome.scm (orbit2)[properties]: New field. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bf63c37c2b..cbd9afbd30 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1347,7 +1347,8 @@ featuring mature C, C++ and Python bindings.") ;; Licence notice is unclear. The Web page simply say "GPL" without giving ;; a version. SOME of the code files have licence notices for GPLv2+. ;; The tarball contains files of the text of GPLv2 and LGPLv2. - (license license:gpl2+))) + (license license:gpl2+) + (properties `((upstream-name . "ORBit2"))))) (define-public libbonobo From 994b5b1d01b6592bf2531e801ce3de0a4a8189bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Nov 2018 12:42:09 +0100 Subject: [PATCH 429/435] gnu: libbonobo: Build sequentially. See for an example of a parallel build failure: CCLD echo-client-2 CCLD bonobo-echo-2 ld: libEcho.a(Bonobo_Sample_Echo-stubs.o): in function `Bonobo_Sample_Echo_echo': /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `Bonobo_Sample_Echo__iinterface' ld: /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `Bonobo_Sample_Echo__classid' ld: /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `_ORBIT_skel_small_Bonobo_Sample_Echo_echo' collect2: error: ld returned 1 exit status make[3]: *** [Makefile:488: echo-client-2] Error 1 * gnu/packages/gnome.scm (libbonobo)[arguments]: Add #:parallel-build?. --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cbd9afbd30..b497b965bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1376,7 +1376,14 @@ featuring mature C, C++ and Python bindings.") (lambda _ (substitute* "activation-server/Makefile.in" (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) - #t))))) + #t))) + + ;; There's apparently a race condition between the server stub + ;; generation and linking of the example under 'samples/echo' that can + ;; lead do undefined references when building in parallel, as reported + ;; at . + ;; Thus, disable parallel builds. + #:parallel-build? #f)) (inputs `(("popt" ,popt) ("libxml2" ,libxml2))) ;; The following are Required by the .pc file From f2c99fe52b73bfe81acad825214de952234f82bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Nov 2018 13:14:22 +0100 Subject: [PATCH 430/435] gnu: rust: Shorten patch file name. This file name was too long to fit in a tar archive. * gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch: Rename to... * gnu/packages/patches/rust-reproducible-builds.patch: ... this. * gnu/packages/rust.scm (rust-1.27, rust): Adjust accordingly. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- ...ing-window.search.patch => rust-reproducible-builds.patch} | 0 gnu/packages/rust.scm | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename gnu/packages/patches/{rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch => rust-reproducible-builds.patch} (100%) diff --git a/gnu/local.mk b/gnu/local.mk index 250c773992..32b561472e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1141,7 +1141,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ - %D%/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch \ + %D%/packages/patches/rust-reproducible-builds.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-test-threading.patch \ diff --git a/gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch b/gnu/packages/patches/rust-reproducible-builds.patch similarity index 100% rename from gnu/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch rename to gnu/packages/patches/rust-reproducible-builds.patch diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8618c37761..1d9e629a22 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -713,7 +713,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch")))) + "rust-reproducible-builds.patch")))) (package (inherit base-rust) (arguments @@ -742,7 +742,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch" - "rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch")))) + "rust-reproducible-builds.patch")))) (package (inherit base-rust) (inputs From c324ad52b6066b4626312a4120b645c43989dd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Nov 2018 14:11:35 +0100 Subject: [PATCH 431/435] gnu: lirc: Build reproducibly. * gnu/packages/patches/lirc-reproducible-build.patch: New file. * gnu/packages/lirc.scm (lirc)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/lirc.scm | 3 +- .../patches/lirc-reproducible-build.patch | 72 +++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/lirc-reproducible-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 32b561472e..6de6306ec5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -935,6 +935,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ + %D%/packages/patches/lirc-reproducible-build.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-for-extempore.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 860822ce49..7ba2d44532 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -43,7 +43,8 @@ (sha256 (base32 "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb")) - (patches (search-patches "lirc-localstatedir.patch")))) + (patches (search-patches "lirc-localstatedir.patch" + "lirc-reproducible-build.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/lirc-reproducible-build.patch b/gnu/packages/patches/lirc-reproducible-build.patch new file mode 100644 index 0000000000..20f9344715 --- /dev/null +++ b/gnu/packages/patches/lirc-reproducible-build.patch @@ -0,0 +1,72 @@ +Build Lirc reproducibly. + +https://sourceforge.net/p/lirc/tickets/301/ +https://sourceforge.net/p/lirc/git/merge-requests/33/ +https://sourceforge.net/p/lirc/git/merge-requests/34/ +https://sourceforge.net/p/lirc/git/merge-requests/36/ + +Index: lirc-0.10.1/tools/lirc-lsplugins.cpp +=================================================================== +--- lirc-0.10.1.orig/tools/lirc-lsplugins.cpp ++++ lirc-0.10.1/tools/lirc-lsplugins.cpp +@@ -415,10 +415,9 @@ static void print_header(void) + static void print_yaml_header(void) + { + static const char* const YAML_HEADER = +- "#\n# Generated by lirc-lsplugins --yaml (%s) at %s#\n "; +- const time_t now = time(NULL); ++ "#\n# Generated by lirc-lsplugins --yaml (%s)#\n "; + +- printf(YAML_HEADER, VERSION, ctime(&now)); ++ printf(YAML_HEADER, VERSION); + printf("\ndrivers:\n"); + } + +Index: lirc-0.10.1/python-pkg/lirc/database.py +=================================================================== +--- lirc-0.10.1.orig/python-pkg/lirc/database.py ++++ lirc-0.10.1/python-pkg/lirc/database.py +@@ -156,7 +156,7 @@ class Database(object): + d['device_hint'] = hint + + configs = {} +- for path in glob.glob(configdir + '/*.conf'): ++ for path in sorted(glob.glob(configdir + '/*.conf')): + with open(path) as f: + cf = yaml.load(f.read()) + configs[cf['config']['id']] = cf['config'] +Index: lirc-0.10.1/tools/irdb-get +=================================================================== +--- lirc-0.10.1.orig/tools/irdb-get ++++ lirc-0.10.1/tools/irdb-get +@@ -9,7 +9,6 @@ import fnmatch + import os + import os.path + import sys +-import time + import urllib.error # pylint: disable=no-name-in-module,F0401,E0611 + import urllib.request # pylint: disable=no-name-in-module,F0401,E0611 + +@@ -193,7 +192,7 @@ def do_yaml_config(): + lircmd_by_driver[driver].append("%s/%s" % (tokens[0], tokens[2])) + + print("#") +- print("# Created by 'irdb-get yaml-config' at " + time.ctime()) ++ print("# Created by 'irdb-get yaml-config'") + print("#") + print("\nlircd_by_driver:") + print_yaml_dict(lircd_by_driver) +Index: lirc-0.10.1/tools/lirc-make-devinput +=================================================================== +--- lirc-0.10.1.orig/tools/lirc-make-devinput ++++ lirc-0.10.1/tools/lirc-make-devinput +@@ -61,8 +61,7 @@ if test -n "$lirc_map"; then + fi + + +-echo "# Generated by $(basename $0) on $(uname -r)" +-echo "# Date: $(date)" ++echo "# Generated by $(basename $0)" + cat < Date: Tue, 27 Nov 2018 16:56:12 +0100 Subject: [PATCH 432/435] gnu: kmscon: Don't invoke './configure' during bootstrap. * gnu/packages/terminals.scm (kmscon)[arguments]: Change 'autogen.sh' phase to replace 'bootstrap' and set the $NOCONFIGURE environment variable. --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 0f11fa650a..2d15d77524 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -240,9 +240,10 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen.sh + (replace 'bootstrap (lambda _ - (zero? (system* "sh" "autogen.sh")))) + (setenv "NOCONFIGURE" "indeed") + (invoke "sh" "autogen.sh"))) ;; Use elogind instead of systemd. (add-before 'configure 'remove-systemd (lambda _ From 5deb0c670de30689b7019f00f7b67af84f6056d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 30 Nov 2018 09:48:16 +0200 Subject: [PATCH 433/435] gnu: blender: Use newer ffmpeg. * gnu/packages/graphics.scm (blender)[source]: Add patch for newer ffmpeg compatability. [inputs]: Replace ffmpeg-2.8 with ffmpeg. * gnu/packages/patches/blender-newer-ffmpeg.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 5 +- .../patches/blender-newer-ffmpeg.patch | 80 +++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/blender-newer-ffmpeg.patch diff --git a/gnu/local.mk b/gnu/local.mk index b3235b63d1..5b84eef4ef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -603,6 +603,7 @@ dist_patch_DATA = \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ + %D%/packages/patches/blender-newer-ffmpeg.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/borg-respect-storage-quota.patch \ %D%/packages/patches/byobu-writable-status.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c3c1a4a580..6e184d3334 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -85,7 +85,8 @@ "blender-" version ".tar.gz")) (sha256 (base32 - "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")))) + "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")) + (patches (search-patches "blender-newer-ffmpeg.patch")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -141,7 +142,7 @@ ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("ffmpeg-2.8" ,ffmpeg-2.8) ; + ("ffmpeg" ,ffmpeg) ("fftw" ,fftw) ("jack" ,jack-1) ("libsndfile" ,libsndfile) diff --git a/gnu/packages/patches/blender-newer-ffmpeg.patch b/gnu/packages/patches/blender-newer-ffmpeg.patch new file mode 100644 index 0000000000..363489bc70 --- /dev/null +++ b/gnu/packages/patches/blender-newer-ffmpeg.patch @@ -0,0 +1,80 @@ +https://sources.debian.org/data/main/b/blender/2.79.b+dfsg0-4/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch + +From: Bastien Montagne +Date: Tue, 8 May 2018 16:00:52 +0200 +Subject: fix_building_with_latest_versions_of_FFmpeg + +Some years-old deprecated stuff has now been removed. + +Correct solution is probably to use valid defines etc. in own code, but +this is more FFMEPG maintainer task (since it also may change how old +FFMPEG we do support...). +--- + intern/ffmpeg/ffmpeg_compat.h | 39 ++++++++++++++++++++++++++ + source/blender/blenkernel/intern/writeffmpeg.c | 3 +- + 2 files changed, 41 insertions(+), 1 deletion(-) + +diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h +index 9c06c8a..f7f437c 100644 +--- a/intern/ffmpeg/ffmpeg_compat.h ++++ b/intern/ffmpeg/ffmpeg_compat.h +@@ -109,6 +109,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) + + #endif + ++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, ++ * so for now this will do. */ ++ ++#ifndef FF_MIN_BUFFER_SIZE ++# ifdef AV_INPUT_BUFFER_MIN_SIZE ++# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++# endif ++#endif ++ ++#ifndef FF_INPUT_BUFFER_PADDING_SIZE ++# ifdef AV_INPUT_BUFFER_PADDING_SIZE ++# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_DCT ++# ifdef AV_CODEC_FLAG_INTERLACED_DCT ++# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_ME ++# ifdef AV_CODEC_FLAG_INTERLACED_ME ++# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME ++# endif ++#endif ++ + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) + # define AV_CODEC_ID_NONE CODEC_ID_NONE +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index a19e414..04d508a 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -605,7 +605,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; ++ /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ ++ //c->me_method = ME_EPZS; + + codec = avcodec_find_encoder(c->codec_id); + if (!codec) From 886d833e39fe5a193abaf486e64d8f35ac491b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Dec 2018 00:20:04 +0100 Subject: [PATCH 434/435] gnu: openfoam: Adjust for glibc 2.28. * gnu/packages/simulation.scm (openfoam)[source](modules, snippet): New fields. --- gnu/packages/simulation.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 6144e236a7..c080a16ce7 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -70,7 +70,16 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0cgxh4h2hf50qbvvdg5miwc2nympb0nrv3md96vb3gbs9vk8vq9d")) - (patches (search-patches "openfoam-4.1-cleanup.patch")))) + (patches (search-patches "openfoam-4.1-cleanup.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Include , which is where glibc >= 2.28 provides + ;; 'major' and 'minor'. + (substitute* "src/OSspecific/POSIX/fileStat.C" + (("#include ") + "#include \n#include \n")) + #t)))) (build-system gnu-build-system) (inputs `(("boost" ,boost) From 8cddb0d6363d13f74de5409ef29b7913228f49b9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 2 Dec 2018 14:13:48 +0100 Subject: [PATCH 435/435] gnu: rust: Remove flaky test. * gnu/packages/rust.scm (rust-1.22)[arguments]<#:phases>[remove-flaky-test]: New phase. --- gnu/packages/rust.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1d9e629a22..ef40431733 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -576,8 +576,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #t))))))))) (define-public rust-1.22 - (rust-bootstrapped-package rust-1.21 "1.22.1" - "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) + (let ((base-rust (rust-bootstrapped-package rust-1.21 "1.22.1" + "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'remove-flaky-test + (lambda _ + ;; See . + (when (file-exists? "src/test/run-make/issue-26092") + (delete-file-recursively "src/test/run-make/issue-26092")) + #t))))))))) (define-public rust-1.23 (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0"